+override rootmotion

1 files changed, 44 insertions, 4 deletions

diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs
index 4114966c..80891d83 100644
--- a/Assets/Scripts/Unit/AnimationData.cs
+++ b/Assets/Scripts/Unit/AnimationData.cs
@@ -76,14 +76,24 @@ public enum EAnimationParameter
 [Serializable]

 public class ParameterDictionary : SerializableDictionary<EAnimationParameter, AnimationParameter> { }

 

+[Serializable]

 public class RootMotionOverrideData

 {

-	public class PosData

+    [Serializable]

+    public class PosData

 	{

-		Vector3 position;

-		float frame;

+		[SerializeField] Vector3 position;

+        [SerializeField] float frame;

 	}

-	List<PosData> positions;

+    [SerializeField] public List<PosData> positions;

+    public RootMotionOverrideData()

+    {

+        positions = new List<PosData>();

+    }

+    public Vector3 GetPosition(float frame)

+    {

+        return Vector3.zero;

+    }

 }

 

 // 某个动画的数据，包括帧事件、碰撞盒、速度曲线

@@ -334,6 +344,28 @@ public class AnimationData : ScriptableObject
         return events;

     }

 

+    public int GetMaxAnimationEventsCount()

+    {

+        List<int> frames = GetAnimationEventFrameIndices();

+        if(frames == null)

+        {

+            ListPool<int>.Release(frames);

+            return 0;

+        }

+        int count = 0;

+        for(int i = 0; i < frames.Count; ++i)

+        {

+            List<AnimationEventBase> events = GetAnimationEventsAtFrame(frames[i]);

+            if (count < events.Count)

+            {

+                count = events.Count;

+            }

+            ListPool<AnimationEventBase>.Release(events);

+        }

+        ListPool<int>.Release(frames);

+        return count;

+    }

+

     public List<int> GetAnimationEventFrameIndices()

     {

         if (animationEvents == null)

@@ -359,7 +391,15 @@ public class AnimationData : ScriptableObject
         }

     }

 

+    public void AddRootMotionOverriderData( )

+    {

+        this.overrideRootMotion = new RootMotionOverrideData();

+    }

 

+    public void DeleteRootMotionOverrideData()

+    {

+        this.overrideRootMotion = null;

+    }

 

 #if UNITY_EDITOR

     public void OnSaveToDisk()