Merge branch 'develop' into bugfix/NAOR-112

OTK-LAB · Dec 22, 2023 · 2549271 · 2549271
2 parents 2a22369 + 831e6a7
commit 2549271
Show file tree

Hide file tree

Showing 54 changed files with 9,286 additions and 2,191 deletions.
diff --git a/Assets/Animations/MeleeAnim/Attack1.anim b/Assets/Animations/MeleeAnim/Attack1.anim
@@ -20,19 +20,15 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: ec7f290adc6c3614388579668a5544b2, type: 3}
+      value: {fileID: 21300000, guid: 1c7c15efa3bceac4e8d15349c583221d, type: 3}
     - time: 0.083333336
-      value: {fileID: 21300000, guid: bdf3cbeacd2741d41921b45486b135a1, type: 3}
+      value: {fileID: 21300000, guid: deb705ea1d0207d4e91b91ee1094229f, type: 3}
     - time: 0.16666667
-      value: {fileID: 21300000, guid: a60236631d49d7946be4f462e60c47ee, type: 3}
+      value: {fileID: 21300000, guid: ae0c632fa68bfb24fa99abf33ebc179c, type: 3}
     - time: 0.25
-      value: {fileID: 21300000, guid: 53960355d73a97c459bd61ff181f9282, type: 3}
+      value: {fileID: 21300000, guid: f242b4b7d40a10a4ea5e9618d4b13435, type: 3}
     - time: 0.33333334
-      value: {fileID: 21300000, guid: f57e12fc3de2ba642be90b0143449d25, type: 3}
-    - time: 0.41666666
-      value: {fileID: 21300000, guid: ad34273e1f47e2341ac7059093347b42, type: 3}
-    - time: 0.5
-      value: {fileID: 21300000, guid: ed0ea2b078ec55a4681a62fae35fab00, type: 3}
+      value: {fileID: 21300000, guid: cf035a530902a1d4eb1cec7dd7bd4a9d, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -52,19 +48,17 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: ec7f290adc6c3614388579668a5544b2, type: 3}
-    - {fileID: 21300000, guid: bdf3cbeacd2741d41921b45486b135a1, type: 3}
-    - {fileID: 21300000, guid: a60236631d49d7946be4f462e60c47ee, type: 3}
-    - {fileID: 21300000, guid: 53960355d73a97c459bd61ff181f9282, type: 3}
-    - {fileID: 21300000, guid: f57e12fc3de2ba642be90b0143449d25, type: 3}
-    - {fileID: 21300000, guid: ad34273e1f47e2341ac7059093347b42, type: 3}
-    - {fileID: 21300000, guid: ed0ea2b078ec55a4681a62fae35fab00, type: 3}
+    - {fileID: 21300000, guid: 1c7c15efa3bceac4e8d15349c583221d, type: 3}
+    - {fileID: 21300000, guid: deb705ea1d0207d4e91b91ee1094229f, type: 3}
+    - {fileID: 21300000, guid: ae0c632fa68bfb24fa99abf33ebc179c, type: 3}
+    - {fileID: 21300000, guid: f242b4b7d40a10a4ea5e9618d4b13435, type: 3}
+    - {fileID: 21300000, guid: cf035a530902a1d4eb1cec7dd7bd4a9d, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.5833333
+    m_StopTime: 0.4166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -84,10 +78,10 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
-  - time: 0.5833333
+  - time: 0.41666666
     functionName: backtoCoolDown
     data: 
     objectReferenceParameter: {fileID: 0}
-    floatParameter: 0
+    floatParameter: 2
     intParameter: 2
     messageOptions: 0
diff --git a/Assets/Animations/MeleeAnim/Cooldown1.anim b/Assets/Animations/MeleeAnim/Cooldown1.anim
@@ -20,17 +20,19 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 58ae80fcbafaf43409f6c37383ba9a8c, type: 3}
+      value: {fileID: 21300000, guid: 56a05a79fe6384e4387d617192a5b93b, type: 3}
     - time: 0.16666667
-      value: {fileID: 21300000, guid: b37b8f432f243d947b9c54d77b40d08c, type: 3}
+      value: {fileID: 21300000, guid: 26694758683fd8b4ebeee052a649cc74, type: 3}
     - time: 0.33333334
-      value: {fileID: 21300000, guid: 8b699dda3b66e7149b3a3e0b4eeeff16, type: 3}
+      value: {fileID: 21300000, guid: acd234b133cbf9d49a7da136c901f9d2, type: 3}
     - time: 0.5
