增加技能下发消息--链接到view层的处理

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

@@ -3,6 +3,7 @@ using CommonAI.ZoneClient;
 using CommonLang;
 using ET.Client;
 using System.IO;
+using XmdsCommon.Message;
 
 namespace ET
 {
@@ -12,14 +13,17 @@ namespace ET
         private bool isInited = false;
         public ZoneLayer Layer;
         private readonly MemoryStream writeBuffer = new MemoryStream(2048);
-        private EventDispatcher eventDispather;
+        private EventDispatcher<ZoneEvent> zoneEventHandler;
+        private EventDispatcher<ObjectEvent> objectEventHandler;
 
         public async ETTask InitAsync()
         {
-            eventDispather = new EventDispatcher();
+            zoneEventHandler = new();
+            objectEventHandler = new();
             registerEventHandler();
+
             Layer = TemplateManager.Factory.CreateClientZoneLayer(BattleResourceMgr.Instance.GameEditorTemplates, this);
-            Layer.ActorSyncMode = SyncMode.ForceByServer;
+            Layer.ActorSyncMode = SyncMode.MoveByClient_PreSkillByClient;
 
             Layer.LayerInit += LayerEvent_Init;
             Layer.ObjectEnter += LayerEvent_ObjectEnter;
@@ -125,15 +129,64 @@ namespace ET
 
         protected void LayerEvent_MessageReceived(CommonAI.ZoneClient.ZoneLayer layer, CommonLang.Protocol.IMessage msg)
         {
-            if (!(msg is CommonAI.Zone.Event) || msg is SyncPosEvent || msg is Pong)
+            if (msg is ZoneEvent)
             {
-                return;
+                zoneEventHandler.Notify(msg as ZoneEvent);
+            }
+            else if(msg is ObjectEvent)
+            {
+                objectEventHandler.Notify(msg as ObjectEvent);
             }
-            eventDispather.Notfify(msg as ObjectEvent);
         }
 
         private void registerEventHandler()
         {
+            //actor===================
+            objectEventHandler.AddListener<SetAutoBattleB2C>((ev) => {
+                var isAutoFight = (ev as SetAutoBattleB2C).isAutoBattle != 0;
+                Log.Debug($"AutoFight: {isAutoFight}");
+            });
+            objectEventHandler.AddListener<ShowTipsEventB2C>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<UnitDeadEvent>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<UnitRebirthEvent>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<UnitHitEvent>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<PlayerPKModeChangeEventB2C>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<PlayerBattlePropChangeEventB2C>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<PlayerPKValueChangeEventB2C>((ev) =>
+            {
+            });
+            objectEventHandler.AddListener<BuffActiveSkillEventB2C>((ev) =>
+            {
+            });
+            //NPCCureEventB2C
+            //MonsterSufferDamageInfoB2C
+            //BattleHintNumberB2C
+            //BattleFloatTipsEventB2C
+            //BubbleTipsEventB2C
+
+            zoneEventHandler.AddListener<ChatEvent>((ev) => { });
+            /*BubbleTalkEvent
+            AddEffectEvent
+            SyncEnvironmentVarEvent
+            ScriptCommandEvent
+            ScriptAddUnitEventsB2C
+            ScriptRemoveUnitEventsB2C
+            PlaySoundEventB2CForAll
+            SyncFlagsEvent
+            ChangeBGMEvent
+            PlayDestoryEffect*/
             /*var e = msg as CommonAI.Zone.Event;
            if (e is ChatEvent)
            {
@@ -407,4 +460,3 @@ namespace ET
         }
     }
 }
-

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

@@ -14,7 +14,7 @@ namespace ET.Client
         protected override async ETTask Run(Session session, BattleEventPush pushdata)
         {
             var type = pushdata.key;
-            Log.Debug($"receive battle push type({type})");
+            Log.Debug($"<<receive battle push type({type})");
 
             object data;
             if(!BattleResourceMgr.Instance.BattleMsgDecoder.doDecode(new MemoryStream(pushdata.data), out data))

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

@@ -1,9 +1,57 @@
-using CMDType = ET.Client.AnimatorComponent.CommandType;
+using CMDType = ET.AnimatorEventType;
 using AniType = Mono.AnimationData.AnimationType;
 using UnityEngine;
+using System.Text.RegularExpressions;
 
 namespace ET.Client
 {
+    [Event(SceneType.Current)]
+    public class AnimatorEventHandler : AEvent<EventType.PlayAnimatorEvent>
+    {
+        protected override async ETTask Run(Scene scene, EventType.PlayAnimatorEvent args)
+        {
+            var component = ModelViewComponent.Instance.GetChild<AnimatorComponent>(args.UnitId);
+            if (component == null)
+            {
+                Log.Debug($"Not found AnimatorComponent of object{args.UnitId}");
+                return;
+            }
+            if(args.CommandType == CMDType.Skill)
+            {
+                var m = Regex.Match(args.SkillName, "Skill(\\d+)");
+                if (m.Success)
+                {
+                    int n = System.Convert.ToInt32(m.Groups[1].Value, 10);
+                    if(n >=0 && AniType.SkillMax > AniType.Skill0 + n)
+                    {
+                        AnimatorCommand cmd = new AnimatorCommand((AniType)(AniType.Skill0 + n)) {
+                            Duration = args.Duration,
+                            Speed = args.Speed,
+                            GroupId = args.GroupId,
+                            Loop = args.Loop
+                        };
+                        component.AppendCommand(cmd);
+                        return;
+                    }
+                }
+                Log.Error($"Not support skill animation: {args.SkillName}");
+            }
+            else
+            {
+                AnimatorCommand cmd = args.CommandType switch
+                {
+                    AnimatorEventType.Idle => AnimatorComponent.CMDIdle,
+                    AnimatorEventType.Run => AnimatorComponent.CMDRun,
+                    AnimatorEventType.Dead => AnimatorComponent.CMDDead,
+                    _ => AnimatorComponent.CMDIdle
+                };
+                component.AppendCommand(cmd);
+            }
+            
+            await ETTask.CompletedTask;
+        }
+    }
+
     [FriendOf(typeof(AnimatorComponent))]
     public static class AnimatorComponentSystem
     {
@@ -37,11 +85,7 @@ namespace ET.Client
         }
 
         //===AnimatorComponent 扩展方法-------
-        public static void AppendCommand(this AnimatorComponent self, CMDType type)
-        {
-            self.Commands.Add(new AnimatorComponent.Command(type));
-        }
-        public static void AppendCommand(this AnimatorComponent self, AnimatorComponent.Command cmd)
+        public static void AppendCommand(this AnimatorComponent self, AnimatorCommand cmd)
         {
             self.Commands.Add(cmd);
         }
@@ -51,43 +95,27 @@ namespace ET.Client
         {
             self.AniData = self.GameObject.GetComponent<Mono.AnimationData>();
 
-            self.DoingType = AniType.Dead;
             self.ExeCommand(AnimatorComponent.CMDIdle);
         }
 
         public static void Update(this AnimatorComponent self)
         {
-            self.ExeCommand(self.FilterCmdList());
+            var cmd = self.FilterCmdList();
+            if(cmd != null)
+            {
+                self.ExeCommand(cmd);
+            }
         }
 
         //执行指令
-        private static void ExeCommand(this AnimatorComponent self, AnimatorComponent.Command? cmd)
+        private static void ExeCommand(this AnimatorComponent self, AnimatorCommand cmd)
         {
-            if (cmd == null) return;
-            var ani = cmd?.Type switch
-            {
-                CMDType.Idle => AniType.Idle,
-                CMDType.Run => AniType.Run,
-                CMDType.StopRun => AniType.Idle,
-                CMDType.StopSkill => AniType.Idle,
-                CMDType.Skill0 => AniType.Skill0,
-                CMDType.Skill1 => AniType.Skill1,
-                CMDType.Skill2 => AniType.Skill2,
-                CMDType.Skill3 => AniType.Skill3,
-                CMDType.Dead => AniType.Dead,
-                _ => AniType.Idle
-            };
-            if (self.DoingType == ani) return;
-            self.DoingType = ani;
-
-            self.AniData.PlayAnimation(ani, () => {
-                self.DoingType = AniType.Idle;
-                self.AniData.PlayAnimation(AniType.Idle);
-            });
+            self.DoingCmd = (AnimatorCommand)cmd;
+            self.AniData.PlayAnimation(cmd.Type);
         }
 
         //从指令队列中分析出当前需要执行的指令
-        private static AnimatorComponent.Command? FilterCmdList(this AnimatorComponent self)
+        private static AnimatorCommand FilterCmdList(this AnimatorComponent self)
         {
             var cmds = self.Commands;
             if (cmds.Count <= 0)
@@ -95,7 +123,7 @@ namespace ET.Client
                 return null;
             }
 
-            var cmd = cmds[0];
+            /*var cmd = cmds[0];
             for(var i=1; i<cmds.Count; i++)
             {
                 var next = cmds[i];
@@ -111,8 +139,28 @@ namespace ET.Client
                 {
                     cmd = next;
                 }
+            }*/
+            var cmd = cmds[cmds.Count - 1];
+            if(cmd.GroupId > 0)
+            {
+                int delIndex = -1;
+                for(var i = cmds.Count -2; i >= 0; i--)
+                {
+                    if (cmds[i].GroupId != cmd.GroupId)
+                    {
+                        delIndex = i;
+                        break;
+                    }
+                }
+                if(delIndex >= 0)
+                {
+                    cmds.RemoveRange(0, delIndex + 1);
+                }
+            }
+            else
+            {
+                cmds.Clear();
             }
-            cmds.Clear();
             return cmd;
         }
 

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

@@ -1,4 +1,6 @@
-using System.Collections;
+//TODO: DELETE
+
+/*using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -26,5 +28,4 @@ namespace ET.Client
         }
     }
 }
-
-
+*/

Unity/Assets/Scripts/Codes/Model/Client/Battle/unit/BattleActor.cs

@@ -1,6 +1,5 @@
 using CommonAI.ZoneClient;
 using ET;
-using System.Diagnostics;
 
 public class BattleActor : BattlePlayer
 {
@@ -17,7 +16,7 @@ public class BattleActor : BattlePlayer
 
     private void OnSkillChanged(ZoneUnit.SkillOption op, ZoneUnit unit, int baseSkillID, params int[] skills)
     {
-        Log.Debug(">OnSkillChanged> {0}, base:{1},skills:{2}", op, baseSkillID, skills != null ? skills.Length : 0);
+        Log.Debug("OnSkillChanged> {0}, base:{1},skills:{2}", op, baseSkillID, skills != null ? skills.Length : 0);
         //SkillOption.Init的不用管，SkillBar.InitSkill直接从UserData读
         //SkillOpetion.Active不明意义，未处理
         if (op == ZoneUnit.SkillOption.Reset)
@@ -25,6 +24,7 @@ public class BattleActor : BattlePlayer
         }
         else if (op == ZoneUnit.SkillOption.Add || op == ZoneUnit.SkillOption.Remove)
         {
+            Log.Error($"not implements skill option: {op}");
         }
     }
 

Unity/Assets/Scripts/Codes/Model/Client/Battle/unit/BattleObject.cs

@@ -6,7 +6,6 @@ using ET.EventType;
 public class BattleObject
 {
     protected ZoneObject ZoneObject;
-
     public uint Id { get { return ZoneObject.ObjectID; } }
 
     public BattleObject() { }
@@ -14,24 +13,31 @@ public class BattleObject
     public virtual void OnAwake(ZoneObject zo)
     {
         ZoneObject = zo;
-        EventSystem.Instance.Publish(CurrentScene(), new OnNewZoneObject() { Object = this });
+        EventSystem.Instance.Publish(CurrentScene, new OnNewZoneObject() { Object = this });
     }
 
     public virtual void OnSleep()
     {
-        EventSystem.Instance.Publish(CurrentScene(), new OnDestroyZoneObject() { Object = this });
+        AsyncSleep().Coroutine();
+    }
+    protected async ETTask AsyncSleep()
+    {
+        await EventSystem.Instance.PublishAsync(CurrentScene, new OnDestroyZoneObject() { Object = this });
         ObjectPool.Instance.Recycle(this);
     }
 
     private static Scene _CurrentSceneCache = null;
-    public static Scene CurrentScene()
+    public static Scene CurrentScene
     {
-        if (_CurrentSceneCache == null)
+        get
         {
-            var cs = ClientSceneManagerComponent.Instance.GetChild<Scene>(UnitListComponent.Instance.DomainZone());
-            _CurrentSceneCache = cs.GetComponent<CurrentScenesComponent>().Scene;
+            if (_CurrentSceneCache == null)
+            {
+                var cs = ClientSceneManagerComponent.Instance.GetChild<Scene>(UnitListComponent.Instance.DomainZone());
+                _CurrentSceneCache = cs.GetComponent<CurrentScenesComponent>().Scene;
+            }
+            return _CurrentSceneCache;
         }
-        return _CurrentSceneCache;
     }
 
 
@@ -40,7 +46,7 @@ public class BattleObject
     {
         protected override async ETTask Run(Scene scene, ET.EventType.AfterCreateCurrentScene args)
         {
-            _CurrentSceneCache = null;
+            _CurrentSceneCache = scene;
             await ETTask.CompletedTask;
         }
     }

Unity/Assets/Scripts/Codes/Model/Client/Battle/unit/BattleUnit.cs

@@ -1,16 +1,26 @@
 using CommonAI.Zone;
 using CommonAI.Zone.Helper;
 using CommonAI.ZoneClient;
+using ET;
+using ET.EventType;
+using Sirenix.Utilities;
 using System;
+using System.Drawing.Drawing2D;
 
 public class BattleUnit : BattleObject
 {
     public BattleUnit() { }
     public ZoneUnit ZUnit { get { return ZoneObject as ZoneUnit; } }
 
+    private EventDispatcher<UnitActionStatus, object> actionChangeHandler;
+
     public override void OnAwake(ZoneObject zo)
     {
         base.OnAwake(zo);
+
+        actionChangeHandler = new();
+        registerActionHandler();
+
         var zu = zo as ZoneUnit;
         zu.OnActionChanged += OnActionChanged;
         zu.OnSkillActionChanged += OnSkillActionChanged;
@@ -22,17 +32,8 @@ public class BattleUnit : BattleObject
         zu.OnBuffAdded += OnBuffAdded;
         zu.OnBuffRemoved += OnBuffRemoved;
         zu.OnBuffChanged += OnBuffChanged;
-        //新增层Buff移除
         zu.OnRemoveBuffByOverlayLevel += OnRemoveBuffByOverlayLevel;
-        //新增子状态
         zu.OnActionSubStatusChanged += OnActionSubStatusChanged;
-
-        zu.OnDoEvent += OnLayerObjectEvent;
-    }
-
-    protected virtual void OnActionSubStatusChanged(ZoneUnit unit, byte status, object evt)
-    {
-        throw new NotImplementedException();
     }
 
     protected virtual void OnRemoveBuffByOverlayLevel(ZoneUnit unit, ZoneUnit.BuffState buff)
@@ -55,9 +56,83 @@ public class BattleUnit : BattleObject
         throw new NotImplementedException();
     }
 
-    protected virtual void OnLaunchSkill(ZoneUnit unit, ZoneUnit.SkillState skill, UnitLaunchSkillEvent evt)
+    private static uint groupId = 1;
+    protected static uint GroupId()
     {
-        throw new NotImplementedException();
+        return ++ groupId;
+    }
+
+    protected virtual void OnLaunchSkill(ZoneUnit unit, ZoneUnit.SkillState skill, UnitLaunchSkillEvent ev)
+    {
+        CommonAI.ZoneClient.ZoneUnit.ISkillAction action = ZUnit.CurrentSkillAction;
+        SkillTemplate skillTemplate = action.SkillData;
+        var curActionIndex = action.CurrentActionIndex;
+        if (skillTemplate.ActionQueue.Count <= curActionIndex)
+        {
+            Log.Error("Enter Skill state error> ({0})>CurrentActionIndex>{1}", skillTemplate.TemplateID, curActionIndex);
+            return;
+        }
+        
+        if (skillTemplate.IsSingleAction)
+        {
+            UnitActionData actdata = skillTemplate.ActionQueue[curActionIndex];
+            var duration = action.ActionTimeArray != null ? action.ActionTimeArray[0] : actdata.TotalTimeMS;
+            EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent() {
+                UnitId = Id,
+                CommandType = AnimatorEventType.Skill,
+                SkillName = actdata.ActionName,
+                Duration = duration,
+                Speed = action.ActionSpeed,
+                Loop = actdata.IsCycAction
+            });
+
+            if (!actdata.ActionAudioName.IsNullOrWhitespace())
+            {
+                SoundManager.Instance.Play3DSound(actdata.ActionAudioName, ZUnit.X, ZUnit.Y, ZUnit.Z, duration);
+            }
+        }
+        else
+        {
+            UnitActionData item = null;
+            float speed = 1.0f;
+            bool isFrist = true;
+            for (int i = curActionIndex; i < skillTemplate.ActionQueue.Count; i++)
+            {
+                item = skillTemplate.ActionQueue[i];
+                if (action.LaunchEvent != null)
+                {
+                    speed = action.LaunchEvent.action_speed;
+                    if (action.LaunchEvent.action_speed_add != null && i < action.LaunchEvent.action_speed_add.Length)
+                    {
+                        speed += action.LaunchEvent.action_speed_add[i];
+                    }
+                }
+
+                EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent()
+                {
+                    UnitId = Id,
+                    CommandType = AnimatorEventType.Skill,
+                    SkillName = item.ActionName,
+                    Duration = action.ActionTimeArray[i],
+                    Speed = speed,
+                    Loop = item.IsCycAction,
+                    GroupId = GroupId()
+                });
+
+                if(!item.ActionAudioName.IsNullOrWhitespace())
+                {
+                    if (isFrist)
+                    {
+                        isFrist = false;
+                        SoundManager.Instance.Play3DSound(item.ActionAudioName, ZUnit.X, ZUnit.Y, ZUnit.Z, action.ActionTimeArray[i]);
+                    }
+                    else
+                    {
+                        Log.Error("not implements multiAction audio");
+                    }
+                }
+            }
+        }
     }
 
     protected virtual void OnMaxMPChanged(ZoneUnit unit, int oldMaxMP, int newMaxMP)
@@ -82,29 +157,54 @@ public class BattleUnit : BattleObject
 
     protected virtual void OnSkillActionChanged(ZoneUnit unit, ZoneUnit.SkillState skill, byte index)
     {
-        throw new NotImplementedException();
+        //技能状态
+
     }
 
     protected virtual void OnActionChanged(ZoneUnit unit, UnitActionStatus status, object evt)
     {
+        Log.Debug($"ActionChange2: {status}, zobject status:{ZUnit.CurrentState}");
+        if(!actionChangeHandler.Notify(status, evt))
+        {
+            Log.Error($"unhandle action changed: {status}");
+        }
     }
+    protected virtual void OnActionSubStatusChanged(ZoneUnit unit, byte status, object evt)
+    {
 
-    protected virtual void OnLayerObjectEvent(ZoneObject obj, CommonAI.Zone.ObjectEvent e)
+    }
+    private void registerActionHandler()
     {
-        /*RegistZoneEvent<BattleHintNumberB2C>((data) =>
-        {
-            BattleHintNumberB2C evt = data as BattleHintNumberB2C;
-            ShowHint(evt.Value, evt.State, evt.TargetObjID);
+        actionChangeHandler.AddListener(UnitActionStatus.Idle, (_) => {
+            EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent() { UnitId = Id, CommandType = AnimatorEventType.Idle });
         });
-        RegistZoneEvent<BattleFloatTipsEventB2C>((data) =>
-        {
-            BattleFloatTipsEventB2C evt = data as BattleFloatTipsEventB2C;
-            ShowTipHint(evt.Type);
+
+        var move = actionChangeHandler.AddListener(UnitActionStatus.Move, (o) => {
+            EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent() { UnitId = Id, CommandType = AnimatorEventType.Run });
         });
-        RegistZoneEvent<BubbleTipsEventB2C>((data) =>
-        {
-            BubbleTipsEventB2C evt = data as BubbleTipsEventB2C;
-            AddBubbleChat(evt.Msg, 5);
-        });*/
+        actionChangeHandler.AddListener(UnitActionStatus.Chaos, move);
+        actionChangeHandler.AddListener(UnitActionStatus.ServerSyncMove, move);
+        actionChangeHandler.AddListener(UnitActionStatus.Escape, move);
+
+        var stun = actionChangeHandler.AddListener(UnitActionStatus.Stun, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.HitMove, stun);
+        actionChangeHandler.AddListener(UnitActionStatus.Dead, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.Damage, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.Pick, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.Spawn, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.ChargeAtkMove, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.ChargeAtkIdle, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.DaZuo, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.DaZuoRecoveryAttr, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.ChuanGongA, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.ChuanGongB, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.BuffLockStateAction, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.HomeBack, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.ClearYaoQi, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.PetLock, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.BreakShield, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.Transport, (o) => { });
+        actionChangeHandler.AddListener(UnitActionStatus.Skill, (o) => { });
     }
+
 }

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

