feat: 添加三个新技能并更新英雄配置

1. 新增6013闪电、6014小火球、6015小飓风三个技能及对应预制件
2. 更新职业技能列表，为法师和辅助职业新增技能
3. 调整部分英雄技能配置、属性描述与英雄列表
4. 优化部分技能的伤害系数与效果参数

assets/resources/game/skill/atk/m3.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 14
+      },
+      {
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -92,8 +95,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 6.77,
+      "x": 0,
-      "y": 0,
+      "y": -30,
       "z": 0
     },
     "_lrot": {
@@ -105,8 +108,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
+      "x": 1,
-      "y": 0.3,
+      "y": 2,
       "z": 1
     },
     "_mobility": 0,
@@ -133,13 +136,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
+      "width": 128,
-      "height": 90
+      "height": 128
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_id": ""
   },
@@ -170,7 +173,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@4d4df",
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@55402",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -222,13 +225,13 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 30,
+      "width": 20,
-      "height": 40
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_id": ""
   },
@@ -248,13 +251,25 @@
     "__prefab": {
       "__id__": 11
     },
-    "atk_x": 10,
+    "atk_x": 0,
-    "atk_y": 15,
+    "atk_y": 0,
+    "runType": 3,
+    "endType": 0,
+    "speed": 720,
+    "time": 0,
+    "distance": 0,
+    "forceStartX": -1,
+    "forceStartY": -1,
+    "summon_count": 1,
+    "summon_x_offset": 0,
+    "summon_y_offset": 0,
+    "summon_interval": 0,
+    "height_offset": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "60LInmZXxDtKu79AshRG9j"
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -288,7 +303,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e1yBA625RLwLhzo6bLYW7j"
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
   },
   {
     "__type__": "cc.BoxCollider2D",
@@ -315,14 +330,43 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 30,
+      "width": 20,
-      "height": 40
+      "height": 100
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "43ZDJfXX9AX73gyytKQZWm"
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "45605d53-4dca-4529-819d-4a0d98c3a47c",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "45605d53-4dca-4529-819d-4a0d98c3a47c",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
   },
   {
     "__type__": "cc.PrefabInfo",

assets/resources/game/skill/atk/m3.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "fc32700f-bf4a-47ce-b619-6497b7280fde",
+  "uuid": "7edb8215-1344-4215-8172-7a50a72da8bb",
   "files": [
     ".json"
   ],

assets/resources/game/skill/atk/m4.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 14
+      },
+      {
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -92,7 +95,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 6.77,
+      "x": 0,
       "y": 0,
       "z": 0
     },
@@ -100,13 +103,13 @@
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
-      "z": 0,
+      "z": 0.706489444943837,
-      "w": 1
+      "w": 0.7077235789366842
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.3,
+      "x": -1,
-      "y": 0.3,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -115,7 +118,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 89.9
     },
     "_id": ""
   },
@@ -133,8 +136,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
+      "width": 85,
-      "height": 90
+      "height": 119
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -170,7 +173,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@179ff",
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@59ec8",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -222,8 +225,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 30,
+      "width": 50,
-      "height": 40
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -248,13 +251,25 @@
     "__prefab": {
       "__id__": 11
     },
-    "atk_x": 10,
+    "atk_x": 20,
-    "atk_y": 15,
+    "atk_y": 20,
+    "runType": 0,
+    "endType": 2,
+    "speed": 720,
+    "time": 0,
+    "distance": 0,
+    "forceStartX": -1,
+    "forceStartY": -1,
+    "summon_count": 1,
+    "summon_x_offset": 0,
+    "summon_y_offset": 0,
+    "summon_interval": 0,
+    "height_offset": 100,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "60LInmZXxDtKu79AshRG9j"
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
   },
   {
     "__type__": "cc.RigidBody2D",
@@ -288,7 +303,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e1yBA625RLwLhzo6bLYW7j"
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
   },
   {
     "__type__": "cc.BoxCollider2D",
@@ -315,14 +330,43 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 30,
+      "width": 50,
-      "height": 40
+      "height": 150
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "43ZDJfXX9AX73gyytKQZWm"
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "45385cba-7334-4ff4-a548-578262417f58",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "45385cba-7334-4ff4-a548-578262417f58",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
   },
   {
     "__type__": "cc.PrefabInfo",

assets/resources/game/skill/atk/m4.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "5a0c6727-c741-4a33-b6f2-b2c56e3fc540",
+  "uuid": "7c7ff7a4-17d5-4c4a-8fee-68b73af250e5",
   "files": [
     ".json"
   ],

assets/resources/game/skill/atk/m5.prefab

@@ -0,0 +1,519 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "m5",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "m5",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": -0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 277,
+      "height": 250
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93pNmvtQlLSqtTgIepyEmA"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@260b5",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": {
+      "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12eKc8gltBz50frJCS5+ww"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3arqAMBz1MvoXBzeDaL5M/",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Node-001",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": -0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 122,
+      "height": 68
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4blcTDlixIRI3qtyERLs2E"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e6QtagQwZA/50lsdWvOjb0"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ed54OCubBD853t6+5pUPLQ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+  },
+  {
+    "__type__": "57aabs7TE1J5obTAZczc+64",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "atk_x": 0,
+    "atk_y": 0,
+    "runType": 0,
+    "endType": 2,
+    "speed": 720,
+    "time": 0,
+    "distance": 0,
+    "forceStartX": -1,
+    "forceStartY": -1,
+    "summon_count": 1,
+    "summon_x_offset": 0,
+    "summon_y_offset": 0,
+    "summon_interval": 0,
+    "height_offset": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "35nW0iQNBH2bqkWAr3MVkQ"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "enabledContactListener": true,
+    "bullet": false,
+    "awakeOnLoad": true,
+    "_group": 1,
+    "_type": 1,
+    "_allowSleep": false,
+    "_gravityScale": 1,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "57cr7S0YpK4oEZCavwXtIX"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "tag": 0,
+    "_group": 1,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 50
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 100
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ebw5mObxNGGKxnJXDgX5gl"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "a71379d4-b14d-4070-96ee-e7c889f25bbd",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "a71379d4-b14d-4070-96ee-e7c889f25bbd",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20U0hP/NZErJJXRCEib1lq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

assets/resources/game/skill/atk/m5.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "8dc65122-222f-4bd3-b89c-62e7f8eefe78",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "m5"
+  }
+}

assets/script/game/common/config/SkillSet.ts