-      value: {fileID: 21300000, guid: 87fcc504506f3ec4da38b61664d2bc28, type: 3}
+      value: {fileID: 21300000, guid: 3f91b02248fd39b4a848736918caffc8, type: 3}
     - time: 0.6666667
-      value: {fileID: 21300000, guid: b1736965bc1a4e54bb489175ff556588, type: 3}
+      value: {fileID: 21300000, guid: 0bc77ff36afe9314f87ee637f5f81d82, type: 3}
     - time: 0.8333333
-      value: {fileID: 21300000, guid: fb5f9717f838eca4995e15adeff4ddbb, type: 3}
+      value: {fileID: 21300000, guid: bde08ddba54dfdf46a4a89e9ffcfac06, type: 3}
+    - time: 1
+      value: {fileID: 21300000, guid: 5adf1852e0822dc4998c30e6f209bd07, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -50,18 +52,19 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 58ae80fcbafaf43409f6c37383ba9a8c, type: 3}
-    - {fileID: 21300000, guid: b37b8f432f243d947b9c54d77b40d08c, type: 3}
-    - {fileID: 21300000, guid: 8b699dda3b66e7149b3a3e0b4eeeff16, type: 3}
-    - {fileID: 21300000, guid: 87fcc504506f3ec4da38b61664d2bc28, type: 3}
-    - {fileID: 21300000, guid: b1736965bc1a4e54bb489175ff556588, type: 3}
-    - {fileID: 21300000, guid: fb5f9717f838eca4995e15adeff4ddbb, type: 3}
+    - {fileID: 21300000, guid: 56a05a79fe6384e4387d617192a5b93b, type: 3}
+    - {fileID: 21300000, guid: 26694758683fd8b4ebeee052a649cc74, type: 3}
+    - {fileID: 21300000, guid: acd234b133cbf9d49a7da136c901f9d2, type: 3}
+    - {fileID: 21300000, guid: 3f91b02248fd39b4a848736918caffc8, type: 3}
+    - {fileID: 21300000, guid: 0bc77ff36afe9314f87ee637f5f81d82, type: 3}
+    - {fileID: 21300000, guid: bde08ddba54dfdf46a4a89e9ffcfac06, type: 3}
+    - {fileID: 21300000, guid: 5adf1852e0822dc4998c30e6f209bd07, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 1.1666666
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

diff --git a/Assets/Animations/MeleeAnim/Dead1.anim b/Assets/Animations/MeleeAnim/Dead1.anim
@@ -20,17 +20,15 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 146e53bb4564c6e48a19bec386cb07a0, type: 3}
-    - time: 0.06666667
-      value: {fileID: 21300000, guid: c15242ba0d9dae241b1fbbffa97a5caf, type: 3}
+      value: {fileID: 21300000, guid: 8765daa4e3e0c7e4d98152da97c2039a, type: 3}
     - time: 0.13333334
-      value: {fileID: 21300000, guid: 7672f635fd55b2d43abf8299b1a23036, type: 3}
-    - time: 0.2
-      value: {fileID: 21300000, guid: 136d3b564c1f3774caa1dc97ace2f5b5, type: 3}
+      value: {fileID: 21300000, guid: 45c4c88fd8f37f64ca8fdb48832ad968, type: 3}
     - time: 0.26666668
-      value: {fileID: 21300000, guid: 51bc23a643348e84da0d0029ad07d085, type: 3}
-    - time: 0.33333334
-      value: {fileID: 21300000, guid: 57881c7823b751744b3dbb53c59940b4, type: 3}
+      value: {fileID: 21300000, guid: 33e51ad7a2e96b1479bb34ec0061d366, type: 3}
+    - time: 0.4
+      value: {fileID: 21300000, guid: 389f868884b17d74ba97c2c9ba2a77b0, type: 3}
+    - time: 0.53333336
+      value: {fileID: 21300000, guid: 7e9713483444dbb42ba150e437bd5e2f, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -50,18 +48,17 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 146e53bb4564c6e48a19bec386cb07a0, type: 3}
-    - {fileID: 21300000, guid: c15242ba0d9dae241b1fbbffa97a5caf, type: 3}
-    - {fileID: 21300000, guid: 7672f635fd55b2d43abf8299b1a23036, type: 3}
-    - {fileID: 21300000, guid: 136d3b564c1f3774caa1dc97ace2f5b5, type: 3}
-    - {fileID: 21300000, guid: 51bc23a643348e84da0d0029ad07d085, type: 3}
-    - {fileID: 21300000, guid: 57881c7823b751744b3dbb53c59940b4, type: 3}
+    - {fileID: 21300000, guid: 8765daa4e3e0c7e4d98152da97c2039a, type: 3}
+    - {fileID: 21300000, guid: 45c4c88fd8f37f64ca8fdb48832ad968, type: 3}
+    - {fileID: 21300000, guid: 33e51ad7a2e96b1479bb34ec0061d366, type: 3}
+    - {fileID: 21300000, guid: 389f868884b17d74ba97c2c9ba2a77b0, type: 3}
+    - {fileID: 21300000, guid: 7e9713483444dbb42ba150e437bd5e2f, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.4
+    m_StopTime: 0.6
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

diff --git a/Assets/Animations/MeleeAnim/Hit1.anim b/Assets/Animations/MeleeAnim/Hit1.anim
@@ -20,21 +20,9 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 5ce160a11379d3143b83977f917cf359, type: 3}
+      value: {fileID: 21300000, guid: d2312e0eb7db1694a8fd6417bb9a1396, type: 3}
     - time: 0.06666667
