*Unit Animation -> Unit Action

14 files changed, 32 insertions, 16 deletions

diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta
new file mode 100644
index 00000000..9b4ad463
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/AI/Actions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 971e9d55b8bc0894eb6a110fb962000b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta
new file mode 100644
index 00000000..70a86da5
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85b7e0c7ed1d12f42a5178bfbf3d934c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs
index 22d7b014..e4dd7bb3 100644
--- a/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs
+++ b/Erika/Assets/Scripts/Unit/Action/WaitForActionReachEnd.cs
@@ -8,10 +8,10 @@ using UnityEngine;
 /// </summary>
 public class WaitForActionReachEnd : IEnumerator
 {
-	UnitAnimation m_UnitAnimation;
+	UnitAction m_UnitAnimation;
     int m_Layer;

 

-    public WaitForActionReachEnd(UnitAnimation unitAnim, int layer = 0)
+    public WaitForActionReachEnd(UnitAction unitAnim, int layer = 0)
 	{
 		m_UnitAnimation = unitAnim;
         m_Layer = layer;
diff --git a/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs b/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs
index 16fbc2e5..1e59b75d 100644
--- a/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs
+++ b/Erika/Assets/Scripts/Unit/Action/WaitForTransitionDone.cs
@@ -8,9 +8,9 @@ using UnityEngine;
 /// </summary>
 public class WaitForTransitionDone : IEnumerator
 {

-    UnitAnimation m_UnitAnimation;

+    UnitAction m_UnitAnimation;

 

-    public WaitForTransitionDone(UnitAnimation unitAnim)

+    public WaitForTransitionDone(UnitAction unitAnim)

     {

         m_UnitAnimation = unitAnim;

     }

diff --git a/Erika/Assets/Scripts/Unit/AnimatorLayerInfo.cs b/Erika/Assets/Scripts/Unit/AnimatorLayerInfo.cs
index ad8d812c..97af086a 100644
--- a/Erika/Assets/Scripts/Unit/AnimatorLayerInfo.cs
+++ b/Erika/Assets/Scripts/Unit/AnimatorLayerInfo.cs
@@ -32,7 +32,7 @@ public class AnimatorLayerInfo
             AnimatorClipInfo[] clipInfos = clipsInfo;
             if (clipInfos == null || clipInfos.Length == 0)
             {
-                LogHelper.LogError(LogTag.UnitAnimation, "No current animation.");
+                LogHelper.LogError(LogTag.UnitAction, "No current animation.");
                 return null;
             }
             var clip = clipInfos[0]; //选第一个
@@ -173,7 +173,7 @@ public class AnimatorLayerInfo
 
 	public bool applySpeedCurve { get; set; }
 
-	UnitAnimation m_UnitAnimation;
+	UnitAction m_UnitAnimation;
 
     Coroutine m_CalcPlaybackTimeCoroutine;
 
@@ -181,7 +181,7 @@ public class AnimatorLayerInfo
 
 	public string m_CurrentState;
 
-	public AnimatorLayerInfo(UnitAnimation unitAnimation, Animator animator, int layer)
+	public AnimatorLayerInfo(UnitAction unitAnimation, Animator animator, int layer)
     {
         this.m_UnitAnimation = unitAnimation;
         this.m_Animator = animator;
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs
index 0600bf60..b0b34924 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/MonsterAnimation.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class MonsterAnimation : UnitAnimation
+public class MonsterAnimation : UnitAction
 {
     public enum ELayer
     {
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
index fc0dafec..8ddf61f8 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
@@ -4,7 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class PCAnimation : UnitAnimation
+public class PCAnimation : UnitAction
 {
 
 #if !ANIM_CROSS_FADE
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAction.cs
index 45276edc..b865f439 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAction.cs
@@ -12,7 +12,7 @@ using UnityEditor;
 /// http://unitylore.org/wiki/doku.php?id=l3y0gj 

 /// </summary>

 [DisallowMultipleComponent]
-public class UnitAnimation : UnitComponent
+public class UnitAction : UnitComponent
 {

 	// 角色的所有动作数据，包括（动画、事件、RM）

 	public UnitActionData m_ActionData;
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs.meta b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAction.cs.meta
index 75ce33fe..d9a25bcd 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs.meta
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAction.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4af875f33239ebf409f3e4954c0ee0cb
+guid: e99a41ae04c2aca428c3f0d1bda239c4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs
index 43376f68..fd2251b1 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/MonsterState.cs
@@ -29,7 +29,7 @@ public class MonsterState : UnitState
     [SerializeField] private EUnitState m_State;
     public EUnitState CurrentState { get { return m_State; } }
 
-    UnitAnimation unitAnimation { get { return m_Owner.unitAnimation; } }
+    UnitAction unitAnimation { get { return m_Owner.unitAnimation; } }
 
     public override void Initialize()
     {
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs
index a65ad23e..1a8d0010 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitState/PCState_States.cs
@@ -93,7 +93,7 @@ public partial class PCState : UnitState
         if (m_Owner.isTowardRight && !param.isRight
         || !m_Owner.isTowardRight && param.isRight)
         {
-            //m_Owner.pcAnimation.Play(UnitAnimation.EActionState.Turn);
+            //m_Owner.pcAnimation.Play(UnitAction.EActionState.Turn);
             //yield return new WaitForActionReachEnd(m_Owner.pcAnimation);
             //if (param.isRight)
             //	m_Owner.transform.rotation = Quaternion.Euler(0, 0, 0);
diff --git a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs
index d3f936df..0e7510ae 100644
--- a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs
+++ b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs
@@ -28,7 +28,7 @@ public class UnitController : MonoBehaviour/*, Interactable*/
     public PCState pcState { get { return unitState as PCState; } }

     public MonsterState monsterState { get { return unitState as MonsterState; } }

 

-    public UnitAnimation unitAnimation;

+    public UnitAction unitAnimation;

     public PCAnimation pcAnimation { get { return unitAnimation as PCAnimation; } }

     public MonsterAnimation monsterAnimation { get { return unitAnimation as MonsterAnimation; } }

 

diff --git a/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs
index 437b5b2d..453f1903 100644
--- a/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs
+++ b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs
@@ -95,7 +95,7 @@ public partial class TimelineEventProxy
 
 	public UnitController owner { get; private set; }

 
-	private UnitAnimation m_UnitAnimation { get { return owner.unitAnimation; } }
+	private UnitAction m_UnitAnimation { get { return owner.unitAnimation; } }
 
     private AnimationData m_PrevAnimationData;

 

diff --git a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs
index fa3b3ab6..140882d3 100644
--- a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs
+++ b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs
@@ -28,7 +28,7 @@ public class UnitRootMotion : UnitComponent
     

 	private float m_PrevNormalTime;

 

-    Dictionary<UnitAnimation.EActionState, RootMotionData> m_RootMotionDic = new Dictionary<UnitAnimation.EActionState, RootMotionData>();

+    Dictionary<UnitAction.EActionState, RootMotionData> m_RootMotionDic = new Dictionary<UnitAction.EActionState, RootMotionData>();

 

 	public void Reset()

 	{