@@ -318,6 +318,21 @@ export const SkillSet: Record<number, SkillConfig> = {
         DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
         RType: RType.bezier, EType: EType.collision, info: "红瓶抛射物",
     },
+    6013: {
+        uuid: 6013, name: "闪电", sp_name: "m3", icon: "109-Red-Potion", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
+        DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
+        RType: RType.fixedEnd, EType: EType.collision, info: "闪电",
+    },
+    6014: {
+        uuid: 6014, name: "小火球", sp_name: "m4", icon: "109-Red-Potion", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
+        DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
+        RType: RType.fixedEnd, EType: EType.collision, info: "小火球",
+    },
+    6015: {
+        uuid: 6015, name: "小飓风", sp_name: "m5", icon: "109-Red-Potion", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk",
+        DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
+        RType: RType.fixedEnd, EType: EType.collision, info: "小飓风抛",
+    },
     // ==================== 群体大招（按职业分段：6100-6149 坦克/战士、6150-6199 刺客/射手、6200-6249 法师/辅助） ====================
     // 坦克/战士群体攻击大招
     6100: {
@@ -337,7 +352,7 @@ export const SkillSet: Record<number, SkillConfig> = {
     },
     6103: {
         uuid: 6103, name: "闪电斩", sp_name: "atk5", icon: "100-Enchant-Magic", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max0",
-        DTType: DTType.single, para: 30, ap: 150, hit_count: 5, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
+        DTType: DTType.single, ap: 150, hit_count: 5, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true,
         RType: RType.bezier, EType: EType.collision, info: "闪电斩动画",//英雄配置技能的时候，可以疲惫触发闪电系追加技能
     },
     6104: {
@@ -378,7 +393,7 @@ export const SkillSet: Record<number, SkillConfig> = {
         RType: RType.linear, EType: EType.collision, bezier_start_y: 20, bezier_mid_y: 140, bezier_arc: 1.05, info: "一个能量波",
     },
     6204: {
-        uuid: 6204, name: "多毒气弹", sp_name: "maxm6", icon: "o_warlock_hyzy_skill", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max1",
+        uuid: 6204, name: "闪电", sp_name: "maxm4", icon: "o_warlock_hyzy_skill", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max1",
         DTType: DTType.single, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote,
         RType: RType.linear, EType: EType.collision, bezier_start_y: 20, bezier_mid_y: 140, bezier_arc: 1.05, info: "一个大毒气弹",
     },

assets/script/game/common/config/heroSet.ts

@@ -1,6 +1,6 @@
 import { v3 } from "cc"
 import { BoxSet, FacSet, FightSet } from "./GameSet"
-import { SkillOverrides, TGroup, SkillSet, FieldSkillSet, SkillConfig, SkillKind, FieldSkillConfig, FieldSkillType, mergeSkillParams } from "./SkillSet"
+import { SkillOverrides, TGroup, SkillSet, FieldSkillSet, SkillConfig, SkillKind, FieldSkillConfig, FieldSkillType, mergeSkillParams, BuffTarget } from "./SkillSet"
 import { BuffList, BuffConfig, ModOp } from "./BuffSet"
 import { Attrs } from "./HeroAttrs"
 
@@ -604,14 +604,14 @@ export const HeroInfo: Record<number, heroInfo> = {
             },
         },
         atked: {
-            6302: [
+            6412: [
-                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"ap":10}, desc: "有 {t_chance}% 的概率，治疗自己 {ap}%生命最大值" },
+                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"ap":1} },
             ],
         },
         bonus: [
             { lv: 12, attrs: {"def":50}, name: "钢铁壁垒", icon: "46-Iron-Clad", },
         ],
-        info: "自身强护盾+群体小护盾，强生存",
+        info: "自身强护盾+防御强化",
     },
     // 5002 易伤剑仙 — CSV导入：击退压场+易伤放大；复刻酒仙
     5002: {
@@ -622,22 +622,22 @@ export const HeroInfo: Record<number, heroInfo> = {
                     { lv: 2, s_lv: SkillLv.Lv2, overrides: {"ap":120}, desc: "普通攻击造成 120% 攻击伤害" },
                 ],
             },
-            6101: { uuid: 6101, name: "气斩", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":150,"timed_buff_id":7002,"buff_value":20,"buff_chance":100,"buff_duration":5}, desc: "斩出气刃，对{target}造成攻击力{ap}%伤害，并使目标易伤（受到伤害加深，持续{dur}秒）",
+            6101: { uuid: 6101, name: "气斩", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":150,"timed_debuff_id":7002,"debuff_value":-20,"debuff_chance":100,"debuff_duration":5}, desc: "斩出气刃，对{target}造成攻击力{ap}%伤害，并使目标易伤（受到伤害加深，持续{dur}秒）",
                 lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":200,"timed_buff_id":7002,"buff_value":30,"buff_chance":100,"buff_duration":7} },
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":200,"timed_debuff_id":7002,"debuff_value":-50,"debuff_chance":100,"debuff_duration":5} },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":250,"timed_buff_id":7002,"buff_value":50,"buff_chance":100,"buff_duration":9} },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":250,"timed_debuff_id":7002,"debuff_value":-70,"debuff_chance":100,"debuff_duration":7} },
                 ],
             },
         },
         atking: {
             6001: [
-                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"timed_buff_id":7002,"buff_value":10,"buff_chance":100,"buff_duration":5} },
+                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"timed_debuff_id":7002,"debuff_value":-10,"debuff_chance":100,"debuff_duration":5} },
             ],
         },
         bonus: [
             { lv: 12, attrs: {"hp":50}, name: "不屈战意", icon: "29-Endure", },
         ],
-        info: "易伤+风怒，近战 dps",
+        info: "易伤，近战 dps",
     },
     // 5003 眩晕暴击哥 — CSV导入：高爆发+击晕收割；复刻齐天大圣
     5003: {
@@ -657,7 +657,7 @@ export const HeroInfo: Record<number, heroInfo> = {
         },
         atking: {
             6504: [
-                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"buff_value":30}, desc: "{t_chance}% 概率提升普通攻击 30%击晕概率5秒" },
+                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"buff_value":30}, desc: "{t_chance}% 概率提升普通攻击 30%暴击率5秒" },
             ],
         },
         bonus: [
@@ -826,16 +826,16 @@ export const HeroInfo: Record<number, heroInfo> = {
                     { lv: 2, s_lv: SkillLv.Lv2, overrides: {"crt":10} },
                 ],
             },
-            6151: { uuid: 6151, lv: 1, cd: UltCdSet[UltCdLv.VeryFast].cd, ccd: 0, overrides: {"ap":70,"summon_count":5,"crt":50},
+            6151: { uuid: 6151, lv: 1, cd: UltCdSet[UltCdLv.VeryFast].cd, ccd: 0, overrides: {"ap":70,"summon_count":5,"timed_debuff_id":7006,"debuff_value":-10,"debuff_chance":100,"debuff_duration":5},
                 lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":80,"crt":60} },
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":80,"timed_debuff_id":7006,"debuff_value":-20,"debuff_chance":100,"debuff_duration":5} },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":100,"crt":70} },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":100,"timed_debuff_id":7006,"debuff_value":-30,"debuff_chance":100,"debuff_duration":5} },
                 ],
             },
         },
         atking: {
             6008: [
-                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"ap":120,"crt":50} },
+                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, t_chance: 50, pity_add: 20, overrides: {"ap":120} },
             ],
         },
         bonus: [
@@ -849,19 +849,19 @@ export const HeroInfo: Record<number, heroInfo> = {
         skills: {
             6004: { uuid: 6004, name: "普攻强化", lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal].cd, ccd: 0,
                 lv_entries: [
-                    { lv: 2, s_lv: SkillLv.Lv2, overrides: {"proc_skill":{"s_uuid":6502,"chance":10,"overrides":{"ap":5}}}, desc: "普攻有 10% 概率，对自己释放回春（5 秒回复5% 生命）" },
+                    { lv: 2, s_lv: SkillLv.Lv2, overrides: {"proc_skill":{"s_uuid":6502,"chance":10,"overrides":{"ap":5,"TGroup": TGroup.Self}}}, desc: "普攻有 10% 概率，对自己释放回春（5 秒回复5% 生命）" },
                 ],
             },
-            6517: { uuid: 6517, name: "生命爆发", lv: 1, cd: UltCdSet[UltCdLv.VerySlow].cd, ccd: 0, overrides: {"buff_value":30,"buff_duration":10}, desc: "全体友方最大生命值提升{buff_value}%，持续{dur}秒",
+            6103: { uuid: 6103, name: "闪电战", lv: 1, cd: UltCdSet[UltCdLv.VerySlow].cd, ccd: 0, overrides: {"ap":200,"timed_buff_id":7029,"buff_value":30,"buff_chance":100,"buff_duration":5,"buff_target": BuffTarget.Self}, desc: "对前方达人造成 200% 伤害，并提升自己最大生命值提升{buff_value}%，持续{dur}秒",
                 lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"buff_value":40,"buff_duration":10}, desc: "全体友方最大生命值提升{buff_value}%，持续{dur}秒" },
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":250,"timed_buff_id":7029,"buff_value":40,"buff_chance":100,"buff_duration":5,"buff_target": BuffTarget.Self} },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"buff_value":50,"buff_duration":15}, desc: "全体友方最大生命值提升{buff_value}%，持续{dur}秒" },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":300,"timed_buff_id":7029,"buff_value":50,"buff_chance":100,"buff_duration":5,"buff_target": BuffTarget.Self} },
                 ],
             },
         },
         atked: {
             6402: [
-                { lv: 4, s_lv: SkillLv.Lv1, t_num: 5, overrides: {"ap":1,"TGroup": TGroup.Ally,"hit_count":3}, desc: "全队永久增加 1% 生命最大值" },
+                { lv: 4, s_lv: SkillLv.Lv1, t_num: 5, t_chance: 30, pity_add: 15, overrides: {"ap":1,"TGroup": TGroup.Ally,"hit_count":3}, desc: "全队永久增加 1% 生命最大值" },
             ],
         },
         bonus: [
@@ -878,10 +878,10 @@ export const HeroInfo: Record<number, heroInfo> = {
                     { lv: 2, s_lv: SkillLv.Lv2, overrides: {"proc_skill":{"s_uuid":6507,"chance":10,"overrides":{"buff_value":30,"TGroup": TGroup.Self}}} },
                 ],
             },
-            6201: { uuid: 6201, name: "飓风", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":100,"summon_count":2,"proc_skill":{"s_uuid":6507,"chance":20,"overrides":{"buff_value":20}}}, desc: "召唤 {summon_count} 道飓风攻击前方敌人，每道飓风造成 {ap}%伤害，每道飓风释放时有<color=#3CE66E>20</color>% 概率增加全体队友<color=#3CE66E>20</color>% 攻速",
+            6201: { uuid: 6201, name: "飓风", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":100,"summon_count":2,"proc_skill":{"s_uuid":6507,"chance":20,"overrides":{"buff_value":20,"TGroup": TGroup.Ally}}}, desc: "召唤 {summon_count} 道飓风攻击前方敌人，每道飓风造成 {ap}%伤害，每道飓风释放时有<color=#3CE66E>20</color>% 概率增加全体队友<color=#3CE66E>20</color>% 攻速",
                 lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":100,"summon_count":3,"proc_skill":{"s_uuid":6507,"chance":25,"overrides":{"buff_value":25}}}, desc: "召唤 {summon_count} 道飓风攻击前方敌人，每道飓风造成 {ap}%伤害，每道飓风释放时有<color=#3CE66E>20</color>% 概率增加全体队友<color=#3CE66E>20</color>% 攻速" },
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":100,"summon_count":3,"proc_skill":{"s_uuid":6507,"chance":25,"overrides":{"buff_value":25,"TGroup": TGroup.Ally}}}, desc: "召唤 {summon_count} 道飓风攻击前方敌人，每道飓风造成 {ap}%伤害，每道飓风释放时有<color=#3CE66E>20</color>% 概率增加全体队友<color=#3CE66E>20</color>% 攻速" },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":100,"summon_count":4,"proc_skill":{"s_uuid":6507,"chance":30,"overrides":{"buff_value":30}}}, desc: "召唤 {summon_count} 道飓风攻击前方敌人，每道飓风造成 {ap}%伤害，每道飓风释放时有<color=#3CE66E>20</color>% 概率增加全体队友<color=#3CE66E>20</color>% 攻速" },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":100,"summon_count":4,"proc_skill":{"s_uuid":6507,"chance":30,"overrides":{"buff_value":30,"TGroup": TGroup.Ally}}}, desc: "召唤 {summon_count} 道飓风攻击前方敌人，每道飓风造成 {ap}%伤害，每道飓风释放时有<color=#3CE66E>20</color>% 概率增加全体队友<color=#3CE66E>20</color>% 攻速" },
                 ],
             },
         },