-      value: {fileID: 21300000, guid: ed8f767cee667484ba5bdcccd15f4eae, type: 3}
-    - time: 0.13333334
-      value: {fileID: 21300000, guid: 4f6be07b091c77e4e9cce39a2958a641, type: 3}
-    - time: 0.2
-      value: {fileID: 21300000, guid: e82ebb1d1da944b4693498f74d514880, type: 3}
-    - time: 0.26666668
-      value: {fileID: 21300000, guid: bfc4e5d4dd7bc0f4b8e448cb85d1c755, type: 3}
-    - time: 0.33333334
-      value: {fileID: 21300000, guid: b16e7fc7c5b880241a2c5233fe65f46e, type: 3}
-    - time: 0.4
-      value: {fileID: 21300000, guid: 7590b175e75e543448619096c95fdbc5, type: 3}
-    - time: 0.46666667
-      value: {fileID: 21300000, guid: be16ae1bc5a83cc4caae64c598bc3afe, type: 3}
+      value: {fileID: 21300000, guid: 07222f42a4253a649b9f7a41d56e226c, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -54,20 +42,14 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 5ce160a11379d3143b83977f917cf359, type: 3}
-    - {fileID: 21300000, guid: ed8f767cee667484ba5bdcccd15f4eae, type: 3}
-    - {fileID: 21300000, guid: 4f6be07b091c77e4e9cce39a2958a641, type: 3}
-    - {fileID: 21300000, guid: e82ebb1d1da944b4693498f74d514880, type: 3}
-    - {fileID: 21300000, guid: bfc4e5d4dd7bc0f4b8e448cb85d1c755, type: 3}
-    - {fileID: 21300000, guid: b16e7fc7c5b880241a2c5233fe65f46e, type: 3}
-    - {fileID: 21300000, guid: 7590b175e75e543448619096c95fdbc5, type: 3}
-    - {fileID: 21300000, guid: be16ae1bc5a83cc4caae64c598bc3afe, type: 3}
+    - {fileID: 21300000, guid: d2312e0eb7db1694a8fd6417bb9a1396, type: 3}
+    - {fileID: 21300000, guid: 07222f42a4253a649b9f7a41d56e226c, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.53333336
+    m_StopTime: 0.13333334
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -86,4 +68,11 @@ AnimationClip:
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 0.13333334
+    functionName: afterHitState
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0.5
+    intParameter: 0
+    messageOptions: 0
diff --git a/Assets/Animations/MeleeAnim/Run.anim b/Assets/Animations/MeleeAnim/Run.anim
@@ -20,29 +20,21 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: faad704dd1c20db4481dd81d1387ab82, type: 3}
+      value: {fileID: 21300000, guid: 95a3a179e0cacb44b9f6c5031521b311, type: 3}
     - time: 0.06666667
-      value: {fileID: 21300000, guid: 1166160f1abf9db46ad2ebce82009b98, type: 3}
+      value: {fileID: 21300000, guid: b108c8b92bd08a046ad189f815b3d99f, type: 3}
     - time: 0.13333334
-      value: {fileID: 21300000, guid: 4f8e37fcae1ac5f4d91ef28e2f408f61, type: 3}
+      value: {fileID: 21300000, guid: f08154ed4510d74408fd69bbcf57a3a3, type: 3}
     - time: 0.2
