diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index 8a19de4f20e7280da9c6307e4789dcfc89cebc47..1fd01bbe7a065d2abd14274cf62e0e222ea3974b 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -1086,9 +1086,9 @@ MonoBehaviour: m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 - m_MaxValue: 100 + m_MaxValue: 30 m_WholeNumbers: 1 - m_Value: 100 + m_Value: 10 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -6370,36 +6370,6 @@ MonoBehaviour: startingPower: 20 currentPower: 0 powerSlider: {fileID: 941469807} ---- !u!1 &725605032 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 725605033} - m_Layer: 0 - m_Name: PowerOrbSpawnPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &725605033 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 725605032} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.5, y: 0, z: 15} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 16 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &732164003 GameObject: m_ObjectHideFlags: 0 @@ -6734,7 +6704,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 100 m_WholeNumbers: 1 - m_Value: 100 + m_Value: 20 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -7022,36 +6992,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1118055506} m_CullTransparentMesh: 0 ---- !u!1 &1159231083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159231084} - m_Layer: 0 - m_Name: SpeedOrbSpawnPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1159231084 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159231083} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.5, y: 0, z: 15} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1263355631 GameObject: m_ObjectHideFlags: 0 @@ -7528,7 +7468,7 @@ MonoBehaviour: playerHealth: {fileID: 33458251} orb: {fileID: 4657511723775529482, guid: 372c1cb97a0b4e540b8d303e12c33815, type: 3} spawnOrb: 0 - spawnTime: 3 + spawnTime: 15 factory: {fileID: 1906920587} --- !u!4 &1516506358 Transform: @@ -7542,7 +7482,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1516506359 MonoBehaviour: @@ -7559,7 +7499,7 @@ MonoBehaviour: playerHealth: {fileID: 33458251} orb: {fileID: 2535262335353558127, guid: 7fbb627886736534ba911bf6675933f4, type: 3} spawnOrb: 2 - spawnTime: 3 + spawnTime: 15 factory: {fileID: 1906920587} --- !u!114 &1516506360 MonoBehaviour: @@ -7576,7 +7516,7 @@ MonoBehaviour: playerHealth: {fileID: 33458251} orb: {fileID: 7205800141201514973, guid: a6916ad5a6c03624cb0d3a6f5bcbbcb1, type: 3} spawnOrb: 1 - spawnTime: 3 + spawnTime: 15 factory: {fileID: 1906920587} --- !u!850595691 &1523013122 LightingSettings: @@ -7639,36 +7579,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 ---- !u!1 &1571986861 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1571986862} - m_Layer: 0 - m_Name: HealthOrbSpawnPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1571986862 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1571986861} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -20.5, y: 0, z: 12.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1666523284 GameObject: m_ObjectHideFlags: 0 @@ -8140,7 +8050,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1975464296 GameObject: diff --git a/Assets/Scripts/Orbs/PowerOrb.cs b/Assets/Scripts/Orbs/PowerOrb.cs index 137fb63a82a731d5f660b40fae2cc5144b2879a8..ff7e106d6f6d31ec6d8b6ccd7eeb44480395ebde 100644 --- a/Assets/Scripts/Orbs/PowerOrb.cs +++ b/Assets/Scripts/Orbs/PowerOrb.cs @@ -15,7 +15,7 @@ public class PowerOrb : MonoBehaviour void Awake() { player = GameObject.FindGameObjectWithTag("Player"); - playerPower = player.GetComponent<PlayerPower>(); + playerPower = player.GetComponentInChildren<PlayerPower>(); anim = GetComponent<Animator>(); }