技能继续重构

2025-10-19 23:46:18 +08:00
parent 2ff7aab7c2
commit 8d9c7bbe0d
34 changed files with 441 additions and 660 deletions
--- a/assets/resources/game/heros/ha1.prefab
+++ b/assets/resources/game/heros/ha1.prefab
@@ -739,7 +739,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -771,8 +771,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/ha2.prefab
+++ b/assets/resources/game/heros/ha2.prefab
@@ -699,7 +699,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -731,8 +731,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/ha3.prefab
+++ b/assets/resources/game/heros/ha3.prefab
@@ -699,7 +699,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -731,8 +731,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/hc1.prefab
+++ b/assets/resources/game/heros/hc1.prefab
@@ -699,7 +699,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -731,8 +731,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/hk1.prefab
+++ b/assets/resources/game/heros/hk1.prefab
@@ -696,7 +696,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -728,8 +728,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/hmf1.prefab
+++ b/assets/resources/game/heros/hmf1.prefab
@@ -699,7 +699,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -731,8 +731,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/hmh1.prefab
+++ b/assets/resources/game/heros/hmh1.prefab
@@ -563,7 +563,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -595,8 +595,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/mo1.prefab
+++ b/assets/resources/game/heros/mo1.prefab
@@ -519,7 +519,7 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": -0.057,
+      "x": 5,
      "y": -39.46,
      "z": 0
    }
@@ -563,7 +563,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -595,8 +595,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/heros/mo3.prefab
+++ b/assets/resources/game/heros/mo3.prefab
@@ -516,7 +516,7 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": -0.057,
+      "x": 5,
      "y": -39.46,
      "z": 0
    }
@@ -560,7 +560,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": false
+    "value": true
  },
  {
    "__type__": "CCPropertyOverrideInfo",
@@ -592,8 +592,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 1.2,
-      "y": 1.1,
+      "x": 1.3,
+      "y": 1.3,
      "z": 1
    }
  },
--- a/assets/resources/game/map/map_rpg.prefab
+++ b/assets/resources/game/map/map_rpg.prefab
@@ -27,18 +27,18 @@
    ],
    "_active": true,
    "_components": [
+      {
+        "__id__": 224
+      },
      {
        "__id__": 226
      },
      {
        "__id__": 228
-      },
-      {
-        "__id__": 230
      }
    ],
    "_prefab": {
-      "__id__": 232
+      "__id__": 230
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -196,18 +196,18 @@
    ],
    "_active": true,
    "_components": [
+      {
+        "__id__": 217
+      },
      {
        "__id__": 219
      },
      {
        "__id__": 221
-      },
-      {
-        "__id__": 223
      }
    ],
    "_prefab": {
-      "__id__": 225
+      "__id__": 223
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -251,23 +251,23 @@
        "__id__": 8
      },
      {
-        "__id__": 164
+        "__id__": 162
      },
      {
-        "__id__": 168
+        "__id__": 166
      },
      {
-        "__id__": 174
+        "__id__": 172
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 216
+        "__id__": 214
      }
    ],
    "_prefab": {
-      "__id__": 218
+      "__id__": 216
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -321,7 +321,7 @@
      }
    ],
    "_prefab": {
-      "__id__": 163
+      "__id__": 161
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -452,7 +452,7 @@
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 0,
-      "y": 1.436,
+      "y": 51.436,
      "z": 0
    },
    "_lrot": {
@@ -3458,7 +3458,7 @@
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": -26.004,
-      "y": 9.06,
+      "y": 59.06,
      "z": 0
    },
    "_lrot": {
@@ -3607,6 +3607,8 @@
      "__id__": 0
    },
    "fileId": "c4IqMKgXNExa5w4EAciRxE",
+    "instance": null,
+    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
  },
  {
@@ -3649,58 +3651,13 @@
    "__prefab": {
      "__id__": 160
    },
-    "bgImg": {
-      "__id__": 161
-    },
+    "bgImg": null,
    "_id": ""
  },
  {
    "__type__": "cc.CompPrefabInfo",
    "fileId": "463tPWLuVLS5+4BU5ZkZyJ"
  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": null,
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 162
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__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": null,
-    "_id": "a9O91cLlJGoY5y1TC9zgB9"
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "20UGQn4U9GUoln0NJQTkbG"
-  },
  {
    "__type__": "cc.PrefabInfo",
    "root": {
@@ -3726,11 +3683,11 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 165
+        "__id__": 163
      }
    ],
    "_prefab": {
-      "__id__": 167
+      "__id__": 165
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -3767,11 +3724,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 164
+      "__id__": 162
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 166
+      "__id__": 164
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -3814,14 +3771,14 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 169
+        "__id__": 167
      },
      {
-        "__id__": 171
+        "__id__": 169
      }
    ],
    "_prefab": {
-      "__id__": 173
+      "__id__": 171
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -3858,11 +3815,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 168
+      "__id__": 166
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 170
+      "__id__": 168
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -3886,11 +3843,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 168
+      "__id__": 166
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 172
+      "__id__": 170
    },
    "_id": ""
  },