@@ -893,9 +893,9 @@ export const HeroInfo: Record<number, heroInfo> = {
         ],
         info: "普攻 大招加速 buff+加速光环，加速大师",
     },
-    // 5013 反伤哥
+    // 5013 生命哥
     5013: {
-        uuid: 5013, name: "反伤哥", path: "hh2", fac: FacSet.HERO, rarity: 1, lv: 1, type: HType.Long, grow_type: HGrowType.Support, role: HRole.Support, hp: HERO_ROLE_BASE[HRole.Support].hp, ap: HERO_ROLE_BASE[HRole.Support].ap, def: HERO_ROLE_BASE[HRole.Support].def,
+        uuid: 5013, name: "生命哥", path: "hh2", fac: FacSet.HERO, rarity: 1, lv: 1, type: HType.Long, grow_type: HGrowType.Support, role: HRole.Support, hp: HERO_ROLE_BASE[HRole.Support].hp, ap: HERO_ROLE_BASE[HRole.Support].ap, def: HERO_ROLE_BASE[HRole.Support].def,
         skills: {
             6004: { uuid: 6004, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal].cd, ccd: 0,
                 lv_entries: [
@@ -941,7 +941,7 @@ export const HeroInfo: Record<number, heroInfo> = {
         bonus: [
             { lv: 12, attrs: {"hp":50}, name: "不屈战意", icon: "29-Endure", },
         ],
-        info: "",
+        info: "强闪避",
     },
     // 5015 毒箭猎手 — 毒伤持续流：普攻淬毒叠层+毒雨铺DoT+攻击光环喂养毒伤
     5015: {
@@ -949,13 +949,13 @@ export const HeroInfo: Record<number, heroInfo> = {
         skills: {
             6007: { uuid: 6007, name: "淬毒箭", lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal].cd, ccd: 0, overrides: {"ap":100}, desc: "射出箭矢，对{target}造成攻击力{ap}%伤害",
                 lv_entries: [
-                    { lv: 2, s_lv: SkillLv.Lv2, overrides: {"bck_chance":10}, desc: "普通攻击有{debuff_chance}%概率使目标中毒（每0.5秒受到{debuff_value}点伤害，持续{dur}秒）" },
+                    { lv: 2, s_lv: SkillLv.Lv2, overrides: {"bck_chance":10}, desc: "普通攻击有{bck_chance}%概率击退敌人" },
                 ],
             },
             6150: { uuid: 6150, name: "万箭齐发·毒", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":150,"timed_debuff_id":7005,"debuff_value":-30,"debuff_chance":50,"icon":"4-Apply-Poison"}, desc: "毒箭如雨，对{target}造成攻击力{ap}%伤害，{debuff_chance}%概率使目标中毒（每0.5秒受到{debuff_value}点伤害，持续{dur}秒）",
                 lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":200,"buff_value":-40,"buff_chance":60} },
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":200,"timed_debuff_id":7005,"debuff_value":-60,"debuff_chance":100,"debuff_duration":5} },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":250,"buff_value":-60,"buff_chance":80}, desc: "毒箭如雨，对{target}造成攻击力{ap}%伤害，{buff_chance}%概率使目标中毒（每0.5秒受到{buff_value}点伤害，持续{dur}秒），每支箭可命中{hit_count}个目标" },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":250,"timed_debuff_id":7005,"debuff_value":-100,"debuff_chance":100,"debuff_duration":7} },
                 ],
             },
         },
@@ -964,9 +964,6 @@ export const HeroInfo: Record<number, heroInfo> = {
                 { lv: 4, s_lv: SkillLv.Lv1, name: "蚀骨毒箭", t_num: 3, t_chance: 50, pity_add: 20, overrides: {"ap":80,"timed_debuff_id":7005,"debuff_value":40,"debuff_chance":100}, desc: "追加射出蚀骨毒箭，对{target}造成攻击力{ap}%伤害，必定使目标中毒（每0.5秒受到{debuff_value}点伤害，持续{dur}秒）" },
             ],
         },
-        field: [
-            { lv: 4, uuids: [{ uuid: 7002, value: 0.1, name: "淬毒磨砺" }] },
-        ],
         bonus: [
             { lv: 12, attrs: {"ap":50}, name: "剧毒淬炼", icon: "27-Hawkeye", },
         ],
@@ -1024,60 +1021,26 @@ export const HeroInfo: Record<number, heroInfo> = {
     5018: {
         uuid: 5018, name: "雷暴领主", path: "hm4", fac: FacSet.HERO, rarity: 1, lv: 1, type: HType.Long, grow_type: HGrowType.Mage, role: HRole.Mage, hp: HERO_ROLE_BASE[HRole.Mage].hp - 10, ap: HERO_ROLE_BASE[HRole.Mage].ap + 20, def: HERO_ROLE_BASE[HRole.Mage].def,
         skills: {
-            6009: { uuid: 6009, name: "雷霆弹", lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast].cd, ccd: 0, overrides: {"ap":100}, desc: "掷出雷霆弹，对{target}造成攻击力{ap}%伤害",
+            6013: { uuid: 6013, name: "召唤闪电", lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast].cd, ccd: 0, overrides: {"ap":100}, desc: "召唤闪电，对{target}造成攻击力{ap}%伤害",
                 lv_entries: [
                     { lv: 2, s_lv: SkillLv.Lv2, overrides: {"para":15}, desc: "普通攻击有{para}%概率麻痹敌人，减缓其技能冷却恢复" },
                 ],
             },
-            6203: { uuid: 6203, name: "雷霆裂空", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":200,"para":40}, desc: "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人",
+            6204: { uuid: 6204, name: "雷霆裂空", lv: 1, cd: UltCdSet[UltCdLv.Normal].cd, ccd: 0, overrides: {"ap":150,"para":50}, desc: "释放多束闪电，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人",
                 lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":250,"para":60}, desc: "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人" },
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":200,"para":70}, desc: "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人" },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":300,"para":80,"hit_count":3}, desc: "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，可多次命中，{para}%概率麻痹敌人" },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":250,"para":100}, desc: "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，可多次命中，{para}%概率麻痹敌人" },
                 ],
             },
         },
