*action tool的帧范围

1 files changed, 14 insertions, 2 deletions

diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs
index e56f590a..de067455 100644
--- a/Assets/Scripts/Unit/TimelineEventProxy.cs
+++ b/Assets/Scripts/Unit/TimelineEventProxy.cs
@@ -16,7 +16,11 @@ public partial class TimelineEventProxy
         get

         {

             if (m_Root_Particles == null)

-                m_Root_Particles = new GameObject("Root_Particles");

+            {

+                m_Root_Particles = GameObject.Find("Root_Particles");

+                if(m_Root_Particles == null) 

+                    m_Root_Particles = new GameObject("Root_Particles");

+            }

             return m_Root_Particles;

         }

     }

@@ -25,6 +29,7 @@ public partial class TimelineEventProxy
     {

         get

         {

+            m_Root_Projectiles = GameObject.Find("Root_Projectiles");

             if (m_Root_Projectiles == null)

                 m_Root_Projectiles = new GameObject("Root_Projectiles");

             return m_Root_Projectiles;

@@ -41,7 +46,9 @@ public partial class TimelineEventProxy
 #endif
 

     public enum EEventType
-    {
+    {

+        EventGame_TimeScale,  // 缩放时间
+
         EventCamera_Zoom,     // 相机聚焦
         EventCamera_Shake,    // 相机晃动
         EventCamera_Blur,     // 相机模糊
@@ -91,6 +98,11 @@ public partial class TimelineEventProxy
         return type;
     }
 
+    public void ResetPrevAnimationData()

+    {

+        m_PrevAnimationData = null;

+    }
+
     public void ExecuteAnimationEvents(AnimationData animData, float animFrame)
     {
         if (animData == null)