-      value: {fileID: 21300000, guid: 73d8eabbba1c6bf4c9cae8b707cafaa3, type: 3}
+      value: {fileID: 21300000, guid: 7c620eacc2dfef4478179a56d787800d, type: 3}
     - time: 0.26666668
-      value: {fileID: 21300000, guid: 0931903f51c512b479a85d5fc4545cfd, type: 3}
+      value: {fileID: 21300000, guid: 991a91910b6fbe440830146ee9941fcc, type: 3}
     - time: 0.33333334
-      value: {fileID: 21300000, guid: 6ffe6083715713a4db7320163e627383, type: 3}
+      value: {fileID: 21300000, guid: aa619e3381bb4a24980c28c13892904f, type: 3}
     - time: 0.4
-      value: {fileID: 21300000, guid: 3c3b5c48cc534724194e0d9487af6ab1, type: 3}
+      value: {fileID: 21300000, guid: afba9544abdbfea4b837b1a0c828965f, type: 3}
     - time: 0.46666667
-      value: {fileID: 21300000, guid: a56d2e2b734653747a2e9caabbde728d, type: 3}
-    - time: 0.53333336
-      value: {fileID: 21300000, guid: c67d009a7232ab744bddab00f039ec19, type: 3}
-    - time: 0.6
-      value: {fileID: 21300000, guid: 7e543f34926844c4ba02aa63144cd539, type: 3}
-    - time: 0.6666667
-      value: {fileID: 21300000, guid: 9a1ee3cf8ae527445a243a604d1a8a75, type: 3}
-    - time: 0.73333335
-      value: {fileID: 21300000, guid: fe212c6a236cf1b499647c8d29a68315, type: 3}
+      value: {fileID: 21300000, guid: a38496d4d91f23244bdcc23882a64a3b, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -62,24 +54,20 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: faad704dd1c20db4481dd81d1387ab82, type: 3}
-    - {fileID: 21300000, guid: 1166160f1abf9db46ad2ebce82009b98, type: 3}
-    - {fileID: 21300000, guid: 4f8e37fcae1ac5f4d91ef28e2f408f61, type: 3}
-    - {fileID: 21300000, guid: 73d8eabbba1c6bf4c9cae8b707cafaa3, type: 3}
-    - {fileID: 21300000, guid: 0931903f51c512b479a85d5fc4545cfd, type: 3}
-    - {fileID: 21300000, guid: 6ffe6083715713a4db7320163e627383, type: 3}
-    - {fileID: 21300000, guid: 3c3b5c48cc534724194e0d9487af6ab1, type: 3}
-    - {fileID: 21300000, guid: a56d2e2b734653747a2e9caabbde728d, type: 3}
-    - {fileID: 21300000, guid: c67d009a7232ab744bddab00f039ec19, type: 3}
-    - {fileID: 21300000, guid: 7e543f34926844c4ba02aa63144cd539, type: 3}
-    - {fileID: 21300000, guid: 9a1ee3cf8ae527445a243a604d1a8a75, type: 3}
-    - {fileID: 21300000, guid: fe212c6a236cf1b499647c8d29a68315, type: 3}
+    - {fileID: 21300000, guid: 95a3a179e0cacb44b9f6c5031521b311, type: 3}
+    - {fileID: 21300000, guid: b108c8b92bd08a046ad189f815b3d99f, type: 3}
+    - {fileID: 21300000, guid: f08154ed4510d74408fd69bbcf57a3a3, type: 3}
+    - {fileID: 21300000, guid: 7c620eacc2dfef4478179a56d787800d, type: 3}
+    - {fileID: 21300000, guid: 991a91910b6fbe440830146ee9941fcc, type: 3}
+    - {fileID: 21300000, guid: aa619e3381bb4a24980c28c13892904f, type: 3}
+    - {fileID: 21300000, guid: afba9544abdbfea4b837b1a0c828965f, type: 3}
+    - {fileID: 21300000, guid: a38496d4d91f23244bdcc23882a64a3b, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.8
+    m_StopTime: 0.53333336
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

diff --git a/Assets/Animations/MeleeAnim/StartingMove1.anim b/Assets/Animations/MeleeAnim/StartingMove1.anim
@@ -20,27 +20,21 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 2a25ca5ed66f7e54c8e97c7ce3315866, type: 3}
+      value: {fileID: 21300000, guid: 99e0bbb9a5e2fe04e9b6c7f3802c1caf, type: 3}
     - time: 0.06666667