-        fstart: {
-            6203: [
-                { lv: 4, s_lv: SkillLv.Lv1, name: "雷击先手", t_num: 1, overrides: {"ap":150,"para":30,"icon":"100-Enchant-Magic"}, desc: "战斗开始释放雷击，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人" },
-            ],
-        },
         field: [
-            { lv: 4, uuids: [{ uuid: 7003, value: 10, name: "雷云领域" }] },
+            { lv: 4, uuids: [{ uuid: 7024, value: 10, name: "雷电精准" }] },
         ],
         bonus: [
             { lv: 12, attrs: {"ap":50}, name: "奥术共鸣", icon: "100-Enchant-Magic", },
         ],
         info: "雷暴爆发+麻痹控场，法系主C",
     },
-    // 5019 圣盾贤者 — 护盾反伤生存法：全队圣盾+荆棘反伤+受击荆棘
-    5019: {
-        uuid: 5019, name: "圣盾贤者", path: "hm5", fac: FacSet.HERO, rarity: 1, lv: 1, type: HType.Long, grow_type: HGrowType.Mage, role: HRole.Mage, hp: HERO_ROLE_BASE[HRole.Mage].hp + 20, ap: HERO_ROLE_BASE[HRole.Mage].ap - 5, def: HERO_ROLE_BASE[HRole.Mage].def + 5,
-        skills: {
-            6011: { uuid: 6011, name: "圣光飞瓶", lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal].cd, ccd: 0, overrides: {"ap":100}, desc: "掷出圣光飞瓶，对{target}造成攻击力{ap}%伤害",
-                lv_entries: [
-                    { lv: 2, s_lv: SkillLv.Lv2, overrides: {"proc_skill":{"s_uuid":6516,"chance":20,"overrides":{"timed_buff_id":7028,"buff_value":10}}}, desc: "普通攻击概率凝聚荆棘护体（受击时反弹{buff_value}%所受伤害，持续{dur}秒）" },
-                ],
-            },
-            6301: { uuid: 6301, name: "奥术圣壁", lv: 1, cd: UltCdSet[UltCdLv.VerySlow].cd, ccd: 0, overrides: {"TGroup": TGroup.Ally,"ap":20,"timed_buff_id":7027,"buff_value":10}, desc: "为全体友方施加生命最大值{ap}%的护盾，并附加荆棘（受击时反弹{buff_value}点伤害，持续{dur}秒）",
-                lv_entries: [
-                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":30,"buff_value":15}, desc: "为全体友方施加生命最大值{ap}%的护盾，并附加荆棘（受击时反弹{buff_value}点伤害，持续{dur}秒）" },
-                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":40,"buff_value":20}, desc: "为全体友方施加生命最大值{ap}%的护盾，并附加荆棘（受击时反弹{buff_value}点伤害，持续{dur}秒）" },
-                ],
-            },
-        },
-        atked: {
-            6516: [
-                { lv: 4, s_lv: SkillLv.Lv1, name: "荆棘回应", t_num: 3, overrides: {"timed_buff_id":7028,"buff_value":10,"icon":"75-Shield-Stun"}, desc: "凝聚荆棘护体，受击时反弹{buff_value}%所受伤害，持续{dur}秒" },
-            ],
-        },
-        field: [
-            { lv: 4, uuids: [{ uuid: 7022, value: 8, name: "荆棘领域" }] },
-        ],
-        bonus: [
-            { lv: 12, attrs: {"hp":50}, name: "守护之心", icon: "29-Endure", },
-        ],
-        info: "全队护盾+荆棘反伤，生存反击法",
-    },
 // @hero-setup:heroes-end
 
     /*
@@ -1157,9 +1120,9 @@ export const HeroInfo: Record<number, heroInfo> = {
 };
 
 export const HeroList: number[] = [
-    // 编辑器导出自动同步（共 19 个）
+    // 编辑器导出自动同步（共 18 个）
     5001, 5002, 5003, 5004, 5005, 5006, 5007, 5008, 5009, 5010,
-    5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019,
+    5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018,
 ];
 // @hero-setup:region-end
 
@@ -1179,48 +1142,48 @@ export interface HeroComboInfo {
 }
 
 /**
- * 推荐阵容表（几何王国复刻版 5001~5009）。
+ * 推荐阵容表（基于现役 5001~5018 英雄实际技能组）。
  * 设计原则：
- * 1. 铁三角结构：1 前排（坦克）+ 1 增益（光环/先手）+ 1 主C
+ * 1. 铁三角结构：heroes[0] 固定为近战前排（坦克/战士），其余按站位从近到远
- * 2. 乘区分散：攻击/暴击/暴伤各占独立乘区，组合优先覆盖不同乘区避免稀释
+ * 2. 乘区分散：攻击/攻速/暴击/穿透各占独立乘区，组合优先覆盖不同乘区避免稀释
- * 3. 发动机冗余：前排挨打/死亡触发增益，叠甲骑士（5005）死亡缠绕负责献祭点火
+ * 3. 主题唯一：每套阵容围绕一个流派关键词（暴击/控制/续航/破甲/光环/消耗）组队
  */
 export const HeroComboSet: Record<number, HeroComboInfo> = {
-    // 8001 暴击爆发流 — 暴击率与暴伤双乘区互不稀释，成型最强
+    // 8001 暴击爆发流 — 连珠神射暴击光环喂养双物理C，成型最强
     8001: {
         uuid: 8001, name: "暴击爆发流",
-        heroes: [5005, 5008, 5002],
+        heroes: [5001, 5016, 5004],
-        desc: "叠甲骑士前排抗伤叠甲，刀刀暴击的暴击光环与眩晕暴击哥的暴伤光环组成双乘区，双近战暴击爆发收割。",
+        desc: "叠甲骑士前排抗伤+受击叠防，连珠神射暴击光环覆盖全队并以极速箭雨压场，刀刀暴击近战收割残局。",
     },
-    // 8002 冰雷控制流 — 冰冻+击晕双控场，敌人出不了手
+    // 8002 冰雷控制流 — 击晕+冰冻+麻痹三控链，敌人出不了手
     8002: {
         uuid: 8002, name: "冰雷控制流",
-        heroes: [5007, 5004, 5001],
+        heroes: [5003, 5006, 5018],
-        desc: "微醺战神前排击退压场，冻住不谢冰冻链配合紫电魔女能量波击退击晕，击晕光环叠加，全场控制。",
+        desc: "眩晕暴击哥前排开山斧必晕压阵，冻箭哥寒冰箭冰冻链，雷暴领主雷霆麻痹迟滞技能，三控交替敌人难以出手。",
     },
-    // 8003 铁桶续航流 — 双防御前排+双治疗保血，最稳
+    // 8003 铁桶续航流 — 双坦克承伤+治疗保血，最稳
     8003: {
         uuid: 8003, name: "铁桶续航流",
-        heroes: [5005, 5009, 5006],
+        heroes: [5009, 5011, 5008],
-        desc: "叠甲骑士与铁壳斧弟双前排叠甲叠防，光明奶爸治疗+生命光环抬全队血线，专打持久消耗战。",
+        desc: "甲虫领主受击自疗顶前排，控血大师受击全队永久生命成长+大招生命爆发，团疗奶爸全体治疗+战后回复光环，专打持久战。",
     },
-    // 8004 先手爆发流 — 入场剑气先手+能量波跟进，短回合最强
+    // 8004 破甲压制流 — 破甲+减攻双减益，克制高防高攻阵容
     8004: {
-        uuid: 8004, name: "先手爆发流",
+        uuid: 8004, name: "破甲压制流",
-        heroes: [5003, 5001, 5008],
+        heroes: [5001, 5017, 5010],
-        desc: "格挡反杀入场500%剑气先手压血线，紫电魔女能量波击退跟进，眩晕暴击哥开山斧收割残局。",
+        desc: "碎甲术士普攻/大招双通道破甲+穿透光环放大物理伤害，火箭哥五箭弹幕必挂减攻削弱敌方输出，叠甲骑士前排兜底。",
     },
-    // 8005 破甲推进流 — 易伤放大全队伤害，克制高血Boss
+    // 8005 光环覆盖流 — 闪避/攻击/攻速三光环全覆盖
     8005: {
-        uuid: 8005, name: "破甲推进流",
+        uuid: 8005, name: "光环覆盖流",
-        heroes: [5007, 5006, 5002],
+        heroes: [5014, 5007, 5012],
-        desc: "微醺战神气斩易伤放大全队伤害，光明奶爸治疗保前排，刀刀暴击吃满易伤与自身暴击完成推进。",
+        desc: "闪避哥前排+闪避光环提升全队生存，击退火女攻击光环、疾风法师攻速光环持续放大全队输出，三光环增益拉满。",
     },
-    // 8006 光环覆盖流 — 攻击/暴击/暴伤/生命光环全覆盖
+    // 8006 易伤消耗流 — 易伤放大出血DoT，磨血收割
     8006: {
-        uuid: 8006, name: "光环覆盖流",
+        uuid: 8006, name: "易伤消耗流",
-        heroes: [5002, 5006, 5001],
+        heroes: [5002, 5005, 5008],
-        desc: "刀刀暴击暴击+暴伤双光环、紫电魔女攻击光环、光明奶爸生命光环，四光环全覆盖持续放大全队输出。",
+        desc: "易伤剑仙气斩+普攻双通道挂易伤放大全队伤害，出血贼普攻+大招叠出血磨血，团疗奶爸治疗保前排打消耗战。",
     },
 };
 

