Ladder mobile controls implemented

Pohyb levo & pravo funguje
Repair coliders
2021-02-14 12:38:22 +01:00 · 2021-02-04 19:02:44 +01:00 · 2021-01-31 18:04:29 +01:00 · 2021-01-31 17:54:00 +01:00 · 2021-01-31 16:59:22 +01:00 · 2021-01-31 16:49:09 +01:00
10 changed files with 2046 additions and 66 deletions
--- a/Assets/Scenes/Levels/Level1_Release.unity
+++ b/Assets/Scenes/Levels/Level1_Release.unity
--- 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,11 +3109,46 @@ 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: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: m_Radius
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: m_Center.y
+      value: -0.1
+      objectReference: {fileID: 0}
    - 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
--- 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,48 @@ 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: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: m_Radius
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: m_Center.y
+      value: -0.1
      objectReference: {fileID: 0}
    - 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 +3675,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 +3735,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 +3819,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 +3888,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 +3962,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 +4315,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 +4379,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 +4913,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 +5085,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 +5159,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 +5233,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 +5772,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 +5826,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 +6084,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 +6478,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 +6718,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 +6910,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 +7077,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 +7244,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 +8155,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 +8165,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 +8229,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 +8489,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}
--- a/Assets/Scenes/Menu/FinalMenu.unity
+++ b/Assets/Scenes/Menu/FinalMenu.unity
@@ -545,6 +545,142 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 393393098}
  m_CullTransparentMesh: 0
+--- !u!1 &482342330
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 482342333}
+  - component: {fileID: 482342332}
+  - component: {fileID: 482342331}
+  m_Layer: 0
+  m_Name: AudioManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &482342331
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482342330}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: c29860436d5147346b6e77bc7a49c405, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!81 &482342332
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482342330}
+  m_Enabled: 1
+--- !u!4 &482342333
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482342330}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 582, y: 293.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &760805001
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/AudioManager.cs
+++ b/Assets/Scripts/AudioManager.cs
@@ -22,13 +22,15 @@ public class AudioManager : MonoBehaviour
    }

    // Update is called once per frame
-    public void Play(string name)
+    public void Play(string name, bool checkIfPlay = false)
    {
        AudioSound s = Array.Find(clips, sound => sound.name == name);
        if (s == null) {
            return;
        }
        Debug.Log("Sound is playng");
+        if (!s.source.isPlaying || !checkIfPlay) {
            s.source.Play();
        }
+    }
 }
--- a/Assets/Scripts/MainMenu.cs
+++ b/Assets/Scripts/MainMenu.cs
@@ -35,7 +35,7 @@ public class MainMenu : MonoBehaviour

    public void Score()
    {
-        StartCoroutine(GetText("dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php"));
+        StartCoroutine(GetText("https://dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php"));
    }

    public void BackToMainMenu()
@@ -60,7 +60,7 @@ public class MainMenu : MonoBehaviour
        form.AddField("name", name.text);
        form.AddField("score", DataManager.Score().ToString());

-        StartCoroutine(PostText("dev.steelants.cz/vasek/GGJ2021/GeorgeJones/Server/api.php", form));
+        StartCoroutine(PostText("https://dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php", form));
        DataManager.Level(0);
        SceneManager.LoadScene(0);
    }
