增加冰冻BUFF支持

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/unit/BattleUnit.cs

@@ -156,7 +156,7 @@ public class BattleUnit : BattleObject
 
     protected virtual void OnActionChanged(ZoneUnit unit, UnitActionStatus status, object evt)
     {
-        //Log.Debug($"ActionChange({Id}): {status}, zobject status:{ZUnit.CurrentState}");
+        //Log.Debug($"ActionChange({unit.Info.TemplateID}): {status}<= zobject status:{ZUnit.CurrentState}");
         if(!actionChangeHandler.Notify(status, evt))
         {
             Log.Error($"unhandle action changed: {status}");
@@ -164,7 +164,7 @@ public class BattleUnit : BattleObject
     }
     protected virtual void OnActionSubStatusChanged(ZoneUnit unit, byte status, object evt)
     {
-
+        //Log.Debug($"OnActionSubStatusChanged({unit.Info.TemplateID}): {status}<= zobject status:{ZUnit.CurrentSubState}");
     }
     private void registerActionHandler()
     {
@@ -179,7 +179,9 @@ public class BattleUnit : BattleObject
         actionChangeHandler.AddListener(UnitActionStatus.ServerSyncMove, move);
         actionChangeHandler.AddListener(UnitActionStatus.Escape, move);
 
-        var stun = actionChangeHandler.AddListener(UnitActionStatus.Stun, (o) => { });
+        var stun = actionChangeHandler.AddListener(UnitActionStatus.Stun, (o) => {
+            //TODO: 判断没有FROZEN的BUFF状态，才进行stun的动作
+        });
         actionChangeHandler.AddListener(UnitActionStatus.HitMove, stun);
         actionChangeHandler.AddListener(UnitActionStatus.Dead, (o) => {
             OnHPChanged();

Unity/Assets/Scripts/Codes/HotfixView/Client/Effect/BuffEffectMgr.cs

@@ -67,7 +67,7 @@ namespace ET.Client
                 });
             }
 
-            MergeBuffStatus(unit);
+            MergeBuffStatus(unit, unitRender);
             await ETTask.CompletedTask;
         }
 
@@ -206,7 +206,7 @@ namespace ET.Client
             }
         }
 
-        private void MergeBuffStatus(BattleUnit unit)
+        private void MergeBuffStatus(BattleUnit unit, UnitRenderComponet unitRender)
         {
             bool bFrozen = false;
             bool bStealth = false;
@@ -224,7 +224,6 @@ namespace ET.Client
                             ab.ability == XmdsBuffProperties.XmdsBuffAbility.Fridge)
                         {
                             bFrozen = true;
-                            //SetFrozenStatus(true);
                         }
                         else if (ab.ability == XmdsBuffProperties.XmdsBuffAbility.Stealth)
                         {
@@ -243,13 +242,17 @@ namespace ET.Client
                     }
                 }
             });
+
             if (bFrozen)
             {
-                //SetFrozenStatus(true);
+                unitRender.PauseAnimation();
+                unitRender.SetFrozen();
             }
             else
             {
-                //SetFrozenStatus(false);
+                unitRender.ResumeAnimation();
+                unitRender.ClearFrozen();
+
                 if (bStealth)
                 {
                 }

Unity/Assets/Scripts/Codes/HotfixView/Client/Unit/UnitRenderSystem.cs

@@ -102,7 +102,6 @@ namespace ET.Client
     [FriendOf(typeof(UnitRenderComponet))]
     public static class UnitRenerSystem
     {
-        [ObjectSystem]
         public class UnitRenerAwakeSystem : AwakeSystem<UnitRenderComponet, GameObject>
         {
             protected override void Awake(UnitRenderComponet self, GameObject go)
@@ -112,14 +111,15 @@ namespace ET.Client
                 self.AniData = self.GameObject.GetComponent<Mono.AnimationData>();
                 if (self.AniData != null)
                 {
+                    //TODO: DELETE
                     self.ExeCommand(UnitRenderComponet.CMDIdle);
                 }
 
                 self.TransHeadInfo = go.transform.Find("BindPart/headInfo");
+                self.FrozenComponent = self.GameObject.GetComponent <Mono.IceFrozen>();
             }
         }
 
-        [ObjectSystem]
         public class UnitRenerUpdateSystem : UpdateSystem<UnitRenderComponet>
         {
             protected override void Update(UnitRenderComponet self)
@@ -181,6 +181,22 @@ namespace ET.Client
                 }
             }
         }
+        public static void PauseAnimation(this UnitRenderComponet self)
+        {
+            self.AniData.Pause();
+        }
+        public static void ResumeAnimation(this UnitRenderComponet self)
+        {
+            self.AniData.Resume();
+        }
+        public static void SetFrozen(this UnitRenderComponet self)
+        {
+            self.FrozenComponent?.StartFroze();
+        }
+        public static void ClearFrozen(this UnitRenderComponet self)
+        {
+            self.FrozenComponent?.ClearFroze();
+        }
         //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
@@ -197,7 +213,7 @@ namespace ET.Client
             {
                 //Skill动作和实际技能时间不太匹配，切到idle动作
                 self.AniData.PlayAnimation(cmd.Type, () => {
-                    if (self.DoingCmd == cmd)
+                    if (self.DoingCmd == cmd && !self.AniData.IsPauseStatus())
                     {
                         self.ExeCommand(UnitRenderComponet.CMDIdle);
                     }

Unity/Assets/Scripts/Codes/ModelView/Client/Unit/UnitRenderComponet.cs

@@ -22,6 +22,7 @@ namespace ET.Client
 
         public GameObject GameObject { get; set; }
         public AnimationData AniData;
+        public IceFrozen FrozenComponent;
         public AnimatorCommand DoingCmd;
         public GComponent HeadBar;
         public Transform TransHeadInfo;
@@ -87,6 +88,7 @@ namespace ET.Client
         //重复回收利用的component，在下次使用前需要reset
         public void Reset()
         {
+            FrozenComponent = null;
             GameObject = null;
             AniData = null;
             DoingCmd = null;

Unity/Assets/Scripts/Codes/Mono/AnimationData.cs

@@ -36,6 +36,8 @@ namespace Mono
         private Action aniEndcb;
         private AnimancerState notifyState;
 
+        public bool IsPauseStatus() { return !Animancer.Playable.IsGraphPlaying; }
+
         private void Awake ()
         {
             aniEndcb = null;
@@ -74,6 +76,11 @@ namespace Mono
 
         public void PlayAnimation(AnimationType type, Action endcb = null)
         {
+            if (!Animancer.Playable.IsGraphPlaying)
+            {
+                Log.Error( $"play ani({type}) @ froze status" );
+                return;
+            }
             //Log.Debug($"{this.gameObject.name} toplay ani:{type}");
             aniEndcb = endcb;
             var clip = GetClip(type);
@@ -86,5 +93,14 @@ namespace Mono
                 Log.Error($"Not exist clip({type}) @{gameObject.name}");
             }
         }
+
+        public void Pause()
+        {
+            Animancer.Playable.PauseGraph();
+        }
+        public void Resume()
+        {
+            Animancer.Playable.UnpauseGraph();
+        }
     }
 }