Merge pull request #358 from CookieJari/february-asher

day1 updates
CookieJari · Feb 1, 2023 · a64d84d · a64d84d
2 parents a330a20 + ca9afbb
commit a64d84d
Show file tree

Hide file tree

Showing 8 changed files with 13,520 additions and 14,974 deletions.
diff --git a/Assets/Animations/Anim Movement/Enemy/Boss_Attack.anim b/Assets/Animations/Anim Movement/Enemy/Boss_Attack.anim
@@ -83,7 +83,7 @@ AnimationClip:
       value: {fileID: 21300000, guid: cf67bf0dc1e947148aab59538f10d949, type: 3}
     - time: 3.5
       value: {fileID: 21300000, guid: 0b4541f1f83a7514fb6cfbeb6da5ea07, type: 3}
-    - time: 6.5
+    - time: 11.983334
       value: {fileID: 21300000, guid: 0b4541f1f83a7514fb6cfbeb6da5ea07, type: 3}
     attribute: m_Sprite
     path: 
@@ -142,7 +142,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 6.516667
+    m_StopTime: 12
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

diff --git a/Assets/Scenes/Boss Level.unity b/Assets/Scenes/Boss Level.unity
@@ -12769,7 +12769,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: healthValue
-      value: 300
+      value: 500
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: pickupheart
@@ -13748,7 +13748,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: healthValue
-      value: 300
+      value: 500
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: pickupheart
@@ -17890,7 +17890,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: healthValue
-      value: 300
+      value: 500
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: pickupheart
@@ -18195,7 +18195,7 @@ PrefabInstance:
       objectReference: {fileID: 484548150}
     - target: {fileID: 1991005656, guid: d2074ff6bdc484a42a3d9d3a0d6f0396, type: 3}
       propertyPath: HP
-      value: 1985
+      value: 985
       objectReference: {fileID: 0}
     - target: {fileID: 367250509195479438, guid: d2074ff6bdc484a42a3d9d3a0d6f0396, type: 3}
       propertyPath: m_RootOrder

diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity
@@ -188244,7 +188244,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: healthValue
-      value: 250
+      value: 500
       objectReference: {fileID: 0}
     - target: {fileID: 6563447970354068237, guid: 0378f737e42c69040855a8f4642fa507, type: 3}
       propertyPath: pickupheart
@@ -189845,7 +189845,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2882124030410108843, guid: ed775b2ee50a08b4294f17bacec5ae37, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -15.58279
+      value: -15.585447
       objectReference: {fileID: 0}
     - target: {fileID: 2882124030410108843, guid: ed775b2ee50a08b4294f17bacec5ae37, type: 3}
       propertyPath: m_LocalPosition.y
@@ -189902,7 +189902,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 927961164525596176, guid: 424ed337fe649534dbbd84e5f66c4d9d, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -15.58279
+      value: -15.585447
       objectReference: {fileID: 0}
     - target: {fileID: 927961164525596176, guid: 424ed337fe649534dbbd84e5f66c4d9d, type: 3}
       propertyPath: m_LocalPosition.y
@@ -189999,7 +189999,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4298266081770166499, guid: 68d020efb7bf7b0448e28d14ecba1a01, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -15.58279
+      value: -15.585447
       objectReference: {fileID: 0}
     - target: {fileID: 4298266081770166499, guid: 68d020efb7bf7b0448e28d14ecba1a01, type: 3}
       propertyPath: m_LocalPosition.y

diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity
@@ -471156,7 +471156,7 @@ PrefabInstance:
       objectReference: {fileID: 1442380138}
     - target: {fileID: 3589446470481159759, guid: 5c53bd0f8eaf0ac4a877dc6124d20f18, type: 3}
       propertyPath: groundLayer.m_Bits
-      value: 73792
+      value: 106560
       objectReference: {fileID: 0}
     - target: {fileID: 3589446470481159760, guid: 5c53bd0f8eaf0ac4a877dc6124d20f18, type: 3}
       propertyPath: m_Name