+transition data

4 files changed, 26 insertions, 0 deletions

diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs
index 771e946b..295b1025 100644
--- a/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs
+++ b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs
@@ -3,6 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
+/// <summary>

+/// 当前动作播放结束

+/// </summary>
 public class WaitForActionReachEnd : IEnumerator
 {
 	UnitAnimation m_UnitAnimation;
diff --git a/Erika/Assets/Scripts/Unit/TransitionData.cs b/Erika/Assets/Scripts/Unit/TransitionData.cs
new file mode 100644
index 00000000..57d9ec6f
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/TransitionData.cs
@@ -0,0 +1,11 @@
+using System.Collections;

+using System.Collections.Generic;

+using UnityEngine;

+

+/// <summary>

+/// 动画过渡间隔配置

+/// </summary>

+public class TransitionData

+{

+

+}

diff --git a/Erika/Assets/Scripts/Unit/TransitionData.cs.meta b/Erika/Assets/Scripts/Unit/TransitionData.cs.meta
new file mode 100644
index 00000000..77e209a5
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/TransitionData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0f0269041d05a4240a5012977f08db63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs
index e920fff8..396189bc 100644
--- a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs
+++ b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs
@@ -119,6 +119,7 @@ public class UnitRootMotion : UnitComponent
 			{

 				dest.y = 0;

 			}

+            dest.y = Mathf.Max(0, dest.y); // 从地面以下拉回

 			//m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ

 			m_Owner.transform.position += dest;

 		}