增加角色动画支持

Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Scene/SceneChangeHelper.cs

@@ -18,10 +18,10 @@
             // 等待CreateMyUnit的消息
             Wait_CreateMyUnit waitCreateMyUnit = await clientScene.GetComponent<ObjectWait>().Wait<Wait_CreateMyUnit>();
             M2C_CreateMyUnit m2CCreateMyUnit = waitCreateMyUnit.Message;
-            Unit unit = UnitFactory.Create(currentScene, m2CCreateMyUnit.Unit);
-            unitComponent.Add(unit);
-            
+            Unit unit = UnitFactory.Create(currentScene, m2CCreateMyUnit.Unit, true);
+
             clientScene.RemoveComponent<AIComponent>();
+            clientScene.GetComponent<ObjectWait>().Notify(new Wait_SceneChangeFinish());
         }
     }
-}
+}

Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Unit/UnitFactory.cs

@@ -4,17 +4,17 @@ namespace ET.Client
 {
     public static class UnitFactory
     {
-        public static Unit Create(Scene currentScene, UnitInfo unitInfo)
+        public static Unit Create(Scene currentScene, UnitInfo unitInfo, bool isActor = false)
         {
+			Log.Debug($"Create unit :{unitInfo.UnitId}@{unitInfo.Type}");
 	        UnitComponent unitComponent = currentScene.GetComponent<UnitComponent>();
 	        Unit unit = unitComponent.AddChildWithId<Unit, int>(unitInfo.UnitId, unitInfo.ConfigId);
-	        unitComponent.Add(unit);
-	        
+			unit.IsActor = isActor;
 	        unit.Position = unitInfo.Position;
 	        unit.Forward = unitInfo.Forward;
-	        
-	        NumericComponent numericComponent = unit.AddComponent<NumericComponent>();
+            unitComponent.Add(unit);
 
+            NumericComponent numericComponent = unit.AddComponent<NumericComponent>();
 			foreach (var kv in unitInfo.KV)
 			{
 				numericComponent.Set(kv.Key, kv.Value);
@@ -31,10 +31,12 @@ namespace ET.Client
 	        }
 
 	        unit.AddComponent<ObjectWait>();
+            if (unitInfo.Type == (int)UnitType.Monster)
+			{
+				unit.AddComponent<XunLuoPathComponent>();
+			}
 
-	        unit.AddComponent<XunLuoPathComponent>();
-	        
-	        EventSystem.Instance.Publish(unit.DomainScene(), new EventType.AfterUnitCreate() {Unit = unit});
+            EventSystem.Instance.Publish(unit.DomainScene(), new EventType.AfterUnitCreate() {Unit = unit});
             return unit;
         }
     }

Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Unit/UnitComponentSystem.cs

@@ -15,23 +15,33 @@
 		{
 		}
 	}
-	
-	public static class UnitComponentSystem
-	{
-		public static void Add(this UnitComponent self, Unit unit)
-		{
-		}
 
-		public static Unit Get(this UnitComponent self, long id)
-		{
-			Unit unit = self.GetChild<Unit>(id);
-			return unit;
-		}
+    [FriendOfAttribute(typeof(ET.UnitComponent))]
+    public static class UnitComponentSystem
+    {
+        public static void Add(this UnitComponent self, Unit unit)
+        {
+            if (unit.IsActor)
+            {
+                self.IDActor = unit.Id;
+            }
+        }
 
-		public static void Remove(this UnitComponent self, long id)
-		{
-			Unit unit = self.GetChild<Unit>(id);
-			unit?.Dispose();
-		}
-	}
-}
+        public static Unit GetActor(this UnitComponent self)
+        {
+            return self.GetChild<Unit>(self.IDActor);
+        }
+
+        public static Unit Get(this UnitComponent self, long id)
+        {
+            Unit unit = self.GetChild<Unit>(id);
+            return unit;
+        }
+
+        public static void Remove(this UnitComponent self, long id)
+        {
+            Unit unit = self.GetChild<Unit>(id);
+            unit?.Dispose();
+        }
+    }
+}

Unity/Assets/Scripts/Codes/HotfixView/Client/Camera/CameraComponentSystem.cs

@@ -36,10 +36,11 @@ namespace ET.Client
 			}
 		}
 