--- a/Assets/Scripts/ObjectManager.cs
+++ b/Assets/Scripts/ObjectManager.cs
@@ -170,7 +170,7 @@ public class ObjectManager : MonoBehaviour
                playerManager = collision.gameObject.GetComponent<PlayerManager>();
                if (playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 2)
                {
-                    meshRenderer.materials[1].SetFloat("_Outline", 0.1f);
+                    meshRenderer.materials[1].SetFloat("_Outline", 0.01f);
                } 
                else
                {
--- a/Assets/Scripts/PlayerManager.cs
+++ b/Assets/Scripts/PlayerManager.cs
@@ -1,4 +1,6 @@
-using System.Collections;
+#define testing //Remove this line to disable testing mode
+
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -20,12 +22,16 @@ public class PlayerManager : MonoBehaviour
    private Rigidbody rigidBody;
    private PowerCubeManager powerCubeManager;
    private bool interact = false;
+    private float moveDirection = 0f; //Mobile phone equivalent of Input.GetAxis("Horizontal")
+    private float climbDirection = 0f;//Mobile phone equivalent of Input.GetAxis("Vertical")
+    private bool wantToJump = false; //Mobile phone equivalent of Input.GetAxis("Jump")

    public List<int> activeAbility = new List<int>(); //without ability=0 or null, dubleJump = 1, push/pull = 2, dash = 3, ladder = 4
    public List<GameObject> PowerPrefabs = new List<GameObject>(); //dubleJump = 0, push/pull = 1, dash = 2, ladder = 3
    public List<Sprite> powerIcons = new List<Sprite>(); //dubleJump = 0, push/pull = 1, dash = 2, ladder = 3
    public Image powerImage;
    private bool dubleJump = true;
+    [SerializeField]
    private GameObject pushPullObject;
    private float pushPullObjectDistance;
    public float dashPower = 40f;
@@ -46,6 +52,8 @@ public class PlayerManager : MonoBehaviour
    private Vector3 saveCameraPosition;
    private float savePower;

+    public GameObject[] upNdownLadder;
+
    // Start is called before the first frame update
    void Start()
    {
@@ -67,14 +75,16 @@ public class PlayerManager : MonoBehaviour
        if (Input.GetKeyDown(KeyCode.Escape))
        {
            DataManager.Level(SceneManager.GetActiveScene().buildIndex);
-            SceneManager.LoadScene(6);
+            SceneManager.LoadScene(5);
        }
        if (actualHealth <= 0 || gameObject.transform.position.y < -400.0f)
        {
            cannotMove = true;
            playerAnimator.Play("Die");
-            //FindObjectOfType<AudioManager>().Play("lose");
+            FindObjectOfType<AudioManager>().Play("Lose");
        }
+
+#if UNITY_STANDALONE || UNITY_EDITOR
        if (interact)
        {
            if (powerCubeManager != null && (
@@ -86,12 +96,28 @@ public class PlayerManager : MonoBehaviour
            )) {
                if (Input.GetKeyUp(KeyCode.E))
                {
-                    //FindObjectOfType<AudioManager>().Play("Pickup");
+                    FindObjectOfType<AudioManager>().Play("Pickup");
                    playerAnimator.SetTrigger("Eat");
                    interact = false;
                }
            }
        }
+#endif
+
+#if UNITY_ANDROID || UNITY_IPHONE || testing //testing is defined at line 0
+        if(onLadder && upNdownLadder[0].active == false)
+        {
+            upNdownLadder[0].SetActive(true);
+            upNdownLadder[1].SetActive(true);
+        }
+        else
+        if(onLadder == false && upNdownLadder[0].active == true)
+        {
+            upNdownLadder[0].SetActive(false);
+            upNdownLadder[1].SetActive(false);
+        }
+#endif
+
        AbilityAction();
        DeactivePowerCube();
        if (!cannotMove) {
@@ -114,12 +140,30 @@ public class PlayerManager : MonoBehaviour
        }
    }

+#if UNITY_ANDROID || UNITY_IPHONE || testing //testing is defined at line 0
+    public void pickupAbility() //Mobile controls
+    {
+        if (interact)
+        {
+            if (powerCubeManager != null && (
+                powerCubeManager.powerType == PowerCubeManager.PowerType.Artefact ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.DubleJump ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.PushPull ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.Dash ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.Ladder
+            ))
+            {
+                    FindObjectOfType<AudioManager>().Play("Pickup");
+                    playerAnimator.SetTrigger("Eat");
+                    interact = false;
+            }
+        }
+    }
+#endif
+
    private void FixedUpdate()
    {
-        if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
-        {
-            Jump();
-        }
+        JumpAction();
    }

    private void AbilityAction()
@@ -246,10 +290,9 @@ public class PlayerManager : MonoBehaviour
    void Animation()
    {
        float localSpeed = 5f;
-        if (Input.GetAxis("Horizontal") > 0)
+        if (Input.GetAxis("Horizontal") > 0 || moveDirection > 0)
        {
            playerAnimator.SetBool("Walk", true);
-            FindObjectOfType<AudioManager>().Play("Walk");
            if (pushPullObject == null) {
                playerAnimator.transform.rotation = Quaternion.Lerp(
                    playerAnimator.transform.rotation,
@@ -258,10 +301,9 @@ public class PlayerManager : MonoBehaviour
                );
            }
        }
-        else if (Input.GetAxis("Horizontal") < 0)
+        else if (Input.GetAxis("Horizontal") < 0 || moveDirection < 0)
        {
            playerAnimator.SetBool("Walk", true);
-            FindObjectOfType<AudioManager>().Play("Walk");
            if (pushPullObject == null)
            {
                playerAnimator.transform.rotation = Quaternion.Lerp(
@@ -277,18 +319,76 @@ public class PlayerManager : MonoBehaviour
        }
    }

+    
+    public void changeMoveDirection(float input) //Mobile phone controls
+    {
+        //Debug.Log(input);
+        moveDirection += input;
+    }
+
+    public void changeClimbDirection(float input) //Mobile phone controls
+    {
+        climbDirection += input;
+    }
+
    void Move()
    {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && (!testing)
+        if (Input.GetAxis("Horizontal") != 0 || moveDirection != 0)
+        {
+            if (!run) {
+                FindObjectOfType<AudioManager>().Play("Walk", true);
+            }
+            else
+            {
+                FindObjectOfType<AudioManager>().Play("Run", true);
+            }
+        }
        rigidBody.MovePosition(
            transform.position +
            (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) +
-            (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime)
+            (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal")   * Time.deltaTime) //TODO: uncomment Input.GetAxis after testing
        );
+#endif
+
+#if UNITY_ANDROID || UNITY_IPHONE || testing
+        if(moveDirection != 0)
+    {
+        if(!run)
+        {
+            FindObjectOfType<AudioManager>().Play("Walk", true);
+        }
+        else
+        {
+            FindObjectOfType<AudioManager>().Play("Run", true);
+        }
+    }
+    rigidBody.MovePosition(
+            transform.position +
+            (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * climbDirection * Time.deltaTime) : Vector3.zero) +
+            (transform.right * (run ? runSpeed : speed) * moveDirection * Time.deltaTime)
+        );
+#endif
+
+    }
+
+    public void JumpAction()
+    {
+        if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
+        {
+            Jump();
+        }
+    }
+
+    public void Jump_Mobile(bool b) //Mobile phone controls
+    {
+        wantToJump = b;
    }

    void Jump()
    {
-        if (Input.GetAxisRaw("Jump") > 0)
+#if UNITY_STANDALONE
+        if (Input.GetAxisRaw("Jump") > 0 || wantToJump)
        {
            if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)) )
            {
@@ -305,6 +405,27 @@ public class PlayerManager : MonoBehaviour
                FindObjectOfType<AudioManager>().Play("Jump");
            }
        }
+#endif
+
+#if UNITY_ANDROID || UNITY_IPHONE
+    if (wantToJump)
+    {
+        if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)) )
+        {
+            if (!onGround)
+            {
+                dubleJump = false;
+            }
+            FindObjectOfType<AudioManager>().Play("Jump");
+            pushPullObject = null;
+            rigidBody.AddForce(
+                (transform.up * jump * 10 * Time.deltaTime), 
+                ForceMode.VelocityChange
+            );
+            FindObjectOfType<AudioManager>().Play("Jump");
+        }
+    }
+#endif
    }

    private void DropPower()
