changed death animation, moved enemies

2023-05-01 13:35:45 -07:00
parent 61939d5090
commit 58222ed569
2 changed files with 91 additions and 53 deletions
--- a/Assets/Scenes/GrappleScene.unity
+++ b/Assets/Scenes/GrappleScene.unity
@@ -1653,7 +1653,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 45
+      value: 46
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
@@ -2028,7 +2028,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 47
+      value: 48
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
@@ -2381,7 +2381,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: m_RootOrder
-      value: 43
+      value: 44
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: m_LocalPosition.x
@@ -3227,11 +3227,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -11.59
+      value: -13.42
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 50.05
+      value: 51.6
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.z
@@ -3423,7 +3423,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 5447655033524966674, guid: 5e69412b9141e4bdeaaaf00f6dce7b82, type: 3}
      propertyPath: m_RootOrder
-      value: 41
+      value: 42
      objectReference: {fileID: 0}
    - target: {fileID: 5447655033524966674, guid: 5e69412b9141e4bdeaaaf00f6dce7b82, type: 3}
      propertyPath: m_LocalPosition.x
@@ -3652,7 +3652,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: m_RootOrder
-      value: 44
+      value: 45
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: m_LocalPosition.x
@@ -3883,7 +3883,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 48
+      value: 49
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
@@ -3975,7 +3975,7 @@ Transform:
  - {fileID: 1831209646}
  - {fileID: 1350631289}
  m_Father: {fileID: 0}
-  m_RootOrder: 53
+  m_RootOrder: 54
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1325296801
 PrefabInstance:
@@ -4065,7 +4065,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 50
+      value: 51
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
@@ -4376,8 +4376,73 @@ Transform:
  - {fileID: 1479717957}
  - {fileID: 1818375522}
  m_Father: {fileID: 0}
-  m_RootOrder: 51
+  m_RootOrder: 52
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1383539493
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_RootOrder
+      value: 41
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 49.05
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171997, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_Name
+      value: Bat (17)
+      objectReference: {fileID: 0}
+    - target: {fileID: 493245979038171999, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
+      propertyPath: m_FlipX
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
 --- !u!1001 &1386488689
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -4627,7 +4692,7 @@ Transform:
  - {fileID: 684906576}
  - {fileID: 1325296802}
  m_Father: {fileID: 0}
-  m_RootOrder: 54
+  m_RootOrder: 55
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1442389786
 PrefabInstance:
@@ -4639,7 +4704,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 46
+      value: 47
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
@@ -5461,7 +5526,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: m_RootOrder
-      value: 42
+      value: 43
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: fe6515c8ba67e4334bd83dff507ec83e, type: 3}
      propertyPath: m_LocalPosition.x
@@ -5983,15 +6048,15 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 49
+      value: 50
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 30.46143
+      value: 34.99
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 25.86
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.z
@@ -113396,11 +113461,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -3.9
+      value: -8.48
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 48.34
+      value: 50.41
      objectReference: {fileID: 0}
    - target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
      propertyPath: m_LocalPosition.z
@@ -113931,7 +113996,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_RootOrder
-      value: 52
+      value: 53
      objectReference: {fileID: 0}
    - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3}
      propertyPath: m_LocalPosition.x
@@ -114000,7 +114065,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3}
      propertyPath: m_RootOrder
-      value: 55
+      value: 56
      objectReference: {fileID: 0}
    - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3}
      propertyPath: m_LocalPosition.x