-		private static void UpdatePosition(this CameraComponent self)
+        //相机跟随主角
+        private static void UpdatePosition(this CameraComponent self)
 		{
 			Vector3 cameraPos = self.mainCamera.transform.position;
-			self.mainCamera.transform.position = new Vector3(self.Unit.Position.x, cameraPos.y, self.Unit.Position.z - 10);
+			self.mainCamera.transform.position = new Vector3(self.Unit.Position.x - 10, cameraPos.y, self.Unit.Position.z - 25);
 		}
 	}
 }

Unity/Assets/Scripts/Codes/HotfixView/Client/EntryEvent3_InitClient.cs

@@ -1,13 +1,13 @@
 namespace ET.Client
 {
     [Event(SceneType.Process)]
-    public class EntryEvent3_InitClient: AEvent<ET.EventType.EntryEvent3>
+    public class EntryEvent3_InitClient : AEvent<ET.EventType.EntryEvent3>
     {
         protected override async ETTask Run(Scene scene, ET.EventType.EntryEvent3 args)
         {
             // 加载配置
             //Root.Instance.Scene.AddComponent<ResourcesComponent>();
-            //Root.Instance.Scene.AddComponent<GlobalComponent>();
+            Root.Instance.Scene.AddComponent<GlobalComponent>();
 
             Scene clientScene = await SceneFactory.CreateClientScene(1, "Game");
             await EventSystem.Instance.PublishAsync(clientScene, new EventType.AppStartInitFinish());

Unity/Assets/Scripts/Codes/HotfixView/Client/Global/GlobalComponentSystem.cs

@@ -3,14 +3,14 @@ using UnityEngine;
 namespace ET.Client
 {
     [ObjectSystem]
-    public class GlobalComponentAwakeSystem: AwakeSystem<GlobalComponent>
+    public class GlobalComponentAwakeSystem : AwakeSystem<GlobalComponent>
     {
         protected override void Awake(GlobalComponent self)
         {
             GlobalComponent.Instance = self;
-            
+
             self.Global = GameObject.Find("/Global").transform;
-            //self.Unit = GameObject.Find("/Global/Unit").transform;
+            self.Unit = GameObject.Find("/Global/Unit").transform;
             //self.UI = GameObject.Find("/Global/UI").transform;
         }
     }

Unity/Assets/Scripts/Codes/HotfixView/Client/Opera/OperaComponentSystem.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace ET.Client
 {
@@ -19,7 +19,7 @@ namespace ET.Client
         {
             protected override void Update(OperaComponent self)
             {
-                if (Input.GetMouseButtonDown(1))
+                /*if (Input.GetMouseButtonDown(0))
                 {
                     Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                     RaycastHit hit;
@@ -29,7 +29,7 @@ namespace ET.Client
                         c2MPathfindingResult.Position = hit.point;
                         self.ClientScene().GetComponent<SessionComponent>().Session.Send(c2MPathfindingResult);
                     }
-                }
+                }*/ 
 
                 if (Input.GetKeyDown(KeyCode.R))
                 {
@@ -46,4 +46,4 @@ namespace ET.Client
             }
         }
     }
-}
+}

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

@@ -1,11 +1,9 @@
 using Cysharp.Threading.Tasks;
-using FairyGUI;
-using UnityEngine.SceneManagement;
 
 namespace ET.Client
 {
     [Event(SceneType.Client)]
-    public class SceneChangeStart_AddComponent: AEvent<EventType.SceneChangeStart>
+    public class SceneChangeStart_AddComponent : AEvent<EventType.SceneChangeStart>
     {
         protected override async ETTask Run(Scene scene, EventType.SceneChangeStart args)
         {
@@ -17,14 +15,13 @@ namespace ET.Client
             var task = await YooAssetProxy.LoadSceneAsync("Scene_" + scnName);
             Log.Debug($"scene({task.SceneObject.name}) load finished.");
 
-            await TimerComponent.Instance.WaitAsync(3000);
+            await TimerComponent.Instance.WaitAsync(1000);
             UIHelper.Remove("Lobby");
             UIHelper.SetVisible("Loading", false);
             currentScene.AddComponent<OperaComponent>();
 
             // 通知等待场景切换的协程
-            //scene.GetComponent<ObjectWait>().Notify(new Wait_SceneChangeFinish());
-            //EventSystem.Instance.Publish(scene, new EventType.SceneChangeFinish());
+            EventSystem.Instance.Publish(scene, new EventType.SceneLoadFinish());
         }
     }
 }

Unity/Assets/Scripts/Codes/HotfixView/Client/Unit.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 625bee0f0ae290a45bd36d5e3fe4e222
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,34 @@
+using Mono;
+using UnityEngine;
+
+namespace ET.Client
+{
+    [Event(SceneType.Current)]
+    public class AfterUnitCreate_CreateUnitView : AEvent<EventType.AfterUnitCreate>
+    {
+        protected override async ETTask Run(Scene scene, EventType.AfterUnitCreate args)
+        {
+            Unit unit = args.Unit;
+            // Unit View层
+
+            var handle = await YooAssetProxy.LoadAssetAsync<GameObject>("Unit_Aj");
+            var prefab = handle.GetAssetObject<GameObject>();
+            GameObject go = UnityEngine.Object.Instantiate(prefab, GlobalComponent.Instance.Unit, true);
+            Log.Debug($"loaded unit({unit.Id}) model: Unit_Aj");
+
+            go.transform.position = unit.Position;
+            unit.AddComponent<GameObjectComponent>().GameObject = go;
+            var aniComp = unit.AddComponent<AnimatorComponent>();
+
+            if (unit.IsActor)
+            {
+                //相机跟随主角
+                //unit.AddComponent<CameraComponent>().Unit = unit;
+
+                //固定视角相机
+                var camera = Camera.main;
+                camera.transform.position = new Vector3(unit.Position.x, 7, unit.Position.z - 15);
+            }
+        }
+    }
+}

Unity/Assets/Scripts/Codes/HotfixView/Client/Unit/AfterUnitCreate_CreateUnitView.cs.meta

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

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

@@ -1,8 +1,9 @@
-using System;
-using UnityEngine;
+using CMDType = ET.Client.AnimatorComponent.CommandType;
+using AniType = Mono.AnimationData.AnimationType;
 
 namespace ET.Client
 {
+    [FriendOfAttribute(typeof(GameObjectComponent))]
     [FriendOf(typeof(AnimatorComponent))]
     public static class AnimatorComponentSystem
     {
@@ -29,192 +30,90 @@ namespace ET.Client
         {
             protected override void Destroy(AnimatorComponent self)
             {
-                self.animationClips = null;
-                self.Parameter = null;
-                self.Animator = null;
+                self.AniData.Animancer.Stop();
             }
         }
 
-        public static void Awake(this AnimatorComponent self)
+        //===AnimatorComponent 扩展方法-------
+        public static void AppendCommand(this AnimatorComponent self, CMDType type)
         {
-            Animator animator = self.GetParent<Unit>().GetComponent<GameObjectComponent>().GameObject.GetComponent<Animator>();
-
-            if (animator == null)
-            {
-                return;
-            }
-
-            if (animator.runtimeAnimatorController == null)
-            {
-                return;
-            }
-
-            if (animator.runtimeAnimatorController.animationClips == null)
-            {
-                return;
-            }
-            self.Animator = animator;
-            foreach (AnimationClip animationClip in animator.runtimeAnimatorController.animationClips)
-            {
-                self.animationClips[animationClip.name] = animationClip;
-            }
-            foreach (AnimatorControllerParameter animatorControllerParameter in animator.parameters)
-            {
-                self.Parameter.Add(animatorControllerParameter.name);
-            }
+            self.Commands.Add(new AnimatorComponent.Command(type));
         }
-
-        public static void Update(this AnimatorComponent self)
+        public static void AppendCommand(this AnimatorComponent self, AnimatorComponent.Command cmd)
         {
-            if (self.isStop)
-            {
-                return;
-            }
-
-            if (self.MotionType == MotionType.None)
-            {
-                return;
-            }
-
-            try
-            {
-                self.Animator.SetFloat("MotionSpeed", self.MontionSpeed);
-
-                self.Animator.SetTrigger(self.MotionType.ToString());
-
-                self.MontionSpeed = 1;
-                self.MotionType = MotionType.None;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception($"动作播放失败: {self.MotionType}", ex);
-            }
-        }
-
-        public static bool HasParameter(this AnimatorComponent self, string parameter)
-        {
-            return self.Parameter.Contains(parameter);
-        }
-
-        public static void PlayInTime(this AnimatorComponent self, MotionType motionType, float time)
-        {
-            AnimationClip animationClip;
-            if (!self.animationClips.TryGetValue(motionType.ToString(), out animationClip))
-            {
-                throw new Exception($"找不到该动作: {motionType}");
-            }
-
-            float motionSpeed = animationClip.length / time;
-            if (motionSpeed < 0.01f || motionSpeed > 1000f)
-            {
-                Log.Error($"motionSpeed数值异常, {motionSpeed}, 此动作跳过");
-                return;
-            }
-            self.MotionType = motionType;
-            self.MontionSpeed = motionSpeed;
+            self.Commands.Add(cmd);
         }
+        //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-        public static void Play(this AnimatorComponent self, MotionType motionType, float motionSpeed = 1f)
-        {
-            if (!self.HasParameter(motionType.ToString()))
-            {
-                return;
-            }
-            self.MotionType = motionType;
-            self.MontionSpeed = motionSpeed;
-        }
-
-        public static float AnimationTime(this AnimatorComponent self, MotionType motionType)
-        {
-            AnimationClip animationClip;
-            if (!self.animationClips.TryGetValue(motionType.ToString(), out animationClip))
-            {
-                throw new Exception($"找不到该动作: {motionType}");
-            }
-            return animationClip.length;
-        }
-
-        public static void PauseAnimator(this AnimatorComponent self)
-        {
-            if (self.isStop)
-            {
-                return;
-            }
-            self.isStop = true;
-
-            if (self.Animator == null)
-            {
-                return;
-            }
-            self.stopSpeed = self.Animator.speed;
-            self.Animator.speed = 0;
-        }
-
-        public static void RunAnimator(this AnimatorComponent self)
+        public static void Awake(this AnimatorComponent self)
         {
-            if (!self.isStop)
-            {
-                return;
-            }
-
-            self.isStop = false;
+            GameObjectComponent gameObjectComponent = self.GetParent<Unit>().GetComponent<GameObjectComponent>();
+            self.AniData = gameObjectComponent.GameObject.GetComponent<Mono.AnimationData>();
 
-            if (self.Animator == null)
-            {
-                return;
-            }
-            self.Animator.speed = self.stopSpeed;
+            self.DoingType = AniType.Dead;
+            self.ExeCommand(AnimatorComponent.CMDIdle);
         }
 
-        public static void SetBoolValue(this AnimatorComponent self, string name, bool state)
+        public static void Update(this AnimatorComponent self)
         {
-            if (!self.HasParameter(name))
-            {
-                return;
-            }
-
-            self.Animator.SetBool(name, state);
+            self.ExeCommand(self.FilterCmdList());
         }
 
-        public static void SetFloatValue(this AnimatorComponent self, string name, float state)
+        //执行指令
+        private static void ExeCommand(this AnimatorComponent self, AnimatorComponent.Command? cmd)
         {
-            if (!self.HasParameter(name))
+            if (cmd == null) return;
+            var ani = cmd?.Type switch
             {
-                return;
-            }
+                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.Animator.SetFloat(name, state);
+            self.AniData.PlayAnimation(ani, () => {
+                self.DoingType = AniType.Idle;
+                self.AniData.PlayAnimation(AniType.Idle);
+            });
         }
 
-        public static void SetIntValue(this AnimatorComponent self, string name, int value)
+        //从指令队列中分析出当前需要执行的指令
+        private static AnimatorComponent.Command? FilterCmdList(this AnimatorComponent self)
         {
-            if (!self.HasParameter(name))
+            var cmds = self.Commands;
+            if (cmds.Count <= 0)
             {
-                return;
+                return null;
             }
 
-            self.Animator.SetInteger(name, value);
-        }
-
-        public static void SetTrigger(this AnimatorComponent self, string name)
-        {
-            if (!self.HasParameter(name))
+            var cmd = cmds[0];
+            for(var i=1; i<cmds.Count; i++)
             {
-                return;
+                var next = cmds[i];
+                if(next.Type == CMDType.StopRun && cmd.Type == CMDType.Run)
+                {
+                    cmd = AnimatorComponent.CMDIdle;
+                }
+                else if(next.Type == CMDType.StopSkill && cmd.Type >= CMDType.Skill0 && cmd.Type <= CMDType.Skill3)
+                {
+                    cmd = AnimatorComponent.CMDIdle;
+                }
+                else if(next.Type > cmd.Type && cmd.Type < CMDType.Skill0)
+                {
+                    cmd = next;
+                }
             }
-
-            self.Animator.SetTrigger(name);
+            cmds.Clear();
+            return cmd;
         }
 
-        public static void SetAnimatorSpeed(this AnimatorComponent self, float speed)
-        {
-            self.stopSpeed = self.Animator.speed;
-            self.Animator.speed = speed;
-        }
-
-        public static void ResetAnimatorSpeed(this AnimatorComponent self)
-        {
-            self.Animator.speed = self.stopSpeed;
-        }
     }
-}
+}

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

@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ET.Client
+{
+    [Event(SceneType.Current)]
+    public class MoveStart_StartAnimation : AEvent<EventType.MoveStart>
+    {
+        protected override async ETTask Run(Scene scene, EventType.MoveStart args)
+        {
+            Unit unit = args.Unit;
+            unit.GetComponent<AnimatorComponent>().AppendCommand(AnimatorComponent.CMDRun);
+        }
+    }
+
+    [Event(SceneType.Current)]
+    public class MoveStop_StartAnimation : AEvent<EventType.MoveStop>
+    {
+        protected override async ETTask Run(Scene scene, EventType.MoveStop args)
+        {
+            Unit unit = args.Unit;
+            unit.GetComponent<AnimatorComponent>().AppendCommand(AnimatorComponent.CMDStopRun);
+        }
+    }
+}
+
+

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

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

Unity/Assets/Scripts/Codes/Model/Share/Demo/EventType.cs

@@ -2,35 +2,16 @@
 {
     namespace EventType
     {
-        public struct SceneChangeStart
-        {
-        }
-        
-        public struct SceneChangeFinish
-        {
-        }
-        
-        public struct AfterCreateClientScene
-        {
-        }
-        
-        public struct AfterCreateCurrentScene
-        {
-        }
-
-        public struct AppStartInitFinish
-        {
-        }
-
-        public struct LoginFinish
-        {
+        public struct SceneChangeStart { }
+        public struct SceneChangeFinish { }
+        public struct SceneLoadFinish { }
+        public struct AfterCreateClientScene { }
+        public struct AfterCreateCurrentScene { }
+        public struct AppStartInitFinish { }
+        public struct LoginFinish {
             public string exeception;
         }
-
-        public struct EnterMapFinish
-        {
-        }
-
+        public struct EnterMapFinish { }
         public struct AfterUnitCreate
         {
             public Unit Unit;

Unity/Assets/Scripts/Codes/Model/Share/Module/Unit/Unit.cs

@@ -14,6 +14,11 @@ namespace ET
         public UnitConfig Config => UnitConfigCategory.Instance.Get(this.ConfigId);
 
         public UnitType Type => (UnitType)UnitConfigCategory.Instance.Get(this.ConfigId).Type;
+        [BsonIgnore]
+        public bool IsActor
+        {
+            get; set;
+        }
 
         [BsonElement]
         private float3 position; //坐标

Unity/Assets/Scripts/Codes/Model/Share/Module/Unit/UnitComponent.cs

@@ -1,8 +1,8 @@
 namespace ET
 {
-	
 	[ComponentOf(typeof(Scene))]
 	public class UnitComponent: Entity, IAwake, IDestroy
 	{
+        public long IDActor = 0;
 	}
-}
+}

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

@@ -1,25 +1,45 @@
-using System.Collections.Generic;
-using UnityEngine;
+using Mono;
+using System.Collections.Generic;
 
 namespace ET.Client
 {
-	public enum MotionType
-	{
-		None,
-		Idle,
-		Run,
-	}
-
 	[ComponentOf(typeof(Unit))]
 	public class AnimatorComponent : Entity, IAwake, IUpdate, IDestroy
 	{
-		public Dictionary<string, AnimationClip> animationClips = new Dictionary<string, AnimationClip>();
-		public HashSet<string> Parameter = new HashSet<string>();
+        //状态指令
+        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 List<Command> Commands = new List<Command>();
 
-		public MotionType MotionType;
-		public float MontionSpeed;
-		public bool isStop;
-		public float stopSpeed;
-		public Animator Animator;
-	}
-}
+        public AnimationData AniData;
+        public AnimationData.AnimationType DoingType;
+    }
+}