--- a/Assets/Scripts/PowerCubeManager.cs
+++ b/Assets/Scripts/PowerCubeManager.cs
@@ -48,11 +48,11 @@ public class PowerCubeManager : MonoBehaviour
            {
                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.4f);
+                meshRenderer.materials[1].SetFloat("_Outline", 0.04f);
            }
            else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder)
            {
-                meshRenderer.materials[1].SetFloat("_Outline", 6f);
+                meshRenderer.materials[1].SetFloat("_Outline",0.6f);
                meshRenderer.materials[0].EnableKeyword("_EMISSION");
                meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f);
            }
--- a/Assets/Shaders/Border.shader
+++ b/Assets/Shaders/Border.shader
@@ -58,7 +58,7 @@ Shader "Outlined/Silhouette Only" {
 			Name "OUTLINE"
 			Tags { "LightMode" = "Always" }
 			Cull Off
-			Offset 5,5
+			Offset 15,15


 		// you can choose what kind of blending mode you want for the outline
Author	SHA1	Message	Date
StarzzDrak	736106f462	Ladder mobile controls implemented	2021-02-14 12:38:22 +01:00
StarzzDrak	836bbaca8d	Pohyb levo & pravo funguje	2021-02-04 19:02:44 +01:00
haitem	ce7b3cb90b	Repair coliders	2021-01-31 18:04:29 +01:00
haitem	c829cbadfe	Remake some points in scenes	2021-01-31 17:54:00 +01:00
haitem	0cfe588fb0	Update MainMenu.cs	2021-01-31 16:59:22 +01:00
haitem	4536ae2f5d	Update MainMenu.cs	2021-01-31 16:49:09 +01:00
haitem	69305eb47f	Update MainMenu.cs	2021-01-31 16:42:43 +01:00
haitem	dd925c3796	Fix for web version	2021-01-31 16:40:24 +01:00
haitem	c09508323e	Fixis	2021-01-31 16:29:34 +01:00
haitem	3695ff634e	Make some speed edit for web version	2021-01-31 16:14:04 +01:00
haitem	18a2f9944d	Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021	2021-01-31 15:51:12 +01:00
haitem	2dbeaa26b4	Some sound edit	2021-01-31 15:51:03 +01:00
GamerClassN7	aed80e1e85	Final Screen	2021-01-31 15:39:02 +01:00
haitem	93e4d21108	Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021	2021-01-31 15:31:53 +01:00
haitem	2eeb0fd521	fix escape	2021-01-31 15:31:43 +01:00