From 0a4dd643234284db73735f78ece9c209b80a72d6 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 3 Sep 2021 09:45:03 +0800
Subject: *misc

---
 .../Unit/Components/UnitAnimation/UnitAnimation.cs | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs')

diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
index a9c50ac3..db81a2ed 100644
--- a/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
+++ b/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
@@ -24,7 +24,7 @@ public class AnimatorLayerInfo
     {
         get
         {
-            AnimatorClipInfo[] clipInfos = clipInfo;
+            AnimatorClipInfo[] clipInfos = clipsInfo;
             if (clipInfos == null || clipInfos.Length == 0)
                 return null;
             var clip = clipInfos[0]; //选第一个
@@ -57,7 +57,7 @@ public class AnimatorLayerInfo
     private int preStateHash = -1;
 
     // 当前正在播放和融合的片段信息
-    public AnimatorClipInfo[] clipInfo
+    public AnimatorClipInfo[] clipsInfo
     {
         get
         {
@@ -78,6 +78,14 @@ public class AnimatorLayerInfo
         }
     }
 
+	public AnimatorClipInfo clipInfo
+	{
+		get
+		{
+			return clipsInfo[0];
+		}
+	}
+
     public int stateHash
     {
         get
@@ -91,7 +99,7 @@ public class AnimatorLayerInfo
     {
         get
         {
-            return playbackNormalizedTime * clipInfo[0].clip.length; 
+            return playbackNormalizedTime * clipInfo.clip.length; 
         }
     }
 
@@ -116,7 +124,7 @@ public class AnimatorLayerInfo
             //if (state.IsName("Attack0"))
             //{
             //    Debug.Log("normalizedTime=" + state.normalizedTime);
-            //    Debug.Log("playbackTimeInSeconds=" + state.normalizedTime * clipInfo[0].clip.length);
+            //    Debug.Log("playbackTimeInSeconds=" + state.normalizedTime * clipInfo.clip.length);
             //}
             return state.normalizedTime % 1f;
         }
@@ -258,7 +266,13 @@ public class UnitAnimation : UnitComponent
         if (layer == null)
             return;
         layer.OnPlay(animState, normalizedTime);
-    }
+
+		UnitRootMotion rm = m_Owner.GetComponent<UnitRootMotion>();
+		if(rm)
+		{
+			rm.OnAnimationChange();
+		}
+	}
 
     public void CrossFade(string animState, float normalizedTransitionDuration, int layerIndex = 0, float normalizedTimeOffset = float.NegativeInfinity, float normalizedTransitionTime = 0.0f)
     {
@@ -266,6 +280,12 @@ public class UnitAnimation : UnitComponent
         if (layer == null)
             return;
         layer.OnCrossFade(animState, normalizedTransitionDuration, normalizedTimeOffset, normalizedTransitionTime);
-    }
+
+		UnitRootMotion rm = m_Owner.GetComponent<UnitRootMotion>();
+		if (rm)
+		{
+			rm.OnAnimationChange();
+		}
+	}
 
 }
-- 
cgit v1.1-26-g67d0