Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Res/Config/SkillConstant.json.meta   resolved by origin/master(远端) version
#	Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs.meta   resolved by origin/master(远端) version

Assets/Res/Config/SkillConstant.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WngfsimoVH5Y9pgYsaHSSmvMO66QkxQM1BeZjuPmQUaobTtyj9XHpRpA7YmO
+guid: CnIYtHytUX3zGHWYqRyaysxOK8g6RcMCrufwL8ZIika/+pVi/1E1U5WGNrgY
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WnkW4HukASjgLXhOPolAhwbU1S+NF6gvNO7o0qCkK/R0nGdyJei3u9y/HZ09
+guid: XnhJ4H+kV3lwtciyo0BmUmQyai4/FEoKw0XeFs4uTH69egWHqh8xMBleqbRj
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCollisionInfo.cs

@@ -106,7 +106,7 @@ namespace GameLogic.Combat.CombatTool
 
             _besselPathA.controlPoints.Add(b.GameObject.transform.TransformPoint(new Vector3(-12.66f, 1, 5)));
             _besselPathA.controlPoints.Add(b.dotPos);
-            GameObject G1 = new GameObject("BesselPathMono22");
+            GameObject G1 = new GameObject("BesselPathMono33");
             BesselPathMono besselPathMono1 = G1.AddComponent<BesselPathMono>();
             besselPathMono1.isRun = true;
             besselPathMono1.BesselPath = _besselPathA;
@@ -118,7 +118,7 @@ namespace GameLogic.Combat.CombatTool
             _besselPathB.controlPoints.Add(
                 a.GameObject.transform.TransformPoint(new Vector3(12.67f, -3.03f, -3.5f)));
             _besselPathB.controlPoints.Add(a.dotPos);
-            GameObject G2 = new GameObject("BesselPathMono22");
+            GameObject G2 = new GameObject("BesselPathMono44");
             BesselPathMono besselPathMono2 = G2.AddComponent<BesselPathMono>();
             besselPathMono2.isRun = true;
             besselPathMono2.BesselPath = _besselPathB;

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponIdleState.cs

@@ -41,11 +41,11 @@ namespace GameLogic.Combat.Hero
                         myCombatMagicWeaponEntity.MagicWeaponCollisionId);
                 if (!nMagicWeaponCollisionInfo.a.isCombatState || !nMagicWeaponCollisionInfo.b.isCombatState)
                 {
-                    Quaternion newQuaternion = Quaternion.identity;
-
-                    myCombatMagicWeaponEntity.GameObject.transform.rotation = Quaternion.RotateTowards(
-                        myCombatMagicWeaponEntity.GameObject.transform.rotation,
-                        newQuaternion, 5);
+                    // Quaternion newQuaternion = Quaternion.identity;
+                    //
+                    // myCombatMagicWeaponEntity.GameObject.transform.rotation = Quaternion.RotateTowards(
+                    //     myCombatMagicWeaponEntity.GameObject.transform.rotation,
+                    //     newQuaternion, 5);
                 }
                 // else
                 // {