-      value: {fileID: 21300000, guid: 13817b3cf750ff740947d2af54cd6194, type: 3}
+      value: {fileID: 21300000, guid: 1486f68dc8881864ea2a5b0e016f9881, type: 3}
     - time: 0.13333334
-      value: {fileID: 21300000, guid: 3ea205e6dac68034db92b97d51d4ffd7, type: 3}
+      value: {fileID: 21300000, guid: c7ef487322c19774ebfa9fa056f34ca1, type: 3}
     - time: 0.2
-      value: {fileID: 21300000, guid: 88b8a8e2c56d2ce41850d0d95fee3e00, type: 3}
+      value: {fileID: 21300000, guid: b43804d0d475fe54bbc310693b64a9f5, type: 3}
     - time: 0.26666668
-      value: {fileID: 21300000, guid: e0ebb88f3d6e3ac45a706d9ae526756a, type: 3}
+      value: {fileID: 21300000, guid: 21b60a89485a27a4b85895750d60c929, type: 3}
     - time: 0.33333334
-      value: {fileID: 21300000, guid: edc98b22a0e5bd9438841ddd121b683b, type: 3}
+      value: {fileID: 21300000, guid: a297cc11d296d11498f57f6cccf36252, type: 3}
     - time: 0.4
-      value: {fileID: 21300000, guid: 0d74f26aebcad7746a6f3eb653d1c254, type: 3}
+      value: {fileID: 21300000, guid: 92249dd00e3d98248adb50acfe21d8b9, type: 3}
     - time: 0.46666667
-      value: {fileID: 21300000, guid: 7ef555a90bd480947946ac512b5cb5d7, type: 3}
-    - time: 0.53333336
-      value: {fileID: 21300000, guid: 66dc4d1a395296e419ef441397056b88, type: 3}
-    - time: 0.6
-      value: {fileID: 21300000, guid: 1b61cad2f73466c468eb7e75edbb930e, type: 3}
-    - time: 0.6666667
-      value: {fileID: 21300000, guid: 6b54e6c1b030f924ea6b6c2428036b07, type: 3}
+      value: {fileID: 21300000, guid: 0614660988c5e744d9bfabb20896197e, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -60,23 +54,20 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 2a25ca5ed66f7e54c8e97c7ce3315866, type: 3}
-    - {fileID: 21300000, guid: 13817b3cf750ff740947d2af54cd6194, type: 3}
-    - {fileID: 21300000, guid: 3ea205e6dac68034db92b97d51d4ffd7, type: 3}
-    - {fileID: 21300000, guid: 88b8a8e2c56d2ce41850d0d95fee3e00, type: 3}
-    - {fileID: 21300000, guid: e0ebb88f3d6e3ac45a706d9ae526756a, type: 3}
-    - {fileID: 21300000, guid: edc98b22a0e5bd9438841ddd121b683b, type: 3}
-    - {fileID: 21300000, guid: 0d74f26aebcad7746a6f3eb653d1c254, type: 3}
-    - {fileID: 21300000, guid: 7ef555a90bd480947946ac512b5cb5d7, type: 3}
-    - {fileID: 21300000, guid: 66dc4d1a395296e419ef441397056b88, type: 3}
-    - {fileID: 21300000, guid: 1b61cad2f73466c468eb7e75edbb930e, type: 3}
-    - {fileID: 21300000, guid: 6b54e6c1b030f924ea6b6c2428036b07, type: 3}
+    - {fileID: 21300000, guid: 99e0bbb9a5e2fe04e9b6c7f3802c1caf, type: 3}
+    - {fileID: 21300000, guid: 1486f68dc8881864ea2a5b0e016f9881, type: 3}
+    - {fileID: 21300000, guid: c7ef487322c19774ebfa9fa056f34ca1, type: 3}
+    - {fileID: 21300000, guid: b43804d0d475fe54bbc310693b64a9f5, type: 3}
+    - {fileID: 21300000, guid: 21b60a89485a27a4b85895750d60c929, type: 3}
+    - {fileID: 21300000, guid: a297cc11d296d11498f57f6cccf36252, type: 3}
+    - {fileID: 21300000, guid: 92249dd00e3d98248adb50acfe21d8b9, type: 3}
+    - {fileID: 21300000, guid: 0614660988c5e744d9bfabb20896197e, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.73333335
+    m_StopTime: 0.53333336
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

diff --git a/Assets/Animations/PlayerAnim/PlayerFourthAttackState.anim b/Assets/Animations/PlayerAnim/PlayerFourthAttackState.anim
@@ -138,7 +138,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0