diff --git a/Assets/Scenes/Levels/Level1_Release.unity b/Assets/Scenes/Levels/Level1_Release.unity index 6b83467..f206c2d 100644 --- a/Assets/Scenes/Levels/Level1_Release.unity +++ b/Assets/Scenes/Levels/Level1_Release.unity @@ -491,7 +491,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 26 + value: 25 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} @@ -811,7 +811,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 27 + value: 26 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -5269,7 +5269,7 @@ PrefabInstance: - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_RootOrder - value: 23 + value: 22 objectReference: {fileID: 0} - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} @@ -5412,7 +5412,7 @@ PrefabInstance: - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} @@ -5476,7 +5476,7 @@ PrefabInstance: - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} @@ -5557,15 +5557,20 @@ PrefabInstance: propertyPath: speed value: 5 objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: dashTime + value: 0.4 + objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: runSpeed - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: dashPower - value: 15 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} @@ -5650,7 +5655,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 24 + value: 23 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} diff --git a/Assets/Scenes/Levels/Level2_Release.unity b/Assets/Scenes/Levels/Level2_Release.unity index b4e709d..73bd51b 100644 --- a/Assets/Scenes/Levels/Level2_Release.unity +++ b/Assets/Scenes/Levels/Level2_Release.unity @@ -1934,7 +1934,7 @@ PrefabInstance: - target: {fileID: 2773067093461657725, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} propertyPath: nextSceneName - value: FinalMenu + value: Level3_Release objectReference: {fileID: 0} - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} @@ -3109,6 +3109,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3972560853011912468, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: clips.Array.data[3].clip + value: + objectReference: {fileID: 8300000, guid: ebff1b1b6619bdf48a334db25b73db57, type: 3} - target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_Name @@ -3119,15 +3124,20 @@ PrefabInstance: propertyPath: speed value: 5 objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: dashTime + value: 0.4 + objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: runSpeed - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: dashPower - value: 15 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} diff --git a/Assets/Scenes/Levels/Level3_Release.unity b/Assets/Scenes/Levels/Level3_Release.unity index f311b50..e6ae550 100644 --- a/Assets/Scenes/Levels/Level3_Release.unity +++ b/Assets/Scenes/Levels/Level3_Release.unity @@ -141,7 +141,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -215,7 +215,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 20 + value: 22 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -475,7 +475,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 23 + value: 25 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -529,6 +529,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} +--- !u!1001 &84433021 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2773067093461657725, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: nextSceneName + value: FinalMenu + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalPosition.x + value: -252.63246 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalPosition.y + value: -17.100607 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657727, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_Name + value: Artifac + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} --- !u!1001 &173491616 PrefabInstance: m_ObjectHideFlags: 0 @@ -539,7 +613,7 @@ PrefabInstance: - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_RootOrder - value: 15 + value: 17 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} @@ -804,7 +878,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} @@ -1137,6 +1211,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277750315} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &298830134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_Name + value: Ladder (5) + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_RootOrder + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.x + value: -57.03 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.y + value: -15.06 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} --- !u!1 &308319554 GameObject: m_ObjectHideFlags: 0 @@ -1695,6 +1843,90 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 380778899} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &393029259 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1794451698336200490, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.57 + objectReference: {fileID: 0} + - target: {fileID: 5348459325736803047, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.73 + objectReference: {fileID: 0} + - target: {fileID: 7397361147327718850, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: instaKill + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_RootOrder + value: 41 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.x + value: -87.97 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.y + value: -11.44 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827165, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_Name + value: SawRiding (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 08d7423eab725344da0bad3b29f907dd, type: 3} --- !u!1 &410120562 GameObject: m_ObjectHideFlags: 0 @@ -1808,7 +2040,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 29 + value: 31 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -2068,7 +2300,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 27 + value: 29 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -2122,6 +2354,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} +--- !u!1001 &519617328 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_Name + value: Ladder (6) + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_RootOrder + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.x + value: -78.18 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.y + value: -23.38 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} --- !u!1 &524780037 GameObject: m_ObjectHideFlags: 0 @@ -2305,7 +2611,7 @@ Transform: m_LocalScale: {x: 3.9479299, y: 0.85665, z: 1.88005} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!1 &578153793 GameObject: @@ -2513,7 +2819,7 @@ PrefabInstance: - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} propertyPath: m_RootOrder - value: 14 + value: 16 objectReference: {fileID: 0} - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} @@ -2744,7 +3050,7 @@ Transform: - {fileID: 578153794} - {fileID: 580967975} m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &643948503 PrefabInstance: @@ -2756,7 +3062,7 @@ PrefabInstance: - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_RootOrder - value: 16 + value: 18 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} @@ -2840,7 +3146,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 24 + value: 26 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -3007,7 +3313,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 25 + value: 27 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -3071,7 +3377,7 @@ PrefabInstance: - target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4992519963305423117, guid: ba918907807ecda4982b8c9ca799aa42, type: 3} @@ -3157,7 +3463,7 @@ PrefabInstance: - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} @@ -3319,13 +3625,38 @@ PrefabInstance: - target: {fileID: 3454083825413701809, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 3972560853011912468, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: clips.Array.data[3].clip + value: + objectReference: {fileID: 8300000, guid: ebff1b1b6619bdf48a334db25b73db57, type: 3} - target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: speed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: dashTime + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: runSpeed + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: dashPower + value: 8 + objectReference: {fileID: 0} - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: powerImage @@ -3334,7 +3665,7 @@ PrefabInstance: - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} @@ -3394,6 +3725,75 @@ Camera: type: 3} m_PrefabInstance: {fileID: 772342411} m_PrefabAsset: {fileID: 0} +--- !u!1001 &786627548 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_Name + value: PowerDoubleJump (2) + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_RootOrder + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalPosition.x + value: -122.68 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalPosition.y + value: -29.05 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} --- !u!1001 &802075196 PrefabInstance: m_ObjectHideFlags: 0 @@ -3409,7 +3809,7 @@ PrefabInstance: - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} @@ -3478,7 +3878,7 @@ PrefabInstance: - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} @@ -3552,7 +3952,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 26 + value: 28 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -3905,7 +4305,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 18 + value: 20 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -3969,7 +4369,7 @@ PrefabInstance: - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_RootOrder - value: 10 + value: 12 objectReference: {fileID: 0} - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} @@ -4503,7 +4903,7 @@ PrefabInstance: - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} @@ -4675,7 +5075,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 17 + value: 19 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -4749,7 +5149,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 30 + value: 32 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -4823,7 +5223,7 @@ PrefabInstance: - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} propertyPath: m_RootOrder - value: 13 + value: 15 objectReference: {fileID: 0} - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} @@ -5362,7 +5762,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 19 + value: 21 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -5416,6 +5816,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!1001 &1374139276 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_Name + value: Ladder (7) + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_RootOrder + value: 39 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.x + value: -85.35 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.y + value: -18.48 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} --- !u!1 &1374901193 GameObject: m_ObjectHideFlags: 0 @@ -5600,7 +6074,7 @@ Transform: m_LocalScale: {x: 8.849239, y: 0.49194, z: 1.9347999} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1435707326 GameObject: @@ -5994,7 +6468,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} @@ -6234,6 +6708,90 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1607730469} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1636685543 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1794451698336200490, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.28 + objectReference: {fileID: 0} + - target: {fileID: 5348459325736803047, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.73 + objectReference: {fileID: 0} + - target: {fileID: 7397361147327718850, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: instaKill + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.x + value: -79.59 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.y + value: -15.06 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8224448297729827165, guid: 08d7423eab725344da0bad3b29f907dd, + type: 3} + propertyPath: m_Name + value: SawRiding + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 08d7423eab725344da0bad3b29f907dd, type: 3} --- !u!1 &1708615056 GameObject: m_ObjectHideFlags: 0 @@ -6342,7 +6900,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} @@ -6509,7 +7067,7 @@ PrefabInstance: - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} propertyPath: m_RootOrder - value: 22 + value: 24 objectReference: {fileID: 0} - target: {fileID: 6364420394033728396, guid: bfdc29a51fc8dab47b1ca7fc9509e157, type: 3} @@ -6676,7 +7234,7 @@ PrefabInstance: - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} propertyPath: m_RootOrder - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} @@ -7587,7 +8145,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 31 + value: 33 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} @@ -7597,7 +8155,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_LocalPosition.y - value: -19.64 + value: -20.46 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} @@ -7661,7 +8219,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 21 + value: 23 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -7921,7 +8479,7 @@ PrefabInstance: - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} propertyPath: m_RootOrder - value: 12 + value: 14 objectReference: {fileID: 0} - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} diff --git a/Assets/Scripts/ObjectManager.cs b/Assets/Scripts/ObjectManager.cs index 1c61e2a..5541e8a 100644 --- a/Assets/Scripts/ObjectManager.cs +++ b/Assets/Scripts/ObjectManager.cs @@ -110,7 +110,7 @@ public class ObjectManager : MonoBehaviour playerManager = other.gameObject.GetComponent(); meshRenderer.materials[0].EnableKeyword("_EMISSION"); meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f); - meshRenderer.materials[1].SetFloat("_Outline", 0.25f); + meshRenderer.materials[1].SetFloat("_Outline", 2.5f); interact = true; } diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 9f1b12e..a1c4b02 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -67,7 +67,7 @@ public class PlayerManager : MonoBehaviour if (Input.GetKeyDown(KeyCode.Escape)) { DataManager.Level(SceneManager.GetActiveScene().buildIndex); - SceneManager.LoadScene(4); + SceneManager.LoadScene(5); } if (actualHealth <= 0 || gameObject.transform.position.y < -400.0f) {