增加 弦乐 技能

ProjectNLD/Assets/Code/Scripts/Gameplay/Buff/Impl/Status/StatusBuffChaos.cs

@@ -20,6 +20,9 @@ namespace Gameplay.Buff
                 case EGameUnitType.Character:
                     if (owner is Character.Character character)
                     {
+                        // 清空目标
+                        character.controlData.targetEnemy = null;
+                        character.controlData.followUnit = null;
                         character.UpdateTargets();
                         if (isEnter && character.controlData.targetEnemy == null)
                         {

ProjectNLD/Assets/Code/Scripts/Gameplay/Character/Character.State.cs

@@ -126,10 +126,8 @@ namespace Gameplay.Character
                 var enemy = allUnits[i];
                 if (enemy == null) continue;
                 if (!enemy.statusData.CheckCanBeTarget()) continue;
-                if (!statusData.isChaos)
-                {
-                    if (!Level.IsEnemy(this, enemy)) continue;
-                }
+                if (enemy == this) continue;
+                if (!statusData.isChaos && !Level.IsEnemy(this, enemy)) continue;
                 var enemyCellIndex = enemy.transData.cellIndex;
                 var cellDistance = map.TerrainGridSystem.CellGetHexagonDistance(selfCellIndex, enemyCellIndex);
                 if (cellDistance < minDistance)

ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/BuffCfg/EBuffEffectType.cs

@@ -16,7 +16,7 @@ namespace cfg.BuffCfg
         /// </summary>
         PositiveBuff = 0,
         /// <summary>
-        /// 负面效果
+        /// 减益效果
         /// </summary>
         NegativeBuff = 1,
         /// <summary>

ProjectNLD/Assets/Config/Data/buffcfg_buffconfig.json

@@ -355,6 +355,21 @@
       100
     ]
   },
+  {
+    "ID": 10014,
+    "Name": "扰乱之音-混乱",
+    "GroupId": 0,
+    "BuffEffectType": 1,
+    "RepeatType": 0,
+    "BuffType": 9,
+    "ExistType": 2,
+    "TriggerType": 3,
+    "MaxExistTime": 10,
+    "ExistEffectId": 52,
+    "TiggerUnitTime": 0,
+    "PorpParams": [],
+    "FloatParams": []
+  },
   {
     "ID": 20001,
     "Name": "特效buff",

ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json

@@ -191,5 +191,33 @@
       10001,
       10013
     ]
+  },
+  {
+    "ID": 14,
+    "Name": "扰乱之音伤害子弹",
+    "BulletType": 1,
+    "PrefabPath": "",
+    "HitAudioId": 0,
+    "DestroyEffectId": 0,
+    "FlySpeed": 100,
+    "FilterType": 3,
+    "AreaId": 1,
+    "BuffList": [
+      10003
+    ]
+  },
+  {
+    "ID": 15,
+    "Name": "扰乱之音buff子弹",
+    "BulletType": 1,
+    "PrefabPath": "",
+    "HitAudioId": 0,
+    "DestroyEffectId": 0,
+    "FlySpeed": 100,
+    "FilterType": 3,
+    "AreaId": 1,
+    "BuffList": [
+      10014
+    ]
   }
 ]

ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json

@@ -445,14 +445,20 @@
     "SkillDesc": "skill_desc5",
     "SkillActionId": 1,
     "TargetType": 3,
-    "ReleaseCheckType": 0,
+    "ReleaseCheckType": 1,
     "ReleaseArea": 10,
     "SelectCount": -1,
-    "InfluenceAreaId": 3,
-    "ShowAreaId": 3,
+    "InfluenceAreaId": 1,
+    "ShowAreaId": 1,
     "ShowEffectId": -1,
     "IntParams": [],
-    "FloatParams": [],
+    "FloatParams": [
+      1,
+      0.15,
+      1.3,
+      1,
+      1
+    ],
     "CDTime": 20,
     "LogicId": 10033,
     "IconPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_CultivateAll/UI_Pic_Cultivate/UI_Cultivate_SkillLogo.png"

ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10033.json

@@ -0,0 +1 @@
+{"skillId":10033,"actionList":[{"id":0,"subId":0,"floatParam1":0.0,"triggerTime":6.333333492279053,"actionType":4},{"id":0,"subId":0,"floatParam1":0.0,"triggerTime":6.333333492279053,"actionType":5},{"id":70,"subId":0,"floatParam1":0.0,"triggerTime":0.0,"actionType":3},{"id":0,"subId":0,"floatParam1":0.0,"triggerTime":0.0,"actionType":7},{"id":15,"subId":0,"floatParam1":0.0,"triggerTime":6.233333110809326,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":0.0,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":1.0,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":2.0,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":3.0333333015441896,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":4.016666889190674,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":5.016666889190674,"actionType":1},{"id":14,"subId":0,"floatParam1":0.0,"triggerTime":6.016666889190674,"actionType":1}]}

ProjectNLD/Assets/Config/Skills/LogicAssets/logic_10033.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a8610a36a40b9264bbe67dc50465b3c1
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: