修改法术/特效渲染中的一些问题

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

@@ -27,7 +27,7 @@ namespace ET
             registerEventHandler();
 
             Layer = TemplateManager.Factory.CreateClientZoneLayer(BattleResourceMgr.Instance.GameEditorTemplates, this);
-            Layer.ActorSyncMode = SyncMode.MoveByClient_PreSkillByClient;
+            Layer.ActorSyncMode = SyncMode.ForceByServer;
 
             Layer.LayerInit += LayerEvent_Init;
             Layer.ObjectEnter += LayerEvent_ObjectEnter;

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

@@ -54,5 +54,87 @@ namespace ET
                 }
             }
         }
+
+        /// <summary>
+        /// 灵魂出窍的 Y 轴更新，一定是有目标的法术
+        /// </summary>
+        /// <param name="curPos"></param>
+        /// <returns></returns>
+        /*private float UpdateY(Vector3 curPos)
+        {
+            if (this.TargetUnit == null || this.TargetUnit.GameObject == null)
+            {
+                this.TargetPos = this.DefaultTargetPos;
+            }
+            else
+            {
+                // 有单位目标.
+                // 目标点为单位的胸部挂载点.
+                // 这里需要高度调整
+                //GameObject gameobj = this.TargetUnit.RUnit.GetTargetPart(RenderUnit.PART_CHEST_BUFF);
+                GameObject gameobj = this.TargetUnit.RUnit.RootTransform.gameObject;
+
+                //this.TargetPos = this.TargetUnit.GameObject.transform.position;
+                this.TargetPos = gameobj.transform.position;
+
+                if (gameobj != null)
+                {
+                    this.TargetPos.y = gameobj.transform.position.y;
+                }
+            }
+
+            float Total = Vector3.Distance(this.mOriginPos, this.TargetPos);
+            if (Total != 0)
+            {
+                float curState = Vector3.Distance(this.mOriginPos, curPos);
+
+                float p = curState / Total;
+                float factor = Mathf.Clamp01(p);
+
+                return Vector3.Lerp(this.mOriginPos, this.TargetPos, factor).y;
+            }
+
+            return curPos.y;
+        }*/
+
+        /*/更新cannon spell的Y
+        private float UpdateCannonPos(Vector3 curPos)
+        {
+            this.TargetPos = this.DefaultTargetPos;
+
+            //施法者都被移除了，还放个毛啊
+            if (this.LauncherUnit == null || this.LauncherUnit.GameObject == null)
+            {
+                return this.TargetPos.y;
+            }
+
+
+            float Total = Vector3.Distance(
+                            this.LauncherUnit.GameObject.transform.position,
+                            this.TargetPos);
+            if (Total == 0)
+            {
+                return curPos.y;
+            }
+            else
+            {
+                float self = Vector3.Distance(
+                                this.LauncherUnit.GameObject.transform.position,
+                                curPos);
+
+                float factor = Mathf.Clamp01(1 - self / Total);
+
+                if (this.ZSpell.Info.ParabolaHeight != 0)
+                {
+                    float sinheight = Mathf.Sin((1 - factor) * Mathf.PI);
+
+                    return this.ZSpell.LaunchHeight * factor + sinheight * this.ZSpell.Info.ParabolaHeight + AddHeight;
+                }
+                else
+                {
+                    return this.ZSpell.LaunchHeight * factor + AddHeight;
+                }
+            }
+        }*/
     }
 }

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

@@ -33,7 +33,7 @@ public class BattleObject
             if (_CurrentSceneCache == null)
             {
                 var cs = PlayerComponent.Instance.ClientScene();
-                _CurrentSceneCache = cs.GetComponent<CurrentScenesComponent>().Scene;
+                _CurrentSceneCache = cs.GetComponent<CurrentScenesComponent>()?.Scene;
             }
             return _CurrentSceneCache;
         }
@@ -49,5 +49,6 @@ public class BattleObject
             await ETTask.CompletedTask;
         }
     }
+    //TODO:监听场景退出事件
 
 }

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

