增加BUFF特效显示支持

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattleMgr.cs

@@ -26,7 +26,6 @@ namespace ET
         public void Awake()
         {
             eventHandler = new();
-            //eventHandler = new();
             registerEventHandler();
 
             Layer = TemplateManager.Factory.CreateClientZoneLayer(BattleResourceMgr.Instance.GameEditorTemplates, this);
@@ -36,7 +35,7 @@ namespace ET
             Layer.ObjectEnter += LayerEvent_ObjectEnter;
             Layer.ObjectLeave += LayerEvent_ObjectLeave;
             Layer.MessageReceived += (ZoneLayer _, CommonLang.Protocol.IMessage msg) => {
-                if (msg is SyncPosEvent || msg is UnitForceSyncPosEvent || msg is LaunchSkill || msg is AddSpellEvent || msg is RemoveObjectEvent || msg is AddUnitEvent || msg is PlayerFocuseTargetEvent || msg is UnitFieldChangedEvent || msg is UnitEffectEvent || msg is UnitLaunchSkillEvent || msg is PlayerSkillStopEvent || msg is UnitHitEvent)
+                if (msg is SyncPosEvent || msg is UnitForceSyncPosEvent || msg is LaunchSkill || msg is AddSpellEvent || msg is RemoveObjectEvent || msg is AddUnitEvent || msg is PlayerFocuseTargetEvent || msg is UnitFieldChangedEvent || msg is UnitEffectEvent || msg is UnitLaunchSkillEvent || msg is PlayerSkillStopEvent || msg is UnitHitEvent || msg is UnitLaunchBuffEvent)
                 { }
                 else
                 {

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

@@ -24,39 +24,25 @@ public class BattleUnit : BattleObject
 
         var zu = zo as ZoneUnit;
         zu.OnActionChanged += OnActionChanged;
-        zu.OnSkillActionChanged += OnSkillActionChanged;
-        zu.OnHPChanged += OnHPChanged;
-        zu.OnMPChanged += OnMPChanged;
-        zu.OnMaxHPChanged += OnMaxHPChanged;
-        zu.OnMaxMPChanged += OnMaxMPChanged;
+        zu.OnSkillActionChanged += (ZoneUnit unit, ZoneUnit.SkillState skill, byte index) => { };
+        zu.OnHPChanged += (ZoneUnit unit, int oldHP, int newHP)=> { OnHPChanged(); };
+        zu.OnMPChanged += (ZoneUnit unit, int oldMaxMP, int newMaxMP) => { };
+        zu.OnMaxHPChanged += (ZoneUnit unit, int oldHP, int newHP) => { OnHPChanged(); };
+        zu.OnMaxMPChanged += (ZoneUnit unit, int oldMaxMP, int newMaxMP)=> { };
         zu.OnLaunchSkill += OnLaunchSkill;
-        zu.OnBuffAdded += OnBuffAdded;
-        zu.OnBuffRemoved += OnBuffRemoved;
-        zu.OnBuffChanged += OnBuffChanged;
-        zu.OnRemoveBuffByOverlayLevel += OnRemoveBuffByOverlayLevel;
+        zu.OnBuffAdded += (ZoneUnit unit, ZoneUnit.BuffState buff) => {
+            EventSystem.Instance.Publish(BuffChangeEvent.Static.Clone(Id, buff, BuffChangeType.Add));
+        };
+        zu.OnBuffRemoved += (ZoneUnit unit, ZoneUnit.BuffState buff) => {
+            EventSystem.Instance.Publish(BuffChangeEvent.Static.Clone(Id, buff, BuffChangeType.Remove));
+        };
+        zu.OnBuffChanged += (ZoneUnit unit, ZoneUnit.BuffState buff) => {
+            EventSystem.Instance.Publish(BuffChangeEvent.Static.Clone(Id, buff, BuffChangeType.Change));
+        };
+        zu.OnRemoveBuffByOverlayLevel += (ZoneUnit unit, ZoneUnit.BuffState buff) => { };
         zu.OnActionSubStatusChanged += OnActionSubStatusChanged;
     }
 
-    protected virtual void OnRemoveBuffByOverlayLevel(ZoneUnit unit, ZoneUnit.BuffState buff)
-    {
-        throw new NotImplementedException();
-    }
-
-    protected virtual void OnBuffChanged(ZoneUnit unit, ZoneUnit.BuffState buff)
-    {
-        throw new NotImplementedException();
-    }
-
-    protected virtual void OnBuffRemoved(ZoneUnit unit, ZoneUnit.BuffState buff)
-    {
-        throw new NotImplementedException();
-    }
-
-    protected virtual void OnBuffAdded(ZoneUnit unit, ZoneUnit.BuffState buff)
-    {
-        throw new NotImplementedException();
-    }
-
     private static uint groupId = 1;
     protected static uint GroupId()
     {
@@ -145,24 +131,6 @@ public class BattleUnit : BattleObject
         }
     }
 
-    protected virtual void OnMaxMPChanged(ZoneUnit unit, int oldMaxMP, int newMaxMP)
-    {
-        throw new NotImplementedException();
-    }
-
-    protected virtual void OnMPChanged(ZoneUnit unit, int oldMP, int newMP)
-    {
-        throw new NotImplementedException();
-    }
-
-    protected virtual void OnMaxHPChanged(ZoneUnit unit, int oldMaxHP, int newMaxHP)
-    {
-        OnHPChanged();
-    }
-    protected virtual void OnHPChanged(ZoneUnit unit, int oldHP, int newHP)
-    {
-        OnHPChanged();
-    }
     private void OnHPChanged()
     {
         var prop = ZUnit.Info.Properties as XmdsUnitProperties;
@@ -186,11 +154,6 @@ public class BattleUnit : BattleObject
         //Log.Debug($"hp({ZUnit.ObjectID}) change: {ZUnit.HP}");
     }
 
-    protected virtual void OnSkillActionChanged(ZoneUnit unit, ZoneUnit.SkillState skill, byte index)
-    {
-        //技能状态
-    }
-
     protected virtual void OnActionChanged(ZoneUnit unit, UnitActionStatus status, object evt)
     {
         //Log.Debug($"ActionChange({Id}): {status}, zobject status:{ZUnit.CurrentState}");

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

@@ -0,0 +1,265 @@
+
+using CommonAI.Zone;
+using System.Collections.Generic;
+using XmdsCommon.Plugin;
+using UnityEngine;
+
+namespace ET.Client
+{
+    [Event(SceneType.None)]
+    [FriendOfAttribute(typeof(ET.Client.UnitRenderComponet))]
+    public class BuffChangeEventHandler : BEvent<EventType.BuffChangeEvent>
+    {
+        public override void OnEvent(EventType.BuffChangeEvent args)
+        {
+            BattleUnit unit = UnitMgr.Instance.GetUnit(args.ObjectId) as BattleUnit;
+            if (unit == null)
+            {
+                Log.Error($"buff unit not exist: {args.ObjectId}");
+                return;
+            }
+            var unitRender = ModelViewComponent.Instance.GetChild<UnitRenderComponet>(args.ObjectId);
+            if (unitRender == null)
+            {
+                Log.Debug($"buff unitrender not exist: {args.ObjectId}");
+                return;
+            }
+
+            if (args.Type == BuffChangeType.Add)
+            {
+                BuffTemplate bt = args.Buff.Data;
+                if (bt.MakeAvatar)
+                {
+                    //TODO: 支持BUFF变身
+                    Log.Error("Not implements MakeAvatar");
+                }
+                AddBuff(args.Buff, unitRender, unit).Coroutine();
+            }
+            else if (args.Type == BuffChangeType.Remove)
+            {
+                BuffTemplate bt = args.Buff.Data;
+                RemoveBuff(bt, unitRender);
+            }
+            else if (args.Type == BuffChangeType.Change)
+            {
+                BuffTemplate bt = args.Buff.Data;
+                //随BUFF状态变更，表现特效不同时.
+                if ((bt.BindingEffectList != null && bt.BindingEffectList.Count > 0) ||
+                    (bt.OverlayBindingEffect != null && bt.OverlayBindingEffect.Count > 0))
+                {
+                    var buff = args.Buff;
+                    if ((buff.OverlayLevel >= 0 && buff.OverlayLevel < bt.BindingEffectList.Count) ||
+                        (buff.BuffExtendData > 0 && buff.OverlayLevel < bt.OverlayBindingEffect.Count))
+                    {
+                        RemoveBuff(bt, unitRender);
+                        AddBuff(buff, unitRender, unit).Coroutine();
+                    }
+                }
+            }
+            else if (args.Type == BuffChangeType.Reload)
+            {
+                var list = unit.ZUnit.AllBuffs;
+                list.ForEach((CommonAI.ZoneClient.ZoneUnit.BuffState buff) =>
+                {
+                    AddBuff(buff, unitRender, unit).Coroutine();
+                });
+            }
+
+            MergeBuffStatus(unit);
+        }
+
+        private async ETTask AddBuff(CommonAI.ZoneClient.ZoneUnit.BuffState buff, UnitRenderComponet unitRender, BattleUnit unit)
+        {
+            BuffTemplate bt = buff.Data;
+
+            //优先判断是否有叠层效果.
+            LaunchEffect le = null;
+            string key = bt.TemplateID.ToString();
+            string effectName = "";
+            if (bt.OverlayBindingEffect != null && bt.OverlayBindingEffect.Count > 0)
+            {
+                if (buff.BuffExtendData > 0)
+                {
+                    le = bt.OverlayBindingEffect[buff.OverlayLevel];
+                    if (le.RType != LaunchEffect.RunType.Cycle_BindName) return;
+
+                    /*/超出最大层数，把最早的给移除掉
+                    if (WordRainRecorderQueue.Count > 0 && WordRainRecorderQueue.Count >= me.Data.MaxOverlay)
+                    {
+                        string effectKey = WordRainRecorderQueue.Dequeue();
+                        int effectStop;
+                        if (BuffEffects.TryGetValue(effectKey, out effectStop))
+                        {
+                            BuffEffects.RemoveByKey(effectKey);
+                            StopEffect(effectStop);
+                        }
+                    }
+
+                    if (le.CricleMode != null)
+                    {
+                        WordRainRecorder += 1;
+                        key = bt.TemplateID.ToString() + "_" + me.BuffExtendData.ToString() + "_" + WordRainRecorder.ToString();
+                        WordRainRecorderQueue.Enqueue(key);
+                        if (le.CricleMode.EffectName != null && le.CricleMode.EffectName.Length > me.BuffExtendDataIndex - 1 && me.BuffExtendDataIndex > 0)
+                        {
+                            effectName = le.CricleMode.EffectName[me.BuffExtendDataIndex - 1];
+                        }
+                    }*/
+                }
+                else
+                {
+                    le = bt.OverlayBindingEffect[buff.OverlayLevel];
+                }
+            }
+            else
+            {
+                le = bt.BindingEffect;
+            }
+
+            if (le != null)
+            {
+                if (!unitRender.BuffEffects.ContainsKey(key))
+                {
+                    uint id = await EffectMgr.Instance.PlayEffect(le, unit.Id, Vector3.zero);
+                    unitRender.BuffEffects.Add(key, id);
+                }
+                else
+                {
+                    EffectMgr.Instance.ResetEffect(unit.Id);
+                }
+            }
+
+            if (bt.BindingEffectList.Count > 0)
+            {
+                System.Action<LaunchEffect, byte, byte, int, int> PlayBindingEffect = async (buff, overLayer, maxOverLayer, templateID, index) =>
+                {
+                    string _bkey = string.Format("{0}_{1}", templateID, index);
+                    if (buff == null || unitRender.BuffEffects.ContainsKey(_bkey)) return;
+
+                    //uint id = PlayEffect(buff, false, -1, "", overLayer, maxOverLayer);
+                    uint id = await EffectMgr.Instance.PlayEffect(buff, unit.Id, Vector3.zero);
+                    unitRender.BuffEffects.Add(_bkey, id);
+                };
+
+                if (bt.PlayType == BuffTemplate.BindingPlayType.All)
+                {
+                    for (int i = 0; i < bt.BindingEffectList.Count; i++)
+                    {
+                        le = bt.BindingEffectList[i];
+                        PlayBindingEffect(le, buff.OverlayLevel, bt.MaxOverlay, bt.TemplateID, i);
+                    }
+                }
+                else if (bt.PlayType == BuffTemplate.BindingPlayType.AppointOverLayer)
+                {
+                    if (buff.OverlayLevel >= bt.BindingEffectList.Count) return;
+
+                    le = bt.BindingEffectList[buff.OverlayLevel];
+                    PlayBindingEffect(le, buff.OverlayLevel, bt.MaxOverlay, bt.TemplateID, buff.OverlayLevel);
+                }
+                else if (bt.PlayType == BuffTemplate.BindingPlayType.IncludeOverLayer)
+                {
+                    for (int i = 0; i < bt.BindingEffectList.Count; i++)
+                    {
+                        if (buff.OverlayLevel >= i)
+                        {
+                            le = bt.BindingEffectList[i];
+                            PlayBindingEffect(le, buff.OverlayLevel, bt.MaxOverlay, bt.TemplateID, i);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        private void RemoveBuff(BuffTemplate bt, UnitRenderComponet unitRender)
+        {
+            var BuffEffects = unitRender.BuffEffects;
+            if (BuffEffects != null)
+            {
+                uint effectStop = 0;
+                string key = bt.ID.ToString();
+                if (BuffEffects.TryGetValue(key, out effectStop))
+                {
+                    BuffEffects.RemoveByKey(key);
+                    EffectMgr.Instance.RemoveEffect(effectStop);
+                }
+
+                if (bt.BindingEffectList.Count > 0)
+                {
+                    string key2 = null;
+                    for (int i = 0; i < bt.BindingEffectList.Count; i++)
+                    {
+                        key2 = string.Format("{0}_{1}", key, i);
+                        if (BuffEffects.TryGetValue(key2, out effectStop))
+                        {
+                            BuffEffects.RemoveByKey(key2);
+                            EffectMgr.Instance.RemoveEffect(effectStop);
+                        }
+                    }
+                }
+            }
+        }
+
+        private void MergeBuffStatus(BattleUnit unit)
+        {
+            bool bFrozen = false;
+            bool bStealth = false;
+            bool bNothingess = false;
+            var list = unit.ZUnit.AllBuffs;
+            list.ForEach((CommonAI.ZoneClient.ZoneUnit.BuffState buff) =>
+            {
+                var ablist = (buff.Data.Properties as XmdsBuffProperties).BuffAbilityList;
+                if (ablist != null)
+                {
+                    foreach (var ab in ablist)
+                    {
+                        //TODO: 支持BUFF的冰冻、草丛、虚无效果
+                        if (ab.ability == XmdsBuffProperties.XmdsBuffAbility.FROZEN ||
+                            ab.ability == XmdsBuffProperties.XmdsBuffAbility.Fridge)
+                        {
+                            bFrozen = true;
+                            //SetFrozenStatus(true);
+                        }
+                        else if (ab.ability == XmdsBuffProperties.XmdsBuffAbility.Stealth)
+                        {
+                            bStealth = true;
+                            //判断是不是在墙角，在墙角只更新currentMat，否则修改材质和currentMat
+                            /*foreach (var item in this.GameObject.GetComponentsInChildren<MaterialManager>())
+                            {
+                                item.AddMatState(StateMaterial.HIDDING);
+                            }*/
+                        }
+                        else if (ab.ability == XmdsBuffProperties.XmdsBuffAbility.Nothingness)
+                        {
+                            bNothingess = true;
+                            //this.HideSelf(true);
+                        }
+                    }
+                }
+            });
+            if (bFrozen)
+            {
+                //SetFrozenStatus(true);
+            }
+            else
+            {
+                //SetFrozenStatus(false);
+                if (bStealth)
+                {
+                }
+                else
+                {
+                    if (bNothingess)
+                    {
+
+                    }
+                }
+            }
+
+        }
+    }
+
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 71bb21048e3234b408eedff86a66310f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -180,5 +180,14 @@ namespace ET.Client
                 GameObjectPool.Instance.RecycleObject(info.GameObj);
             }
         }
+
+        public void ResetEffect(uint id)
+        {
+            if (playingList.ContainsKey(id))
+            {
+                //var info = playingList[id];
+                //TODO:Reset effect
+            }
+        }
     }
 }

Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/GameObjectPool.cs

@@ -210,7 +210,7 @@ namespace ET.Client
                 {
                     CacheLaunchEffect(frm.Effect, ref effectlist, ref soundlist);
                 }
-                if (frm.Spell != null && frame.Spell.SpellID != 0)
+                if (frm.Spell != null && frm.Spell.SpellID != 0)
                 {
                     CacheSpellEffect(templates, frm.Spell.SpellID, ref effectlist, ref soundlist);
                 }

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

@@ -1,4 +1,5 @@
 using CommonAI.ZoneClient;
+using ET.EventType;
 using FairyGUI;
 using Sirenix.Utilities;
 using UnityEngine;
@@ -52,6 +53,8 @@ namespace ET.Client
                 CameraMgr.FollowMe(go.transform.position);
             }
             //Log.Debug($"unitRender({zu.ObjectID}),pos({zu.X},{zu.Y},{zu.Z}) ok.");
+
+            EventSystem.Instance.Publish(BuffChangeEvent.Static.Clone(zu.ObjectID, null, BuffChangeType.Reload));
             //TODO: 同步ZoneUnit status
         }
 

Unity/Assets/Scripts/Codes/Model/Client/EventTypeClient.cs

@@ -154,6 +154,20 @@ namespace ET
                 return this;
             }
         }
