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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Art/VFX/FXPrefabs/fx_boss 9021_zd.prefab

@@ -5018,9 +5018,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
   delayTime: 0
-  multipleTargetDelayTime: 0.1
+  multipleTargetDelayTime: 0
   hitFxName: fx_boss 9021_hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/SkillShow/MoveToTargetPosShow.cs

@@ -7,7 +7,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
         protected Vector3 _targetPos;
         protected Vector3 _startPos;
         private float _currTime;
-        private float _speed = 15;
+        private float _speed = 30;
         private float _timeAdd;
 
         public void SetTargetPos(Vector3 targetPos)

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/SkillShow/StraightLineShow.cs

@@ -25,7 +25,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             _besselPath.controlPoints.Add(_skillBasic.CombatHeroEntity.GameObject.transform.position);
             _besselPath.controlPoints.Add(p1);
             _besselPath.controlPoints.Add(p2);
-            _besselPath.controlPoints.Add(target.dotPos);
+            _besselPath.controlPoints.Add(target.GetSpecialDotInfo("hitpos").GetWorlPos());
             float d = _besselPath.GetLengthAtT(allTime);
 
             addTime = 1.0f / (d /  CustomTweenManager.AnimationCurveLibrary.fabaoMoveTopEnemySpeed);

Assets/Scripts/GameLogic/Combat/Skill/S9021.cs

@@ -32,7 +32,7 @@ namespace GameLogic.Combat.Skill
             Vector3 dir = (combatHeroHitPoint.combatHeroEntity.dotPos - startPos).normalized;
             bool isLafet = false;
 
-            for (int i = 0; i < effectValue[0]; i++)
+            for (int i = 0; i < effectValue[0]*5; i++)
             {
                 Vector3 endPos = Vector3.zero;
                 if (i != 0)
@@ -40,7 +40,7 @@ namespace GameLogic.Combat.Skill
                     int fh = (int)(Math.Pow(-1, i + 1) * Math.Ceiling(i / 2.0));
 
 
-                    Quaternion quaternion = Quaternion.Euler(0, fh * 10, 0)*CombatHeroEntity.GameObject.transform.rotation;
+                    Quaternion quaternion = Quaternion.Euler(0, fh * 5, 0)*CombatHeroEntity.GameObject.transform.rotation;
                     dir = quaternion * Vector3.forward;
                 }
 

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615