@@ -13,8 +13,6 @@ public class BattleSpell : BattleObject
     public Vector3 OriginPos;
     public ZoneSpell ZoneSpell { get { return ZoneObject as ZoneSpell; } }
 
-    private LaunchEffect spawnEffect;
-
     public override void OnAwake(ZoneObject zo)
     {
         base.OnAwake(zo);
@@ -23,16 +21,24 @@ public class BattleSpell : BattleObject
 
         if(!zs.Info.FileNameSpawn.IsNullOrWhitespace())
         {
-            if(spawnEffect == null)
+            //出生特效
+            var spawnEffect = new LaunchEffect()
             {
-                spawnEffect = new LaunchEffect()
-                {
-                    Name = zs.Info.FileNameSpawn,
-                    SoundName = zs.Info.AudioName,
-                    IsLoop = zs.Info.IsAudioLoop
-                };
-            }
+                Name = zs.Info.FileNameSpawn,
+                SoundName = zs.Info.AudioName,
+                IsLoop = zs.Info.IsAudioLoop
+            };
             EventSystem.Instance.Publish<PlayEffectEvent>(PlayEffectEvent.Static.Clone(spawnEffect, zs.ObjectID, CommonLang.Geometry.Vector3.Zero));
         }
     }
+
+    public override void OnSleep()
+    {
+        base.OnSleep();
+
+        if(!ZoneSpell.Info.FileNameDestory.IsNullOrWhitespace())
+        {
+            //TODO:支持法术destroy特效
+        }
+    }
 }

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

@@ -205,6 +205,7 @@ public class BattleUnit : BattleObject
             {
                 EventSystem.Instance.Publish<PlayEffectEvent>(PlayEffectEvent.Static.Clone(launcheffect, Id, CommonLang.Geometry.Vector3.Zero));
             }
+            //TODO: 过几秒后，自行清理尸体
         });
         actionChangeHandler.AddListener(UnitActionStatus.Damage, (o) => { });
         actionChangeHandler.AddListener(UnitActionStatus.Pick, (o) => { });

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

@@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
 using CommonLang;
 using Sirenix.Utilities;
 using ET.EventType;
+using System.Collections.Generic;
 
 namespace ET.Client
 {
@@ -19,26 +20,29 @@ namespace ET.Client
         }
     }
 
-    public class EffectMgr : Singleton<EffectMgr>, ISingletonAwake, ISingletonUpdate
+    public class EffectMgr : Singleton<EffectMgr>, ISingletonUpdate
     {
         private HashMap<uint, EffectPlayInfo> playingList = new();
         
         private static Vector3 vecTemp = new();
-
-        public void Awake()
-        {
-        }
+        private List<uint> listTemp = new();
 
         public void Update()
         {
+            listTemp.Clear();
             var now = Time.realtimeSinceStartup;
             foreach (var epi in playingList.Values)
             {
                 if (epi.EndTime >= now)
                 {
-                    playingList.Remove(epi.Id);
+                    listTemp.Add(epi.Id);
                 }
             }
+
+            foreach(var id in listTemp)
+            {
+                RemoveEffect(id);
+            }
         }
 
         public async ETTask<uint> PlayEffect(LaunchEffect effect, uint HostId, Vector3 pos, float time = 0f, float rotation = 0f)
@@ -120,10 +124,11 @@ namespace ET.Client
             }
             if (rotation != 0)
             {
-                gt.rotation = Quaternion.Euler(0, rotation * Mathf.Rad2Deg + 90, 0);
+                gt.rotation = RenderUtils.UnityRotationFromBattle(rotation);
             }
             var scale = effectData.ScaleToBodySize != 0 ? effectData.ScaleToBodySize : 1f;