+        public class BuffChangeEvent
+        {
+            public uint ObjectId;
+            public CommonAI.ZoneClient.ZoneUnit.BuffState Buff;
+            public BuffChangeType Type;
+            public static BuffChangeEvent Static = new();
+            public BuffChangeEvent Clone(uint id, CommonAI.ZoneClient.ZoneUnit.BuffState buff, BuffChangeType type)
+            {
+                ObjectId = id;
+                Buff = buff;
+                Type = type;
+                return this;
+            }
+        }
     }
 
     //状态指令
@@ -164,4 +178,12 @@ namespace ET
         Skill,
         Dead
     }
+
+    public enum BuffChangeType
+    {
+        Add,
+        Remove,
+        Change,
+        Reload, //模型刚加载完，buff效果重新加载
+    }
 }

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

@@ -3,6 +3,7 @@ using Mono;
 using System.Collections.Generic;
 using AniType = Mono.AnimationData.AnimationType;
 using FairyGUI;
+using CommonLang;
 
 namespace ET.Client
 {
@@ -13,6 +14,9 @@ namespace ET.Client
         public static readonly AnimatorCommand CMDRun = new AnimatorCommand(AniType.Run, true);
         public static readonly AnimatorCommand CMDDead = new AnimatorCommand(AniType.Dead);
 
+        //buff产生的特效.
+        public HashMap<string, uint> BuffEffects = new();
+
         //指令队列
         public List<AnimatorCommand> Commands = new ();
 
@@ -90,6 +94,8 @@ namespace ET.Client
             TransHeadInfo = null;
             TransChest = null;
             TransFoot = null;
+            Commands.Clear();
+            BuffEffects.Clear();
         }
     }