@@ -3921,35 +3878,35 @@
    },
    "_children": [
      {
-        "__id__": 175
+        "__id__": 173
      },
      {
-        "__id__": 181
+        "__id__": 179
      },
      {
-        "__id__": 187
+        "__id__": 185
      },
      {
-        "__id__": 193
+        "__id__": 191
      },
      {
-        "__id__": 199
+        "__id__": 197
      },
      {
-        "__id__": 205
+        "__id__": 203
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 211
+        "__id__": 209
      },
      {
-        "__id__": 213
+        "__id__": 211
      }
    ],
    "_prefab": {
-      "__id__": 215
+      "__id__": 213
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -3986,25 +3943,25 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 174
+      "__id__": 172
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 176
+        "__id__": 174
      },
      {
-        "__id__": 178
+        "__id__": 176
      }
    ],
    "_prefab": {
-      "__id__": 180
+      "__id__": 178
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 110.616,
-      "y": -18.025,
+      "y": 82.431,
      "z": 0
    },
    "_lrot": {
@@ -4036,11 +3993,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 175
+      "__id__": 173
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 177
+      "__id__": 175
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4064,11 +4021,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 175
+      "__id__": 173
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 179
+      "__id__": 177
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -4122,25 +4079,25 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 174
+      "__id__": 172
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 182
+        "__id__": 180
      },
      {
-        "__id__": 184
+        "__id__": 182
      }
    ],
    "_prefab": {
-      "__id__": 186
+      "__id__": 184
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": -134.722,
-      "y": -18.025,
+      "y": 82.431,
      "z": 0
    },
    "_lrot": {
@@ -4172,11 +4129,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 181
+      "__id__": 179
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 183
+      "__id__": 181
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4200,11 +4157,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 181
+      "__id__": 179
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 185
+      "__id__": 183
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -4258,25 +4215,25 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 174
+      "__id__": 172
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 188
+        "__id__": 186
      },
      {
-        "__id__": 190
+        "__id__": 188
      }
    ],
    "_prefab": {
-      "__id__": 192
+      "__id__": 190
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": -245.406,
-      "y": -18.025,
+      "y": 82.431,
      "z": 0
    },
    "_lrot": {
@@ -4308,11 +4265,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 187
+      "__id__": 185
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 189
+      "__id__": 187
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4336,11 +4293,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 187
+      "__id__": 185
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 191
+      "__id__": 189
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -4394,25 +4351,25 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 174
+      "__id__": 172
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 194
+        "__id__": 192
      },
      {
-        "__id__": 196
+        "__id__": 194
      }
    ],
    "_prefab": {
-      "__id__": 198
+      "__id__": 196
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 312.578,
-      "y": -18.025,
+      "y": 82.431,
      "z": 0
    },
    "_lrot": {
@@ -4444,11 +4401,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 193
+      "__id__": 191
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 195
+      "__id__": 193
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4472,11 +4429,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 193
+      "__id__": 191
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 197
+      "__id__": 195
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -4530,25 +4487,25 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 174
+      "__id__": 172
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 200
+        "__id__": 198
      },
      {
-        "__id__": 202
+        "__id__": 200
      }
    ],
    "_prefab": {
-      "__id__": 204
+      "__id__": 202
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": -340.809,
-      "y": -18.025,
+      "y": 82.431,
      "z": 0
    },
    "_lrot": {
@@ -4580,11 +4537,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 199
+      "__id__": 197
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 201
+      "__id__": 199
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4608,11 +4565,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 199
+      "__id__": 197
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 203
+      "__id__": 201
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -4666,25 +4623,25 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 174
+      "__id__": 172
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 206
+        "__id__": 204
      },
      {
-        "__id__": 208
+        "__id__": 206
      }
    ],
    "_prefab": {
-      "__id__": 210
+      "__id__": 208
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 323.966,
-      "y": -18.025,
+      "y": 82.431,
      "z": 0
    },
    "_lrot": {
@@ -4716,11 +4673,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 205
+      "__id__": 203
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 207
+      "__id__": 205
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4744,11 +4701,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 205
+      "__id__": 203
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 209
+      "__id__": 207
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -4802,11 +4759,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 174
+      "__id__": 172
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 212
+      "__id__": 210
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4830,11 +4787,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 174
+      "__id__": 172
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 214
+      "__id__": 212
    },
    "light": null,
    "_id": ""