@@ -2,12 +2,43 @@
 {
     namespace EventType
     {
-        public struct OnNewZoneObject {
+        public struct OnNewZoneObject
+        {
             public BattleObject Object;
         }
         public struct OnDestroyZoneObject
         {
             public BattleObject Object;
         }
+        public struct PlayAnimatorEvent
+        {
+            public uint UnitId;
+            public AnimatorEventType CommandType;
+            public string SkillName;
+            public float Duration;
+            public float Speed;
+            public uint GroupId;
+            public bool Loop;
+
+            public PlayAnimatorEvent(uint id, AnimatorEventType type, string skill = "", float duration = -1, float speed = 1.0f, uint gid = 0, bool loop = false)
+            {
+                UnitId = id;
+                CommandType = type;
+                SkillName = skill;
+                Duration = duration;
+                Speed = speed;
+                GroupId = gid;
+                Loop = loop;
+            }
+        }
+    }
+
+    //状态指令
+    public enum AnimatorEventType
+    {
+        Idle = 0,
+        Run,
+        Skill,
+        Dead
     }
 }

Unity/Assets/Scripts/Codes/Model/Share/Const/ConstGame.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Share/EventDispatcher.cs

@@ -5,13 +5,12 @@ namespace ET
 {
     public class EventDispatcher<A>
     {
-        private Dictionary<Type, List<Action<A>>> _list = new();
+        private readonly Dictionary<Type, List<Action<A>>> _list = new();
         public EventDispatcher() { }
 
         public Action<A> AddListener<T>(Action<A> action)
         {
-            List<Action<A>> acts;
-            if (_list.TryGetValue(typeof(T), out acts))
+            if (_list.TryGetValue(typeof(T), out List<Action<A>> acts))
             {
                 acts.Add(action);
             }
@@ -22,16 +21,49 @@ namespace ET
             return action;
         }
 
-        public void Notfify(A ev)
+        public bool Notify(A ev)
         {
-            List<Action<A>> acts;
-            if (_list.TryGetValue(ev.GetType(), out acts))
+            if (_list.TryGetValue(ev.GetType(), out List<Action<A>> acts))
             {
                 foreach (var act in acts)
                 {
                     act.Invoke(ev);
                 }
+                return acts.Count > 0;
             }
+            return false;
+        }
+    }
+
+    public class EventDispatcher<KeyType, ActionParm>
+    {
+        private readonly Dictionary<KeyType, List<Action<ActionParm>>> _list = new();
+        public EventDispatcher() { }
+
+        public Action<ActionParm> AddListener(KeyType kt, Action<ActionParm> action)
+        {
+            if (_list.TryGetValue(kt, out List<Action<ActionParm>> acts))
+            {
+                acts.Add(action);
+            }
+            else
+            {
+                _list.Add(kt, new List<Action<ActionParm>> { action });
+            }
+            return action;
+        }
+
+        public bool Notify(KeyType kt, ActionParm data)
+        {
+            if (_list.TryGetValue(kt, out List<Action<ActionParm>> acts))
+            {
+                foreach (var act in acts)
+                {
+                    act.Invoke(data);
+                }
+                return acts.Count > 0;
+            }
+            return false;
         }
     }
 }

Unity/Assets/Scripts/Codes/Model/Unity.Model.Codes.asmdef

@@ -4,7 +4,8 @@
     "references": [
         "Unity.ThirdParty",
         "Unity.Core",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "Unity.Mono"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -1,47 +1,36 @@
 using UnityEngine;
 using Mono;
 using System.Collections.Generic;
+using AniType = Mono.AnimationData.AnimationType;
 
 namespace ET.Client
 {
 	[ChildOf(typeof(ModelViewComponent))]
 	public class AnimatorComponent : Entity, IAwake<GameObject>, IUpdate, IDestroy
 	{
-        //状态指令
-        public enum CommandType
-        {
-            Idle = 0,
-            Run,
-            StopRun,
-            StopSkill,
-            Skill0,
-            Skill1,
-            Skill2,
-            Skill3,
-
-            Dead
-        }
-        public struct Command
-        {
-            public CommandType Type;
-            public Command(CommandType type)
-            {
-                this.Type = type;
-            }
-        }
-
-        [StaticFieldAttribute(typeof(ET.Client.AnimatorComponent))]
-        public static readonly Command CMDIdle = new Command(CommandType.Idle);
-        [StaticFieldAttribute(typeof(ET.Client.AnimatorComponent))]
-        public static readonly Command CMDRun = new Command(CommandType.Run);
-        [StaticFieldAttribute(typeof(ET.Client.AnimatorComponent))]
-        public static readonly Command CMDStopRun = new Command(CommandType.StopRun);
+        public static readonly AnimatorCommand CMDIdle = new AnimatorCommand(AniType.Idle);
+        public static readonly AnimatorCommand CMDRun = new AnimatorCommand(AniType.Run);
+        public static readonly AnimatorCommand CMDDead = new AnimatorCommand(AniType.Dead);
 
         //指令队列
-        public List<Command> Commands = new List<Command>();
+        public List<AnimatorCommand> Commands = new ();
 
         public GameObject GameObject { get; set; }
         public AnimationData AniData;
-        public AnimationData.AnimationType DoingType;
+        public AnimatorCommand DoingCmd;
     }
+
+    public class AnimatorCommand
+    {
+        public AniType Type;
+        public float Duration = -1f;
+        public float Speed = 1.0f;
+        public uint GroupId = 0;
+        public bool Loop = false;
+        public AnimatorCommand(AniType type)
+        {
+            this.Type = type;
+        }
+    }
+
 }

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

@@ -16,7 +16,12 @@ namespace Mono
             Skill0,
             Skill1,
             Skill2,
-            Skill3
+            Skill3,
+            Skill4,
+            Skill5,
+            Skill6,
+
+            SkillMax
         }
 
         [Serializable]

Unity/Assets/Scripts/Empty/Model/Unity.Model.asmdef

@@ -4,7 +4,8 @@
     "references": [
         "Unity.ThirdParty",
         "Unity.Core",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "Unity.Mono"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],