put/server/data/heroes.json

@@ -68,16 +68,16 @@
       ],
       "atking": {},
       "atked": {
-        "6302": [
+        "6412": [
           {
             "lv": 4,
             "s_lv": 1,
             "name": "",
             "t_num": 3,
             "overrides": {
-              "ap": 10
+              "ap": 1
             },
-            "desc": "有 {t_chance}% 的概率，治疗自己 {ap}%生命最大值",
+            "desc": "",
             "t_chance": 50,
             "pity_add": 20
           }
@@ -87,7 +87,7 @@
       "dead": {},
       "field": [],
       "revive": [],
-      "info": "自身强护盾+群体小护盾，强生存",
+      "info": "自身强护盾+防御强化",
       "bonus": [
         {
           "lv": 12,
@@ -144,10 +144,10 @@
           "cdExpr": "UltCdSet[UltCdLv.Normal].cd",
           "overrides": {
             "ap": 150,
-            "timed_buff_id": 7002,
+            "timed_debuff_id": 7002,
-            "buff_value": 20,
+            "debuff_value": -20,
-            "buff_chance": 100,
+            "debuff_chance": 100,
-            "buff_duration": 5
+            "debuff_duration": 5
           },
           "desc": "斩出气刃，对{target}造成攻击力{ap}%伤害，并使目标易伤（受到伤害加深，持续{dur}秒）",
           "lv_entries": [
@@ -156,10 +156,10 @@
               "s_lv": 2,
               "overrides": {
                 "ap": 200,
-                "timed_buff_id": 7002,
+                "timed_debuff_id": 7002,
-                "buff_value": 30,
+                "debuff_value": -50,
-                "buff_chance": 100,
+                "debuff_chance": 100,
-                "buff_duration": 7
+                "debuff_duration": 5
               },
               "desc": ""
             },
@@ -168,10 +168,10 @@
               "s_lv": 3,
               "overrides": {
                 "ap": 250,
-                "timed_buff_id": 7002,
+                "timed_debuff_id": 7002,
-                "buff_value": 50,
+                "debuff_value": -70,
-                "buff_chance": 100,
+                "debuff_chance": 100,
-                "buff_duration": 9
+                "debuff_duration": 7
               },
               "desc": ""
             }
@@ -186,10 +186,10 @@
             "name": "",
             "t_num": 3,
             "overrides": {
-              "timed_buff_id": 7002,
+              "timed_debuff_id": 7002,
-              "buff_value": 10,
+              "debuff_value": -10,
-              "buff_chance": 100,
+              "debuff_chance": 100,
-              "buff_duration": 5
+              "debuff_duration": 5
             },
             "desc": "",
             "t_chance": 50,
@@ -202,7 +202,7 @@
       "dead": {},
       "field": [],
       "revive": [],
-      "info": "易伤+风怒，近战 dps",
+      "info": "易伤，近战 dps",
       "bonus": [
         {
           "lv": 12,
@@ -294,7 +294,7 @@
             "overrides": {
               "buff_value": 30
             },
-            "desc": "{t_chance}% 概率提升普通攻击 30%击晕概率5秒",
+            "desc": "{t_chance}% 概率提升普通攻击 30%暴击率5秒",
             "t_chance": 50,
             "pity_add": 20
           }
@@ -1012,7 +1012,10 @@
           "overrides": {
             "ap": 70,
             "summon_count": 5,
-            "crt": 50
+            "timed_debuff_id": 7006,
+            "debuff_value": -10,
+            "debuff_chance": 100,
+            "debuff_duration": 5
           },
           "desc": "",
           "lv_entries": [
@@ -1021,7 +1024,10 @@
               "s_lv": 2,
               "overrides": {
                 "ap": 80,
-                "crt": 60
+                "timed_debuff_id": 7006,
+                "debuff_value": -20,
+                "debuff_chance": 100,
+                "debuff_duration": 5
               },
               "desc": ""
             },
@@ -1030,7 +1036,10 @@
               "s_lv": 3,
               "overrides": {
                 "ap": 100,
-                "crt": 70
+                "timed_debuff_id": 7006,
+                "debuff_value": -30,
+                "debuff_chance": 100,
+                "debuff_duration": 5
               },
               "desc": ""
             }
@@ -1045,8 +1054,7 @@
             "name": "",
             "t_num": 3,
             "overrides": {
-              "ap": 120,
+              "ap": 120
-              "crt": 50
             },
             "desc": "",
             "t_chance": 50,
@@ -1104,7 +1112,8 @@
                   "s_uuid": 6502,
                   "chance": 10,
                   "overrides": {
-                    "ap": 5
+                    "ap": 5,
+                    "TGroup": "Self"
                   }
                 }
               },
@@ -1113,33 +1122,45 @@
           ]
         },
         {
-          "uuid": 6517,
+          "uuid": 6103,
-          "name": "生命爆发",
+          "name": "闪电战",
           "cd": 10,
           "cdExpr": "UltCdSet[UltCdLv.VerySlow].cd",
           "overrides": {
+            "ap": 200,
+            "timed_buff_id": 7029,
             "buff_value": 30,
-            "buff_duration": 10
+            "buff_chance": 100,
+            "buff_duration": 5,
+            "buff_target": 1
           },
-          "desc": "全体友方最大生命值提升{buff_value}%，持续{dur}秒",
+          "desc": "对前方达人造成 200% 伤害，并提升自己最大生命值提升{buff_value}%，持续{dur}秒",
           "lv_entries": [
             {
               "lv": 8,
               "s_lv": 2,
               "overrides": {
+                "ap": 250,
+                "timed_buff_id": 7029,
                 "buff_value": 40,
-                "buff_duration": 10
+                "buff_chance": 100,
+                "buff_duration": 5,
+                "buff_target": 1
               },
-              "desc": "全体友方最大生命值提升{buff_value}%，持续{dur}秒"
+              "desc": ""
             },
             {
               "lv": 16,
               "s_lv": 3,
               "overrides": {
+                "ap": 300,
+                "timed_buff_id": 7029,
                 "buff_value": 50,
-                "buff_duration": 15
+                "buff_chance": 100,
+                "buff_duration": 5,
+                "buff_target": 1
               },
-              "desc": "全体友方最大生命值提升{buff_value}%，持续{dur}秒"
+              "desc": ""
             }
           ]
         }
