*misc

1 files changed, 3 insertions, 3 deletions

diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs
index 6116442c..cd76ba8d 100644
--- a/Assets/ActionTool/Editor/ActionData.cs
+++ b/Assets/ActionTool/Editor/ActionData.cs
@@ -20,7 +20,7 @@ namespace ActionTool
 

         private AnimationEventBase m_CurEventInfo; // 当前正在编辑的event

 

-        private TimelineEvent m_Timeline;

+        private UnitTimeline m_Timeline;

 

         #region metadata

         private float m_TotalFrame; //timeline采样的总帧数

@@ -67,7 +67,7 @@ namespace ActionTool
             m_PrevLocalTime = 0;

             m_Animator.Play(kStateName, 0, 0);

             m_RootMotion = rootmotion;

-            m_Timeline = m_Animator.gameObject.GetComponent<TimelineEvent>();

+            m_Timeline = m_Animator.gameObject.GetOrAddComponent<UnitTimeline>();

         }

 

         public void SetCurrentAnimTime(float time)

@@ -196,7 +196,7 @@ namespace ActionTool
                 m_Timeline.ExecuteAnimationEvents(ActionManager.animationData, m_CurAnimFrame);

         }

 

-        public void CreateEvent(TimelineEvent.EEventType eventtype, int startFrame)

+        public void CreateEvent(UnitTimeline.EEventType eventtype, int startFrame)

         {

             var classes = Assembly

                .GetAssembly(typeof(AnimationEventBase))