* Unit Action Data

4 files changed, 14 insertions, 5 deletions

diff --git a/Erika/Assets/Scripts/Unit/AnimationData.cs b/Erika/Assets/Scripts/Unit/AnimationData.cs
index 9af3d51c..21d90028 100644
--- a/Erika/Assets/Scripts/Unit/AnimationData.cs
+++ b/Erika/Assets/Scripts/Unit/AnimationData.cs
@@ -178,7 +178,10 @@ public class RootMotionOverrideData
     }

 }

 

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

+

+/// <summary>

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

+/// </summary>

 [CreateAssetMenu(fileName = "Animation Data")]

 public class AnimationData : ScriptableObject

 {

diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
index 0f4f4e11..1714a9dd 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
@@ -69,8 +69,6 @@ public class PCAnimation : UnitAnimation
         get { return layers[(int)ELayer.Basic]; }

     }
 
-    private UnitActionData m_ActionData;
-
     public bool applyRootMotion { get; set; }
     public bool applyRootCurve { get; set; } // 程序生成的root motion
 
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
index 653564b7..593bd7b2 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
@@ -244,7 +244,10 @@ public class AnimatorLayerInfo
 
 [DisallowMultipleComponent]
 public class UnitAnimation : UnitComponent
-{
+{

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

+	protected UnitActionData m_ActionData;
+
     protected AnimatorLayerInfo[] layers { get { return m_LayerInfo; } }
     protected AnimatorLayerInfo[] m_LayerInfo;
 
diff --git a/Erika/Assets/Scripts/Unit/UnitActionData.cs b/Erika/Assets/Scripts/Unit/UnitActionData.cs
index cdc7636f..75ccee57 100644
--- a/Erika/Assets/Scripts/Unit/UnitActionData.cs
+++ b/Erika/Assets/Scripts/Unit/UnitActionData.cs
@@ -4,7 +4,8 @@ using System.Collections.Generic;
 using UnityEngine;
 
 [Serializable]
-public class TriggerAnimationDictionary : SerializableDictionary<string/*override clip name\state name*/, AnimationData> { }
+public class TriggerAnimationDictionary 
+	: SerializableDictionary<string/*override clip name\state name*/, AnimationData> { }
 
 /// <summary>
 /// 角色动作配置，状态名-动作
@@ -12,5 +13,9 @@ public class TriggerAnimationDictionary : SerializableDictionary<string/*overrid
 [CreateAssetMenu(fileName = "Unit Action Data")]
 public class UnitActionData : ScriptableObject
 {
+	[Tooltip("所参照的AnimatorController")]
+	public RuntimeAnimatorController referenceController;
+
 	public TriggerAnimationDictionary actions; 
+
 }