@@ -1157,7 +1178,9 @@
               "TGroup": "Ally",
               "hit_count": 3
             },
-            "desc": "全队永久增加 1% 生命最大值"
+            "desc": "全队永久增加 1% 生命最大值",
+            "t_chance": 30,
+            "pity_add": 15
           }
         ]
       },
@@ -1231,7 +1254,8 @@
               "s_uuid": 6507,
               "chance": 20,
               "overrides": {
-                "buff_value": 20
+                "buff_value": 20,
+                "TGroup": "Ally"
               }
             }
           },
@@ -1247,7 +1271,8 @@
                   "s_uuid": 6507,
                   "chance": 25,
                   "overrides": {
-                    "buff_value": 25
+                    "buff_value": 25,
+                    "TGroup": "Ally"
                   }
                 }
               },
@@ -1263,7 +1288,8 @@
                   "s_uuid": 6507,
                   "chance": 30,
                   "overrides": {
-                    "buff_value": 30
+                    "buff_value": 30,
+                    "TGroup": "Ally"
                   }
                 }
               },
@@ -1304,7 +1330,7 @@
     },
     {
       "uuid": 5013,
-      "name": "反伤哥",
+      "name": "生命哥",
       "comment": "",
       "path": "hh2",
       "rarity": 1,
@@ -1498,7 +1524,7 @@
           "desc": ""
         }
       ],
-      "info": "",
+      "info": "强闪避",
       "bonus": [
         {
           "lv": 12,
@@ -1546,7 +1572,7 @@
               "overrides": {
                 "bck_chance": 10
               },
-              "desc": "普通攻击有{debuff_chance}%概率使目标中毒（每0.5秒受到{debuff_value}点伤害，持续{dur}秒）"
+              "desc": "普通攻击有{bck_chance}%概率击退敌人"
             }
           ]
         },
@@ -1569,8 +1595,10 @@
               "s_lv": 2,
               "overrides": {
                 "ap": 200,
-                "buff_value": -40,
+                "timed_debuff_id": 7005,
-                "buff_chance": 60
+                "debuff_value": -60,
+                "debuff_chance": 100,
+                "debuff_duration": 5
               },
               "desc": ""
             },
@@ -1579,10 +1607,12 @@
               "s_lv": 3,
               "overrides": {
                 "ap": 250,
-                "buff_value": -60,
+                "timed_debuff_id": 7005,
-                "buff_chance": 80
+                "debuff_value": -100,
+                "debuff_chance": 100,
+                "debuff_duration": 7
               },
-              "desc": "毒箭如雨，对{target}造成攻击力{ap}%伤害，{buff_chance}%概率使目标中毒（每0.5秒受到{buff_value}点伤害，持续{dur}秒），每支箭可命中{hit_count}个目标"
+              "desc": ""
             }
           ]
         }
@@ -1609,19 +1639,7 @@
       "atked": {},
       "fstart": {},
       "dead": {},