@@ -4866,7 +4823,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 217
+      "__id__": 215
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4907,7 +4864,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 220
+      "__id__": 218
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4935,7 +4892,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 222
+      "__id__": 220
    },
    "camera": {
      "__id__": 3
@@ -4947,13 +4904,13 @@
      "__id__": 159
    },
    "floorLayer": {
-      "__id__": 164
+      "__id__": 162
    },
    "entityLayer": {
-      "__id__": 171
+      "__id__": 169
    },
    "SkillLayer": {
-      "__id__": 213
+      "__id__": 211
    },
    "isFollowPlayer": true,
    "_id": ""
@@ -4972,7 +4929,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 224
+      "__id__": 222
    },
    "_id": ""
  },
@@ -5003,7 +4960,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 227
+      "__id__": 225
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -5031,7 +4988,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 229
+      "__id__": 227
    },
    "_cameraComponent": {
      "__id__": 3
@@ -5053,7 +5010,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 231
+      "__id__": 229
    },
    "_alignFlags": 45,
    "_target": null,
--- a/assets/resources/game/skill/anm/dun1.anim
+++ b/assets/resources/game/skill/anm/dun1.anim
@@ -0,0 +1,108 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "dun1",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 12,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.5833333333333334,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 6
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.08333333333333333,
+      0.16666666666666666,
+      0.25,
+      0.3333333333333333,
+      0.4166666666666667,
+      0.5
+    ],
+    "_values": [
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@da16f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@1b0a7",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@d07ee",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@6f94d",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@88811",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3d54b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@9630b",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]
--- a/assets/resources/game/skill/anm/dun1.anim.meta
+++ b/assets/resources/game/skill/anm/dun1.anim.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "ee70aa99-524a-4521-bae6-c156881ee3d1",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "dun1"
+  }
+}
--- a/assets/resources/game/skill/anm/shielded.anim
+++ b/assets/resources/game/skill/anm/shielded.anim
@@ -0,0 +1,115 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "shielded",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 18,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.3888888888888889,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 7
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "skill"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.05555555555555555,
+      0.1111111111111111,
+      0.16666666666666666,
+      0.2222222222222222,
+      0.2777777777777778,
+      0.3333333333333333
+    ],
+    "_values": [
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@da16f",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@1b0a7",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@d07ee",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@6f94d",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@88811",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@3d54b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@9630b",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]
--- a/assets/resources/game/skills/buff/shielded.anim.meta
+++ b/assets/resources/game/skills/buff/shielded.anim.meta
--- a/assets/resources/game/skill/boom.meta
+++ b/assets/resources/game/skill/boom.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "ac56cd3e-ed47-4d94-afb3-5ea23d5f3a0e",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/assets/resources/game/skill/boom/atked.prefab
+++ b/assets/resources/game/skill/boom/atked.prefab
--- a/assets/resources/game/skill/boom/atked.prefab.meta
+++ b/assets/resources/game/skill/boom/atked.prefab.meta
--- a/assets/resources/game/skill/boom/atked_red.prefab
+++ b/assets/resources/game/skill/boom/atked_red.prefab
--- a/assets/resources/game/skill/boom/atked_red.prefab.meta
+++ b/assets/resources/game/skill/boom/atked_red.prefab.meta
--- a/assets/resources/game/skill/prefab/boom1.prefab
+++ b/assets/resources/game/skill/prefab/boom1.prefab
--- a/assets/resources/game/skill/prefab/boom1.prefab.meta
+++ b/assets/resources/game/skill/prefab/boom1.prefab.meta
--- a/assets/resources/game/skills/buff/shielded.anim
+++ b/assets/resources/game/skills/buff/shielded.anim
@@ -1,247 +0,0 @@
-[
-  {
-    "__type__": "cc.AnimationClip",
-    "_name": "shielded",
-    "_objFlags": 0,
-    "__editorExtras__": {
-      "embeddedPlayerGroups": []
-    },
-    "_native": "",
-    "sample": 24,
-    "speed": 1,
-    "wrapMode": 2,
-    "enableTrsBlending": false,
-    "_duration": 0.5833333333333334,
-    "_hash": 500763545,
-    "_tracks": [
-      {
-        "__id__": 1
-      }
-    ],
-    "_exoticAnimation": null,
-    "_events": [],
-    "_embeddedPlayers": [],
-    "_additiveSettings": {
-      "__id__": 12
-    },
-    "_auxiliaryCurveEntries": []
-  },
-  {
-    "__type__": "cc.animation.VectorTrack",
-    "_binding": {
-      "__type__": "cc.animation.TrackBinding",
-      "path": {
-        "__id__": 2
-      },
-      "proxy": null
-    },
-    "_channels": [
-      {
-        "__id__": 4
-      },
-      {
-        "__id__": 6
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "_nComponents": 3
-  },
-  {
-    "__type__": "cc.animation.TrackPath",
-    "_paths": [
-      {
-        "__id__": 3
-      },
-      "scale"
-    ]
-  },
-  {
-    "__type__": "cc.animation.HierarchyPath",
-    "path": "skill/dun"
-  },
-  {
-    "__type__": "cc.animation.Channel",
-    "_curve": {
-      "__id__": 5
-    }
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      0.2916666567325592,
-      0.5833333134651184
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1.2000000476837158,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.animation.Channel",
-    "_curve": {
-      "__id__": 7
-    }
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      0.2916666567325592,
-      0.5833333134651184
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1.100000023841858,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1.2000000476837158,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1.100000023841858,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.animation.Channel",
-    "_curve": {
-      "__id__": 9
-    }
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [
-      0,
-      0.2916666567325592,
-      0.5833333134651184
-    ],
-    "_values": [
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      },
-      {
-        "__type__": "cc.RealKeyframeValue",
-        "interpolationMode": 0,
-        "tangentWeightMode": 0,
-        "value": 1,
-        "rightTangent": 0,
-        "rightTangentWeight": 1,
-        "leftTangent": 0,
-        "leftTangentWeight": 1,
-        "easingMethod": 0,
-        "__editorExtras__": null
-      }
-    ],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.animation.Channel",
-    "_curve": {
-      "__id__": 11
-    }
-  },
-  {
-    "__type__": "cc.RealCurve",
-    "_times": [],
-    "_values": [],
-    "preExtrapolation": 1,
-    "postExtrapolation": 1
-  },
-  {
-    "__type__": "cc.AnimationClipAdditiveSettings",
-    "enabled": false,
-    "refClip": null
-  }
-]
--- a/assets/resources/game/skills/shielded.prefab
+++ b/assets/resources/game/skills/shielded.prefab
@@ -25,14 +25,14 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 14
+        "__id__": 8
      },
      {
-        "__id__": 16
+        "__id__": 10
      }
    ],
    "_prefab": {
-      "__id__": 18
+      "__id__": 12
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -71,27 +71,23 @@
    "_parent": {
      "__id__": 1
    },
-    "_children": [
-      {
-        "__id__": 3
-      }
-    ],
+    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 9
+        "__id__": 3
      },
      {
-        "__id__": 11
+        "__id__": 5
      }
    ],
    "_prefab": {
-      "__id__": 13
+      "__id__": 7
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 0,
-      "y": 15,
+      "y": 10,
      "z": 0
    },
    "_lrot": {
@@ -117,142 +113,6 @@
    },
    "_id": ""
  },