-            gt.localScale = new Vector3(scale, scale, scale);
+            vecTemp.Set(scale, scale, scale);
+            gt.localScale = vecTemp;
 
             if (!string.IsNullOrEmpty(effectData.Tag))
             {

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

@@ -15,7 +15,7 @@ public static class RenderUtils
     private static UnityEngine.Vector3 vecTemp;
     public static UnityEngine.Vector3 UnityPosFromBattle(CommonLang.Geometry.Vector3 pos)
     {
-        vecTemp.Set(pos.X, pos.Z, /*MapHeight -*/ pos.Y);
+        vecTemp.Set(pos.X, pos.Z, MapHeight - pos.Y);
         return vecTemp;
     }
 

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

@@ -196,7 +196,7 @@ namespace ET.Client
             {
                 key = go.name;
             }
-            Log.Debug($"cache gameobject: {key}");
+            //Log.Debug($"recycle gameobject: {key}");
             go.SetActive(false);
             go.transform.SetParent(GlobalViewComponent.Instance.RecycleNode, false);
             if (goPool.TryGetValue(key, out var golist))
@@ -215,7 +215,6 @@ namespace ET.Client
             {
                 if (golist.Count > 0)
                 {
-                    Log.Debug($"got gameobject ({key}) from pool");
                     var gobj = golist[0];
                     golist.RemoveRange(0, 1);
                     return gobj;
@@ -225,7 +224,7 @@ namespace ET.Client
             {
                 goPool.Add(key, new List<GameObject>());
             }
-            Log.Debug($"new gameobject: ({key})");
+            Log.Warning($"new gameobject: ({key})");
 
             var handle = await YooAssetProxy.LoadAssetAsync<GameObject>(key);
             var prefab = handle.GetAssetObject<GameObject>();

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

@@ -14,13 +14,8 @@ namespace ET.Client
 
         private void DestroyUnitModel(uint unitid)
         {
-            if(ModelViewComponent.Instance != null && GameObjectPool.Instance != null)
+            if(ModelViewComponent.Instance != null)
             {
-                var render = ModelViewComponent.Instance.GetChild<UnitRenderComponet>(unitid);
-                if(render != null)
-                {
-                    GameObjectPool.Instance.RecycleObject(render.GameObject);
-                }
                 ModelViewComponent.Instance.RemoveChild(unitid);
             }
 

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

@@ -71,12 +71,21 @@ namespace ET.Client
             }
 
             GameObject go = await GameObjectPool.Instance.Acquire($"Effect_{res}");
+            go.transform.parent = GlobalViewComponent.Instance.Unit;
             go.SetActive(true);
             go.transform.localScale = Vector3.one * zs.Info.FileBodyScale;
-            vecTemp.Set(zs.X, zs.Y, zs.Z);
+            vecTemp.Set(zs.X, zs.Y, zs.Z + zs.LaunchHeight);
             go.transform.position = RenderUtils.UnityPosFromBattle(vecTemp);
             go.transform.rotation = RenderUtils.UnityRotationFromBattle(zs.Direction);
             ModelViewComponent.Instance.AddChildWithId<UnitRenderComponet, GameObject>(zs.ObjectID, go, true);
+
+            var et = go.GetComponent<EffectTime>();
+            if (et != null)
+            {
+                et.speed = zs.Info.EffectAddSpeed;
+                //et.playAnimName = zs.Info.AnimtionName;
+                //TODO:特效不支持播放动画
+            }
         }
     }
 }

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

@@ -139,7 +139,8 @@ namespace ET.Client
                 { 
                     self.AniData.Animancer.Stop();
                 }
-                UnityEngine.Object.Destroy(self.GameObject);
+                GameObjectPool.Instance?.RecycleObject(self.GameObject);
+                self.Reset();
             }
         }
 
@@ -166,13 +167,8 @@ namespace ET.Client
                 self.AniData.PlayAnimation(cmd.Type, () => {
                     if (self.DoingCmd == cmd)
                     {
-                        Log.Debug($"{cmd.Type} finish early, to idle");
                         self.ExeCommand(UnitRenderComponet.CMDIdle);
                     }
-                    else
-                    {
-                        Log.Debug($"ani change to other: {self.DoingCmd.Type}");
-                    }
                 });
             }
         }

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

@@ -23,6 +23,13 @@ namespace ET.Client
         {
             return GameObject.transform;
         }
+
+        public void Reset()
+        {
+            GameObject = null;
+            AniData = null;
+            DoingCmd = null;
+        }
     }
 
     //TODO: 支持ObjectPool