-      "field": [
+      "field": [],
-        {
-          "lv": 4,
-          "uuids": [
-            {
-              "uuid": 7002,
-              "value": 0.1,
-              "name": "淬毒磨砺"
-            }
-          ],
-          "desc": ""
-        }
-      ],
       "info": "淬毒普攻+毒雨叠层，持续消耗型远程毒C",
       "bonus": [
         {
@@ -1876,14 +1894,14 @@
       "accuracy": null,
       "skills": [
         {
-          "uuid": 6009,
+          "uuid": 6013,
-          "name": "雷霆弹",
+          "name": "召唤闪电",
           "cd": 0.9,
           "cdExpr": "AtkSpeedSet[AtkSpeedLv.Fast].cd",
           "overrides": {
             "ap": 100
           },
-          "desc": "掷出雷霆弹，对{target}造成攻击力{ap}%伤害",
+          "desc": "召唤闪电，对{target}造成攻击力{ap}%伤害",
           "lv_entries": [
             {
               "lv": 2,
@@ -1896,22 +1914,22 @@
           ]
         },
         {
-          "uuid": 6203,
+          "uuid": 6204,
           "name": "雷霆裂空",
           "cd": 8,
           "cdExpr": "UltCdSet[UltCdLv.Normal].cd",
           "overrides": {
-            "ap": 200,
+            "ap": 150,
-            "para": 40
+            "para": 50
           },
-          "desc": "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人",
+          "desc": "释放多束闪电，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人",
           "lv_entries": [
             {
               "lv": 8,
               "s_lv": 2,
               "overrides": {
-                "ap": 250,
+                "ap": 200,
-                "para": 60
+                "para": 70
               },
               "desc": "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人"
             },
@@ -1919,9 +1937,8 @@
               "lv": 16,
               "s_lv": 3,
               "overrides": {
-                "ap": 300,
+                "ap": 250,
-                "para": 80,
+                "para": 100
-                "hit_count": 3
               },
               "desc": "释放雷霆裂空波，对{target}造成攻击力{ap}%伤害，可多次命中，{para}%概率麻痹敌人"
             }
@@ -1930,31 +1947,16 @@
       ],
       "atking": {},
       "atked": {},
-      "fstart": {
+      "fstart": {},
-        "6203": [
-          {
-            "lv": 4,
-            "s_lv": 1,
-            "name": "雷击先手",
-            "t_num": 1,
-            "overrides": {
-              "ap": 150,
-              "para": 30,
-              "icon": "100-Enchant-Magic"
-            },
-            "desc": "战斗开始释放雷击，对{target}造成攻击力{ap}%伤害，{para}%概率麻痹敌人"
-          }
-        ]
-      },
       "dead": {},
       "field": [
         {
           "lv": 4,
           "uuids": [
             {
-              "uuid": 7003,
+              "uuid": 7024,
               "value": 10,
-              "name": "雷云领域"
+              "name": "雷电精准"
             }
           ],
           "desc": ""
@@ -1972,131 +1974,6 @@
         }
       ],
       "fend": {}
-    },
-    {
-      "uuid": 5019,
-      "name": "圣盾贤者",
-      "comment": "护盾反伤生存法：全队圣盾+荆棘反伤+受击荆棘",
-      "path": "hm5",
-      "rarity": 1,
-      "roleKey": "Mage",
-      "growKey": "Mage",
-      "typeKey": "Long",
-      "statBase": {
-        "hp": 20,
-        "ap": -5,
-        "def": 5
-      },
-      "dis": null,
-      "speed": null,
-      "dodge": null,
-      "accuracy": null,
-      "skills": [
-        {
-          "uuid": 6011,
-          "name": "圣光飞瓶",
-          "cd": 1.05,
-          "cdExpr": "AtkSpeedSet[AtkSpeedLv.Normal].cd",
-          "overrides": {
-            "ap": 100
-          },
-          "desc": "掷出圣光飞瓶，对{target}造成攻击力{ap}%伤害",
-          "lv_entries": [
-            {
-              "lv": 2,
-              "s_lv": 2,
-              "overrides": {
-                "proc_skill": {
-                  "s_uuid": 6516,
-                  "chance": 20,
-                  "overrides": {
-                    "timed_buff_id": 7028,
-                    "buff_value": 10
-                  }
-                }
-              },
-              "desc": "普通攻击概率凝聚荆棘护体（受击时反弹{buff_value}%所受伤害，持续{dur}秒）"
-            }
-          ]
-        },
-        {
-          "uuid": 6301,
-          "name": "奥术圣壁",
-          "cd": 10,
-          "cdExpr": "UltCdSet[UltCdLv.VerySlow].cd",
-          "overrides": {
-            "TGroup": "Ally",
-            "ap": 20,
-            "timed_buff_id": 7027,
-            "buff_value": 10
-          },
-          "desc": "为全体友方施加生命最大值{ap}%的护盾，并附加荆棘（受击时反弹{buff_value}点伤害，持续{dur}秒）",
-          "lv_entries": [
-            {
-              "lv": 8,
-              "s_lv": 2,
-              "overrides": {
-                "ap": 30,
-                "buff_value": 15
-              },
-              "desc": "为全体友方施加生命最大值{ap}%的护盾，并附加荆棘（受击时反弹{buff_value}点伤害，持续{dur}秒）"
-            },
-            {
-              "lv": 16,
-              "s_lv": 3,
-              "overrides": {
-                "ap": 40,
-                "buff_value": 20
-              },
-              "desc": "为全体友方施加生命最大值{ap}%的护盾，并附加荆棘（受击时反弹{buff_value}点伤害，持续{dur}秒）"
-            }
-          ]
-        }
-      ],
-      "atking": {},
-      "atked": {
-        "6516": [
-          {
-            "lv": 4,
-            "s_lv": 1,
-            "name": "荆棘回应",
-            "t_num": 3,
-            "overrides": {
-              "timed_buff_id": 7028,
-              "buff_value": 10,
-              "icon": "75-Shield-Stun"
-            },
-            "desc": "凝聚荆棘护体，受击时反弹{buff_value}%所受伤害，持续{dur}秒"
-          }
-        ]
-      },
-      "fstart": {},
-      "dead": {},
-      "field": [
-        {
-          "lv": 4,
-          "uuids": [
-            {
-              "uuid": 7022,
-              "value": 8,
-              "name": "荆棘领域"
-            }
-          ],
-          "desc": ""
-        }
-      ],
-      "info": "全队护盾+荆棘反伤，生存反击法",
-      "bonus": [
-        {
-          "lv": 12,
-          "attrs": {
-            "hp": 50
-          },
-          "name": "守护之心",
-          "icon": "29-Endure"
-        }
-      ],
-      "fend": {}
     }
   ]
 }

put/web/src/constants.js

@@ -46,8 +46,8 @@ export const ROLE_ATK_SKILL = {
   Warrior: [6004],
   Assassin: [6001, 6002, 6003, 6004],
   Archer: [6004, 6006, 6007, 6008],
-  Mage: [6009, 6010, 6011, 6012],
+  Mage: [6009, 6010, 6011, 6012, 6013, 6014, 6015],
-  Support: [6004, 6009, 6010, 6011, 6012],
+  Support: [6004, 6009, 6010, 6011, 6012, 6013, 6014, 6015],
 }
 
 // 按职业映射大招底座