增加法术支持z方向Rotation

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

@@ -22,119 +22,45 @@ namespace ET
             {
                 foreach (var obj in UnitMgr.Instance.AllUnits)
                 {
-                    if (obj is BattleUnit || obj is BattleSpell)
+                    if (obj is BattleUnit)
                     {
-                        /*if(obj is BattleSpell spell)
+                        var zo = obj.ZoneObject;
+                        VecTmp.Set(zo.X, zo.Y, zo.Z);
+                        if (!VecTmp.Equal(obj.LastPos, 0.01f) || MathF.Abs(obj.LastRotation - zo.Direction) > 0.01f)
                         {
-                            var zs = spell.ZoneSpell;
-                            if (zs.Info.MType == CommonAI.Zone.SpellTemplate.MotionType.Foxfire)
-                            {
-                                if(zs.Target.ObjectID == 0 || zs.PassTimeMS > zs.Info.LifeTimeMS + 5000)
-                                {
-                                    PostMsg2Layer(new RemoveObjectEvent(zs.ObjectID));
-                                    return;
-                                }
-                            }
-                            else if(zs.PassTimeMS > zs.Info.LifeTimeMS + 150)
+                            EventSystem.Instance.Publish<SyncUnitPosEvent>(SyncUnitPosEvent.Static.Clone(zo.ObjectID, VecTmp, zo.Direction));
+                            obj.LastPos.Set(VecTmp);
+                            obj.LastRotation = zo.Direction;
+                        }
+                    }
+                    else if(obj is BattleSpell)
+                    {
+                        var zs = obj.ZoneObject as ZoneSpell;
+                        /*
+                        if (zs.Info.MType == CommonAI.Zone.SpellTemplate.MotionType.Foxfire)
+                        {
+                            if (zs.Target.ObjectID == 0 || zs.PassTimeMS > zs.Info.LifeTimeMS + 5000)
                             {
                                 PostMsg2Layer(new RemoveObjectEvent(zs.ObjectID));
                                 return;
                             }
+                        }
+                        else if (zs.PassTimeMS > zs.Info.LifeTimeMS + 150)
+                        {
+                            PostMsg2Layer(new RemoveObjectEvent(zs.ObjectID));
+                            return;
                         }*/
-
-                        var zo = obj.ZoneObject;
-                        VecTmp.Set(zo.X, zo.Y, zo.Z);
-                        if (!VecTmp.Equal(obj.LastPos, 0.01f) || MathF.Abs(obj.LastRotation - zo.Direction) > 0.01f)
+                        VecTmp.Set(zs.X, zs.Y, zs.Z);
+                        if (!VecTmp.Equal(obj.LastPos, 0.01f) || MathF.Abs(obj.LastRotation - zs.Direction) > 0.01f)
                         {
-                            EventSystem.Instance.Publish<SyncUnitPosEvent>(SyncUnitPosEvent.Static.Clone(zo.ObjectID, VecTmp, zo.Direction));
+                            EventSystem.Instance.Publish<SyncUnitPosEvent>(SyncUnitPosEvent.Static.Clone(zs.ObjectID, VecTmp, zs.Direction, zs.RotationX));
                             obj.LastPos.Set(VecTmp);
-                            obj.LastRotation = zo.Direction;
+                            obj.LastRotation = zs.Direction;
                         }
+
                     }
                 }
             }
         }
-
-        /// <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/HotfixView/Client/RenderUtils.cs

@@ -19,9 +19,9 @@ public static class RenderUtils
         return vecTemp;
     }
 
-    public static UnityEngine.Quaternion UnityRotationFromBattle(float rotation)
+    public static UnityEngine.Quaternion UnityRotationFromBattle(float rotation, float rotationX = 0f)
     {
-        vecTemp.Set(0, rotation * Mathf.Rad2Deg + 90, 0);
+        vecTemp.Set(-rotationX * Mathf.Rad2Deg, rotation * Mathf.Rad2Deg + 90, 0);
         return Quaternion.Euler(vecTemp);
     }
 }

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

@@ -77,7 +77,7 @@ namespace ET.Client
             {
                 var transform = unitRender.GameObject.transform;
                 transform.position = RenderUtils.UnityPosFromBattle(args.Pos);
-                transform.rotation = RenderUtils.UnityRotationFromBattle(args.Rotation);
+                transform.rotation = RenderUtils.UnityRotationFromBattle(args.Rotation, args.RotationX);
 
                 if(args.Id == UnitMgr.Instance.ActorId)
                 {

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

@@ -51,13 +51,15 @@ namespace ET
             public uint Id;
             public CommonLang.Geometry.Vector3 Pos;
             public float Rotation;
+            public float RotationX;
 
             public static SyncUnitPosEvent Static = new SyncUnitPosEvent();
-            public SyncUnitPosEvent Clone(uint id, CommonLang.Geometry.Vector3 v, float r)
+            public SyncUnitPosEvent Clone(uint id, CommonLang.Geometry.Vector3 v, float r, float rx = 0f)
             {
                 Id = id;
                 Pos.Set(v);
                 Rotation = r;
+                RotationX = rx;
                 return this;
             }
         }