-  {
-    "__type__": "cc.Node",
-    "_name": "dun",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 4
-      },
-      {
-        "__id__": 6
-      }
-    ],
-    "_prefab": {
-      "__id__": 8
-    },
-    "_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.1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 5
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 86,
-      "height": 84
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3bUbh0xIxD3bWsgoihHHMi"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 7
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 19,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@bbb42",
-      "__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": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "01YAunEG9INZKk02SQk8jM"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "a00GJBc2xG2pmgSQAt0tvL",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
  {
    "__type__": "cc.UITransform",
    "_name": "",
@@ -263,12 +123,12 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 10
+      "__id__": 4
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 80,
-      "height": 100
+      "width": 96,
+      "height": 96
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -289,9 +149,9 @@
    "node": {
      "__id__": 2
    },
-    "_enabled": false,
+    "_enabled": true,
    "__prefab": {
-      "__id__": 12
+      "__id__": 6
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -303,10 +163,13 @@
      "b": 255,
      "a": 206
    },
-    "_spriteFrame": null,
-    "_type": 3,
+    "_spriteFrame": {
+      "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc@da16f",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
    "_fillType": 1,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
    "_fillCenter": {
      "__type__": "cc.Vec2",
      "x": 0,
@@ -316,7 +179,10 @@
    "_fillRange": 1,
    "_isTrimmedMode": true,
    "_useGrayscale": false,
-    "_atlas": null,
+    "_atlas": {
+      "__uuid__": "56a24460-ef67-4aa0-a3f7-fad4007046dc",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
    "_id": ""
  },
  {
@@ -346,7 +212,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 15
+      "__id__": 9
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -374,7 +240,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 17
+      "__id__": 11
    },
    "playOnLoad": true,
    "_clips": [
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -1320,7 +1320,7 @@
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 0,
-      "y": 301,
+      "y": 351,
      "z": 0
    },
    "_lrot": {
@@ -1414,7 +1414,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 718,
-      "height": 600
+      "height": 700
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -3990,7 +3990,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 718,
-      "height": 600
+      "height": 700
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -5607,7 +5607,7 @@
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 0,
-      "y": 700,
+      "y": 800,
      "z": 0
    },
    "_lrot": {
@@ -6388,7 +6388,7 @@
    "_top": 460.8,
    "_bottom": 450,
    "_horizontalCenter": 0,
-    "_verticalCenter": 60,
+    "_verticalCenter": 160,
    "_isAbsLeft": true,
    "_isAbsRight": true,
    "_isAbsTop": true,
@@ -7619,10 +7619,10 @@
      "b": 255,
      "a": 255
    },
-    "_string": "999999",
+    "_string": "{{0}}",
    "_horizontalAlign": 1,
    "_verticalAlign": 1,
-    "_actualFontSize": 23,
+    "_actualFontSize": 25,
    "_fontSize": 25,
    "_fontFamily": "Arial",
    "_lineHeight": 35,
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -320,22 +320,22 @@ export const SkillSet: Record<number, SkillConfig> = {
        buffs:[],debuffs:[],info:"向最前方敌人释放箭矢,造成100%攻击的伤害"
    },
    6004: {
-        uuid:6004,name:"冰球",sp_name:"am_ice",AtkedType:AtkedType.ice,path:"3034",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6004,name:"冰球",sp_name:"am_ice",AtkedType:AtkedType.atked,path:"3034",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:1,hitcd:3,speed:720,cost:10,with:0,
        buffs:[],debuffs:[],info:"向最前方敌人释放寒冰弹,造成100%攻击的伤害"
    },
    6005: {
-        uuid:6005,name:"火球术",sp_name:"atk_fires",AtkedType:AtkedType.fire,path:"3039",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6005,name:"火球术",sp_name:"atk_fires",AtkedType:AtkedType.atked,path:"3039",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:2,hitcd:0.3,speed:720,cost:20,with:90,
        buffs:[],debuffs:[],info:"召唤大火球攻击前方所有敌人,造成300%攻击的伤害,有一定几率施加灼烧"
    },
    6006: {
-        uuid:6006,name:"能量波",sp_name:"am_blue",AtkedType:AtkedType.ice,path:"3034",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6006,name:"能量波",sp_name:"am_blue",AtkedType:AtkedType.atked,path:"3034",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:1,hitcd:3,speed:720,cost:10,with:0,
        buffs:[],debuffs:[],info:"向最前方敌人释放寒冰弹,造成100%攻击的伤害"
    },
    6007: {
-        uuid:6007,name:"圣光波",sp_name:"am_yellow",AtkedType:AtkedType.fire,path:"3039",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6007,name:"圣光波",sp_name:"am_yellow",AtkedType:AtkedType.atked,path:"3039",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:2,hitcd:0.3,speed:720,cost:10,with:90,
        buffs:[],debuffs:[],info:"召唤大火球攻击前方所有敌人,造成300%攻击的伤害,有一定几率施加灼烧"
    },
@@ -346,7 +346,7 @@ export const SkillSet: Record<number, SkillConfig> = {
        buffs:[],debuffs:[],info:"为最前排队友召唤一个可以抵御2次攻击的圣盾(最高叠加到6次)"
    },
    6102: {
-        uuid:6102,name:"寒冰箭",sp_name:"arrow_blue",AtkedType:AtkedType.ice,path:"3060",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6102,name:"寒冰箭",sp_name:"arrow_blue",AtkedType:AtkedType.atked,path:"3060",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:1,t_num:1,hit_num:1,hit:1,hitcd:0.3,speed:720,cost:10,with:90,
        buffs:[],debuffs:[],info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率冰冻敌人"
    },        
@@ -357,7 +357,7 @@ export const SkillSet: Record<number, SkillConfig> = {
    },    
    
    6104: {
-        uuid:6104,name:"烈焰斩击",sp_name:"max_fireatk",AtkedType:AtkedType.fire,path:"3036",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6104,name:"烈焰斩击",sp_name:"max_fireatk",AtkedType:AtkedType.atked,path:"3036",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:1,hitcd:0.2,speed:720,cost:10,with:0,
        buffs:[],debuffs:[],info:"向最前方敌人扔出石斧,造成100%攻击的伤害"
    },
@@ -369,7 +369,7 @@ export const SkillSet: Record<number, SkillConfig> = {
    },
        
    6106: {
-        uuid:6106,name:"龙卷风",sp_name:"bwind",AtkedType:AtkedType.wind,path:"3065",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6106,name:"龙卷风",sp_name:"bwind",AtkedType:AtkedType.atked,path:"3065",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:1,hitcd:1,speed:360,cost:10,with:90,
        buffs:[],debuffs:[],info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"
    },
@@ -377,7 +377,7 @@ export const SkillSet: Record<number, SkillConfig> = {
   

    6107: {
-        uuid:6107,name:"烈焰射击",sp_name:"arrow_yellow",AtkedType:AtkedType.fire,path:"3014",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
+        uuid:6107,name:"烈焰射击",sp_name:"arrow_yellow",AtkedType:AtkedType.atked,path:"3014",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,
        ap:100,cd:5,t_num:1,hit_num:1,hit:1,hitcd:0.3,speed:720,cost:10,with:90,
        buffs:[],debuffs:[],info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率眩晕敌人"
    },
@@ -401,7 +401,7 @@ export const SkillSet: Record<number, SkillConfig> = {
    },
    
    6111: {
-        uuid:6111,name:"陨石术",sp_name:"max_yunshi",AtkedType:AtkedType.fire,path:"3123",TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,
+        uuid:6111,name:"陨石术",sp_name:"max_yunshi",AtkedType:AtkedType.atked,path:"3123",TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,
        ap:500,cd:5,t_num:1,hit_num:0,hit:1,hitcd:0.3,speed:720,cost:10,with:90,
        buffs:[],debuffs:[],info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"
    },
@@ -412,7 +412,7 @@ export const SkillSet: Record<number, SkillConfig> = {
        buffs:[],debuffs:[],info:"在最前方敌人位置,召唤冰墙攻击敌人,造成200%攻击的伤害,50%几率击退敌人"
    },
    6113: {
-        uuid:6113,name:"剑雨",sp_name:"max_jianyu",AtkedType:AtkedType.fire,path:"3123",TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,
+        uuid:6113,name:"剑雨",sp_name:"max_jianyu",AtkedType:AtkedType.atked,path:"3123",TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,
        ap:500,cd:5,t_num:1,hit_num:0,hit:1,hitcd:0.3,speed:720,cost:10,with:90,
        buffs:[],debuffs:[],info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"
    },
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -45,19 +45,19 @@ export const getMonList = ()=>{
 }

 export const HeroPos={
-   0:{pos:v3(0,0,0)},
-   1:{pos:v3(0,0,0)},
-   2:{pos:v3(0,0,0)},
+   0:{pos:v3(0,100,0)},
+   1:{pos:v3(0,100,0)},
+   2:{pos:v3(0,100,0)},
 }
 export const MonSet = {
-   0:{pos:v3(240,0,0)},
-   1:{pos:v3(320,0,0)},
-   2:{pos:v3(360,0,0)},
-   3:{pos:v3(400,0,0)},
-   4:{pos:v3(440,0,0)},
-   5:{pos:v3(480,0,0)},
-   6:{pos:v3(520,0,0)},
-   7:{pos:v3(560,0,0)},
+   0:{pos:v3(240,100,0)},
+   1:{pos:v3(320,100,0)},
+   2:{pos:v3(360,100,0)},
+   3:{pos:v3(400,100,0)},
+   4:{pos:v3(440,100,0)},
+   5:{pos:v3(480,100,0)},
+   6:{pos:v3(520,100,0)},
+   7:{pos:v3(560,100,0)},
 }


--- a/assets/script/game/hero/BuffComp.ts
+++ b/assets/script/game/hero/BuffComp.ts
@@ -153,7 +153,7 @@ export class BuffComp extends Component {
        node.setPosition(pos);
    }
    in_atked(anm:string="atked",scale:number=1) {
-        var path =  "game/skills/"+anm;
+        var path =  "game/skill/boom/"+anm;
        var prefab: Prefab = oops.res.get(path, Prefab)!;
        var node = instantiate(prefab);
        node.setScale(node.scale.x*scale,node.scale.y)
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -84,7 +84,6 @@ export class HeroViewComp extends CCComp {
    atk_count: number = 0;
    atked_count: number = 0; 

-    speek_time:number = 0;



--- a/assets/script/game/hero/Mon.ts
+++ b/assets/script/game/hero/Mon.ts
@@ -36,7 +36,6 @@ export class Monster extends ecs.Entity {
    // console.log("mon load",uuid)
        // this.addComponents<ecs.Comp>( MonModelComp, BattleMoveComp);
        var scene = smc.map.MapView.scene;
-        this.brith_light(pos,scene)
        var path =  "game/heros/"+HeroInfo[uuid].path;
        var prefab: Prefab = oops.res.get(path, Prefab)!;
        var node = instantiate(prefab);
@@ -55,13 +54,7 @@ export class Monster extends ecs.Entity {
        smc.vmdata.mission_data.mon_num++
    // console.log("[Mon] mission_data.mon_num:",smc.vmdata.mission_data.mon_num)
    }
-    brith_light(pos:Vec3,scene:any){
-        var path =  "game/skills/map_birth";
-        var prefab: Prefab = oops.res.get(path, Prefab)!;
-        var node = instantiate(prefab);
-        node.parent = scene.entityLayer!.node!
-        node.setPosition(pos)
-    }
+
    hero_init(uuid:number=1001,node:Node,scale:number=1,box_group=BoxSet.HERO,is_boss:boolean=false,is_call:boolean=false, strengthMultiplier: number = 1.0) {
        var hv = node.getComponent(HeroViewComp)!;

--- a/assets/script/game/hero/SkillConComp.ts
+++ b/assets/script/game/hero/SkillConComp.ts
@@ -23,10 +23,8 @@ export class SkillConComp extends CCComp {
    }
    onLoad(){
        this.HeroView=this.node.getComponent(HeroViewComp)
-        // //console.log(this.HeroView.uid+"=>"+this.HeroView.hero_name+"=> SkillConComp onLoad")
    }
    start() {
-        // //console.log(this.HeroView.uuid+"=>"+this.HeroView.hero_name+"=> SkillConComp start")
        this.HeroEntity=this.HeroView.ent
    }

@@ -34,10 +32,8 @@ export class SkillConComp extends CCComp {
        if(!smc.mission.play||smc.mission.pause) return
        if(!this.HeroView.isStun() && !this.HeroView.isFrost()) {
            let skills=this.HeroView.skills
-            console.log(this.HeroView.uuid+"=>"+this.HeroView.hero_name+"技能列表:",skills)
            for(let i=0;i<skills.length;i++){
                skills[i].cd += dt;
-                console.log(this.HeroView.uuid+"=>"+skills[i].cost,this.HeroView.mp)
                if(skills[i].cd > skills[i].cd_max&&this.HeroView.mp >= skills[i].cost){
                    
                    if(SkillSet[skills[i].uuid].SType==SType.damage&&this.HeroView.is_atking){
@@ -55,7 +51,6 @@ export class SkillConComp extends CCComp {

     /** 施放技能 */
    castSkill(config: typeof SkillSet[keyof typeof SkillSet]) {
-        // //console.log(view.uuid+"=>"+view.hero_name+"施放技能:"+config.uuid);
            let wfuny=this.check_wfuny()
            let dmg=0
            this.doSkill(config,wfuny,dmg);
--- a/assets/script/game/map/MissionHomeComp.ts
+++ b/assets/script/game/map/MissionHomeComp.ts
@@ -5,7 +5,6 @@ import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/O
 import { smc } from "../common/SingletonModuleComp";
 import { GameEvent } from "../common/config/GameEvent";
 import { Timer } from "db://oops-framework/core/common/timer/Timer";
-import { randomSpeek, Speeks } from "../common/config/Tasks";

 const { ccclass, property } = _decorator;

@@ -13,8 +12,6 @@ const { ccclass, property } = _decorator;
@ccclass('MissionHomeComp')
@ecs.register('MissionHome', false)
 export class MissionHomeComp extends CCComp {
-    speek_time:number=0
-    speek_cd:Timer=new Timer(10)
    protected onLoad(): void {
        this.on(GameEvent.MissionEnd,this.mission_end,this)
    }
@@ -25,12 +22,7 @@ export class MissionHomeComp extends CCComp {
    onEnable(){
    }
    update(dt:number){
-        if(this.speek_cd.update(dt)){
-            let speek=randomSpeek()
-            let slot=Math.floor(Math.random()*2)
-            oops.message.dispatchEvent(GameEvent.HeroSpeek,{words:speek[0],slot:slot})
-            console.log("[MissionHomeComp]:speek",speek,slot)
-        }
+       
    }
   
 
--- a/assets/script/game/map/TopComp.ts
+++ b/assets/script/game/map/TopComp.ts
@@ -9,26 +9,18 @@ const { ccclass, property } = _decorator;
 export class topComp extends Component {
    protected onLoad(): void {
        oops.message.on(GameEvent.GOLD_UPDATE,this.onGoldUpdate,this);
-        this.update_all()
    }
    start() {

    }
    onGoldUpdate(event:string,data:any){
-        this.update_gold(smc.data.gold)
        tween(this.node.getChildByName("bar").getChildByName("gold").getChildByName("num").getComponent(Label).node)
            .to(0.1,{scale:v3(1.2,1.2,1)})
            .to(0.1,{scale:v3(1,1,1)})
            .start()
    }
-    update_gold(gold:number){
-        this.node.getChildByName("bar").getChildByName("gold").getChildByName("num").getComponent(Label).string=NumberFormatter.formatNumber(gold);
-    }
- 
-    update_all(){
-       this.update_gold(smc.vmdata.gold)
-    }

+ 
    update(deltaTime: number) {
        
    }
--- a/assets/script/game/skill/AtkConCom.ts
+++ b/assets/script/game/skill/AtkConCom.ts
@@ -98,11 +98,11 @@ export class AtkConCom extends CCComp {
        bm.moveTo(this.targetPos);
    }
    do_fixedEnd(){ 
-        this.node.setPosition(this.targetPos.x > 360?300:this.targetPos.x,0,0)
+        this.node.setPosition(this.targetPos.x > 360?300:this.targetPos.x,this.node.position.y,0)
        this.do_anim()
    }
    do_fixedStart(){
-        this.node.setPosition(this.startPos.x > 360?300:this.startPos.x,0,0)
+        this.node.setPosition(this.startPos.x > 360?300:this.startPos.x,this.node.position.y,0)
        this.do_anim()  
    }

--- a/assets/script/game/skill/SkillViewCom.ts
+++ b/assets/script/game/skill/SkillViewCom.ts
@@ -55,7 +55,6 @@ export class SkillViewCom extends CCComp {
    start() {
        // var entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
        this.node.getChildByName("ready").active = this.hasReady
-        console.log("[skillView] start ",this.hasReady)
    }
    protected update(dt: number): void {
        this.doTimer(dt)
@@ -72,14 +71,11 @@ export class SkillViewCom extends CCComp {
    }

    doTimer(dt: number){
-        console.log('[skillview]:doTimer',this.ReadyTime,this.readyFinish)
        if(this.ReadyTime > 0) this.ReadyTime -= dt
        if(this.ReadyTime <=0) this.readyFinish=true
    }
    doAtk(dt:number): void {
-        console.log(`${this.cName}_[SkillViewCom]  doAtkC`,this.s_cd,this.s_count)
        if(this.s_cd <= 0&&this.s_count > 0) {
-            console.log(`${this.cName}_[SkillViewCom]  doAtk 2`)
            this.doSkill()
            this.s_count--
            this.s_cd = this.s_interval
@@ -89,15 +85,13 @@ export class SkillViewCom extends CCComp {
        if(this.s_cd > 0) this.s_cd -= dt
    }
    doSkill(){
-        console.log(`${this.cName}_[SkillViewCom]  atkPrefab`,this.atkPrefab)
        if(this.atkPrefab!=null){
            let atkNode:Node = instantiate(this.atkPrefab)
            atkNode.parent = this.node.parent
+            atkNode.setPosition(v3(this.node.position.x + this.atk_x*atkNode.scale.x, this.node.position.y + this.atk_y))
            if(this.node.scale.x < 0){
                atkNode.setScale(v3(atkNode.scale.x*-1,atkNode.scale.y,atkNode.scale.z))
            }
-            atkNode.setPosition(v3(this.node.position.x + this.atk_x*atkNode.scale.x, this.node.position.y + this.atk_y))
-            console.log(`${this.cName}_[SkillViewCom]  doSkill atkNode`,this.node.position,atkNode.position)
            let atkCom=atkNode.getComponent(AtkConCom)
            // 计算延长后的目标点坐标
            const originalStart = v3(this.node.position.x + this.atk_x, this.node.position.y + this.atk_y);
@@ -137,20 +131,15 @@ export class SkillViewCom extends CCComp {
        }
    }
    do_linear(atkNode:any): void { 
-        console.log(`${this.cName}_[SkillViewCom] skille run type: linear`,this.node.position,atkNode.position)
        atkNode.getComponent(AtkConCom).do_line()
    }
    do_bezier(atkNode:any): void { 
-        console.log(`${this.cName}_[SkillViewCom] skille run type: bezier`)
        atkNode.getComponent(AtkConCom).do_parabolic()
    }
    do_fixed(atkNode:any): void { 
-        console.log(`${this.cName}_[SkillViewCom] skille run type: fixed`)
        atkNode.getComponent(AtkConCom).do_fixedStart()
-
    }
    do_fixedEnd(atkNode:any): void { 
-        console.log(`${this.cName}_[SkillViewCom] skille run type: fixedEnd`)
        atkNode.getComponent(AtkConCom).do_fixedEnd()
    }
    move(dt: number): void {