Fixed double jump powerup

5 years ago · 88f2560a07
parent e971a41718
commit 88f2560a07
3 changed files with 66 additions and 77 deletions
--- a/MuseumGame/Assets/Scenes/DogLevel/DogTunnel.unity
+++ b/MuseumGame/Assets/Scenes/DogLevel/DogTunnel.unity
@ -5029,6 +5029,63 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
+--- !u!1001 &543175609
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 51.40989
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.39229703
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191441, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4981605622244191447, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
+      propertyPath: m_Name
+      value: Double Jump Powerup
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9e4f8f90d5b8048c8b37f2943c22fa79, type: 3}
 --- !u!1 &612235266
 GameObject:
  m_ObjectHideFlags: 0
@ -8160,71 +8217,6 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
--- !u!1001 &1569398645
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 61480157875768234, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: powerup
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 61480157875768234, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: artIndex
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 51.452713
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.13909972
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8891684601414002462, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
-      propertyPath: m_Name
-      value: Powerup
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
 --- !u!1 &1803381905
 GameObject:
  m_ObjectHideFlags: 0
--- a/MuseumGame/ProjectSettings/EditorBuildSettings.asset
+++ b/MuseumGame/ProjectSettings/EditorBuildSettings.asset
@ -14,9 +14,6 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/DemoLevels/Spawn.unity
    guid: eaf2cb5b0460c45979b9dbd52915e53e
-  - enabled: 0
-    path: Assets/Scenes/SampleScene.unity
-    guid: 2cda990e2423bbf4892e6590ba056729
  - enabled: 1
    path: Assets/Scenes/DemoLevels/Tower.unity
    guid: 2c6a0b307e5064fd6afdabeb1ee26bad
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ b/MuseumGame/UserSettings/EditorUserSettings.asset
@ -6,31 +6,31 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
      flags: 0
    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
      flags: 0
    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
+      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f15edf52676f7e93ffdfe
      flags: 0
    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f15edf52676f7e93ffdfe
+      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f1cece57a2decee22f0
      flags: 0
    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f1cece57a2decee22f0
+      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07f5ef7a2decee22f0
      flags: 0
    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07f5ef7a2decee22f0
+      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07eaf2313dacf238e0f323
      flags: 0
    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07eaf2313dacf238e0f323
+      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f11edf32776f7e93ffdfe
      flags: 0
    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f11edf32776f7e93ffdfe
+      value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323
      flags: 0
    RecentlyUsedScenePath-9:
      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a