Merge branch 'main' into DamianCardStyles

2025-10-28 09:51:42 +00:00
parent 2a18489f44 a6f37ce8b5
commit 7743fbdd8f
52 changed files with 1229 additions and 105 deletions
--- a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim
+++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim
@@ -288,7 +288,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 2.3999999
+    m_StopTime: 2.4
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -370,4 +370,11 @@ AnimationClip:
  m_EulerEditorCurves: []
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 2.4
+    functionName: OnStationaryAnimationComplete
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
--- a/Assets/Art/Animations/Characters/Pulver/Pulver_Cucumbatacc.anim
+++ b/Assets/Art/Animations/Characters/Pulver/Pulver_Cucumbatacc.anim
@@ -336,4 +336,11 @@ AnimationClip:
  m_EulerEditorCurves: []
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 1.6666666
+    functionName: OnStationaryAnimationComplete
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0