diff --git a/assets/resources/game/gui/schip.prefab b/assets/resources/game/gui/schip.prefab
index 30f4bb48..ab9c1f90 100644
--- a/assets/resources/game/gui/schip.prefab
+++ b/assets/resources/game/gui/schip.prefab
@@ -22,23 +22,20 @@
         "__id__": 2
       },
       {
-        "__id__": 11
-      },
-      {
-        "__id__": 25
+        "__id__": 8
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 22
       },
       {
-        "__id__": 33
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -85,13 +82,10 @@
       },
       {
         "__id__": 5
-      },
-      {
-        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 7
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -136,8 +130,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 110,
-      "height": 110
+      "width": 100,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -148,7 +142,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7b1AqTRD5ME64Esj6ng1dt"
+    "fileId": "8aMDFOPjdOD50hx4wXeoYh"
   },
   {
     "__type__": "cc.Sprite",
@@ -167,13 +161,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 225,
+      "g": 247,
+      "b": 252,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@54ac8",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f0800",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -193,79 +187,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "8bAtx1erBCMpa5Gjs+EpnN"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 8
-    },
-    "clickEvents": [
-      {
-        "__id__": 9
-      }
-    ],
-    "_interactable": true,
-    "_transition": 3,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": null,
-    "_hoverSprite": null,
-    "_pressedSprite": null,
-    "_disabledSprite": null,
-    "_duration": 0.1,
-    "_zoomScale": 0.95,
-    "_target": {
-      "__id__": 1
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "65hG8BEaxD1bE3SHtDU2rs"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "f653eE60XxPYoCKHpWk31Mn",
-    "handler": "show_info",
-    "customEventData": ""
+    "fileId": "96DghIs15DipRklEp/GK7P"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -275,7 +197,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "61vm1CsbJI5o6fjrN1bBFx",
+    "fileId": "a3aPVEqO5En4T5ia2oYpXQ",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -290,28 +212,28 @@
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 9
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 15
       },
       {
-        "__id__": 20
+        "__id__": 17
       },
       {
-        "__id__": 22
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 2.228,
       "z": 0
     },
     "_lrot": {
@@ -343,20 +265,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 8
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 10
       },
       {
-        "__id__": 15
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 14
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -393,16 +315,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 11
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
-      "height": 90
+      "width": 120,
+      "height": 120
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -413,7 +335,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "58cDVDv9NNHpOe9wD+hWsa"
+    "fileId": "35djko+rVPxo0Cgovwnr9w"
   },
   {
     "__type__": "cc.Sprite",
@@ -421,11 +343,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 13
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -455,7 +377,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "edi51irzpKDKLz+RbshuSX"
+    "fileId": "85FjuP7AFBvr2ZutPHmCqx"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -465,7 +387,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ed+GboCMtMA5j7D4t/yuYW",
+    "fileId": "3c0GGaCYhH9ZM7ftnUr23N",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -476,16 +398,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 16
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
-      "height": 90
+      "width": 82,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -496,7 +418,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "15DYj/iRRLkIiSvFKzIAaF"
+    "fileId": "6boO4cWO1OeqBw5pnxsiMt"
   },
   {
     "__type__": "cc.Mask",
@@ -504,11 +426,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 18
     },
     "_type": 3,
     "_inverted": false,
@@ -518,7 +440,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2fhdxMbT1G1YFGRp1uFNb5"
+    "fileId": "96GX6HYqRLFbjMFRXWcmhy"
   },
   {
     "__type__": "cc.Sprite",
@@ -526,11 +448,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 20
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -543,7 +465,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@54ac8",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4f4b0",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -563,7 +485,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "8fddGLxJhK9IaZrqfS4C0k"
+    "fileId": "4bov6Lz15FfbBnjGakiHLR"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -573,166 +495,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "34v809MiVNZKfhzLdaM9+C",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "num",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 26
-      },
-      {
-        "__id__": 28
-      }
-    ],
-    "_prefab": {
-      "__id__": 30
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 31.77,
-      "y": -26.584,
-      "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.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 25
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 27
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 4,
-      "height": 39.28
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4e6kAMVQVCKr64qCyPdQh2"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 25
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 29
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 25,
-    "_fontSize": 25,
-    "_fontFamily": "Arial",
-    "_lineHeight": 28,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": true,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0eoM4xum5LW4uxUulIB6RF"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "93NuxDljtBl7yjMhAtOsiF",
+    "fileId": "05rYYTDXFNEYno0sy1pY9O",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -747,7 +510,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -775,7 +538,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 25
     },
     "_id": ""
   },
diff --git a/assets/resources/game/heros/a1.prefab b/assets/resources/game/heros/a1.prefab
index 179f096a..52cd500f 100644
--- a/assets/resources/game/heros/a1.prefab
+++ b/assets/resources/game/heros/a1.prefab
@@ -37,20 +37,23 @@
         "__id__": 68
       },
       {
-        "__id__": 82
+        "__id__": 80
       },
       {
-        "__id__": 91
+        "__id__": 89
       },
       {
-        "__id__": 100
+        "__id__": 98
       },
       {
-        "__id__": 109
+        "__id__": 107
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 116
+      },
       {
         "__id__": 118
       },
@@ -65,13 +68,10 @@
       },
       {
         "__id__": 126
-      },
-      {
-        "__id__": 128
       }
     ],
     "_prefab": {
-      "__id__": 130
+      "__id__": 128
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1130,9 +1130,6 @@
       },
       {
         "__id__": 78
-      },
-      {
-        "__id__": 80
       }
     ],
     "removedComponents": []
@@ -1232,22 +1229,6 @@
     "propertyPath": [
       "_active"
     ],
-    "value": false
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "bczw9AVWRKvbioC0BzckLA"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 81
-    },
-    "propertyPath": [
-      "_active"
-    ],
     "value": true
   },
   {
@@ -1263,14 +1244,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 83
+      "__id__": 81
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 82
+      "__id__": 80
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1278,7 +1259,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 84
+      "__id__": 82
     },
     "targetOverrides": null
   },
@@ -1291,20 +1272,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 83
+      },
       {
         "__id__": 85
       },
+      {
+        "__id__": 86
+      },
       {
         "__id__": 87
       },
       {
         "__id__": 88
-      },
-      {
-        "__id__": 89
-      },
-      {
-        "__id__": 90
       }
     ],
     "removedComponents": []
@@ -1312,7 +1293,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 84
     },
     "propertyPath": [
       "_name"
@@ -1328,7 +1309,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 84
     },
     "propertyPath": [
       "_lpos"
@@ -1343,7 +1324,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 84
     },
     "propertyPath": [
       "_lrot"
@@ -1359,7 +1340,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 84
     },
     "propertyPath": [
       "_euler"
@@ -1374,7 +1355,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 84
     },
     "propertyPath": [
       "_active"
@@ -1388,14 +1369,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 92
+      "__id__": 90
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 91
+      "__id__": 89
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1403,7 +1384,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 93
+      "__id__": 91
     },
     "targetOverrides": null
   },
@@ -1416,20 +1397,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 92
+      },
       {
         "__id__": 94
       },
+      {
+        "__id__": 95
+      },
       {
         "__id__": 96
       },
       {
         "__id__": 97
-      },
-      {
-        "__id__": 98
-      },
-      {
-        "__id__": 99
       }
     ],
     "removedComponents": []
@@ -1437,7 +1418,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 95
+      "__id__": 93
     },
     "propertyPath": [
       "_name"
@@ -1453,7 +1434,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 95
+      "__id__": 93
     },
     "propertyPath": [
       "_lpos"
@@ -1468,7 +1449,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 95
+      "__id__": 93
     },
     "propertyPath": [
       "_lrot"
@@ -1484,7 +1465,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 95
+      "__id__": 93
     },
     "propertyPath": [
       "_euler"
@@ -1499,7 +1480,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 95
+      "__id__": 93
     },
     "propertyPath": [
       "_active"
@@ -1513,14 +1494,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 101
+      "__id__": 99
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 100
+      "__id__": 98
     },
     "asset": {
       "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
@@ -1528,7 +1509,7 @@
     },
     "fileId": "733PKzwANLyJWD2ume4u5f",
     "instance": {
-      "__id__": 102
+      "__id__": 100
     },
     "targetOverrides": null
   },
@@ -1541,20 +1522,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 101
+      },
       {
         "__id__": 103
       },
+      {
+        "__id__": 104
+      },
       {
         "__id__": 105
       },
       {
         "__id__": 106
-      },
-      {
-        "__id__": 107
-      },
-      {
-        "__id__": 108
       }
     ],
     "removedComponents": []
@@ -1562,7 +1543,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 104
+      "__id__": 102
     },
     "propertyPath": [
       "_name"
@@ -1578,7 +1559,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 104
+      "__id__": 102
     },
     "propertyPath": [
       "_lpos"
@@ -1593,7 +1574,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 104
+      "__id__": 102
     },
     "propertyPath": [
       "_lrot"
@@ -1609,7 +1590,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 104
+      "__id__": 102
     },
     "propertyPath": [
       "_euler"
@@ -1624,7 +1605,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 104
+      "__id__": 102
     },
     "propertyPath": [
       "_active"
@@ -1638,14 +1619,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 110
+      "__id__": 108
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 109
+      "__id__": 107
     },
     "asset": {
       "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
@@ -1653,7 +1634,7 @@
     },
     "fileId": "65v9q/98dMjafRlb094Ctr",
     "instance": {
-      "__id__": 111
+      "__id__": 109
     },
     "targetOverrides": null
   },
@@ -1666,20 +1647,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 110
+      },
       {
         "__id__": 112
       },
+      {
+        "__id__": 113
+      },
       {
         "__id__": 114
       },
       {
         "__id__": 115
-      },
-      {
-        "__id__": 116
-      },
-      {
-        "__id__": 117
       }
     ],
     "removedComponents": []
@@ -1687,7 +1668,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 113
+      "__id__": 111
     },
     "propertyPath": [
       "_name"
@@ -1703,7 +1684,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 113
+      "__id__": 111
     },
     "propertyPath": [
       "_lpos"
@@ -1718,7 +1699,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 113
+      "__id__": 111
     },
     "propertyPath": [
       "_lrot"
@@ -1734,7 +1715,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 113
+      "__id__": 111
     },
     "propertyPath": [
       "_euler"
@@ -1749,7 +1730,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 113
+      "__id__": 111
     },
     "propertyPath": [
       "_active"
@@ -1766,7 +1747,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 119
+      "__id__": 117
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1794,7 +1775,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 121
+      "__id__": 119
     },
     "enabledContactListener": true,
     "bullet": true,
@@ -1828,7 +1809,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 123
+      "__id__": 121
     },
     "tag": 0,
     "_group": 4,
@@ -1862,7 +1843,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 125
+      "__id__": 123
     },
     "anm": {
       "__id__": 22
@@ -1883,7 +1864,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 127
+      "__id__": 125
     },
     "_id": ""
   },
@@ -1901,7 +1882,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 129
+      "__id__": 127
     },
     "_id": ""
   },
@@ -1922,16 +1903,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 109
+        "__id__": 107
       },
       {
-        "__id__": 100
+        "__id__": 98
       },
       {
-        "__id__": 91
+        "__id__": 89
       },
       {
-        "__id__": 82
+        "__id__": 80
       },
       {
         "__id__": 68
diff --git a/assets/resources/game/heros/animtor/up.prefab b/assets/resources/game/heros/animtor/up.prefab
index 100fad9a..25b95560 100644
--- a/assets/resources/game/heros/animtor/up.prefab
+++ b/assets/resources/game/heros/animtor/up.prefab
@@ -87,7 +87,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -13.706,
+      "y": -60,
       "z": 0
     },
     "_lrot": {
diff --git a/assets/resources/game/skills/anm/okill.anim b/assets/resources/game/skills/anm/okill.anim
new file mode 100644
index 00000000..566b59a1
--- /dev/null
+++ b/assets/resources/game/skills/anm/okill.anim
@@ -0,0 +1,179 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "okill",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 32,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.4375,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 7
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 13
+    },
+    "_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": "Node"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.0625,
+      0.125,
+      0.1875
+    ],
+    "_values": [
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@55d08",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@36291",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@4052b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e928b",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 8
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 11
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 10
+      },
+      "spriteFrame"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "Node-001"
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 12
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0.09375,
+      0.15625,
+      0.21875,
+      0.28125,
+      0.34375,
+      0.40625
+    ],
+    "_values": [
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d810b",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@102a8",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1fa83",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8c851",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d97c1",
+        "__expectedType__": "cc.SpriteFrame"
+      },
+      {
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9ddb4",
+        "__expectedType__": "cc.SpriteFrame"
+      }
+    ]
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/anm/okill.anim.meta b/assets/resources/game/skills/anm/okill.anim.meta
new file mode 100644
index 00000000..4f7d55fb
--- /dev/null
+++ b/assets/resources/game/skills/anm/okill.anim.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "00f9792c-c224-4956-8ca1-03eb646274a4",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "okill"
+  }
+}
diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab
index da2301aa..eb38a1ac 100644
--- a/assets/resources/game/skills/arrow.prefab
+++ b/assets/resources/game/skills/arrow.prefab
@@ -296,7 +296,7 @@
     "_size": {
       "__type__": "cc.Size",
       "width": 60,
-      "height": 10
+      "height": 20
     },
     "_id": ""
   },
diff --git a/assets/resources/game/skills/arrow_yellow.prefab b/assets/resources/game/skills/arrow_yellow.prefab
index 491b9351..fb2d781b 100644
--- a/assets/resources/game/skills/arrow_yellow.prefab
+++ b/assets/resources/game/skills/arrow_yellow.prefab
@@ -99,7 +99,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 50,
       "z": 0
     },
     "_lrot": {
@@ -111,8 +111,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -299,7 +299,7 @@
     "_size": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 30
+      "height": 150
     },
     "_id": ""
   },
diff --git a/assets/resources/game/skills/buff/buffshow.anim b/assets/resources/game/skills/buff/buffshow.anim
index e58bd7a8..eef83397 100644
--- a/assets/resources/game/skills/buff/buffshow.anim
+++ b/assets/resources/game/skills/buff/buffshow.anim
@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 1.46875,
+    "_duration": 0.71875,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -79,115 +79,55 @@
       0.5,
       0.5625,
       0.625,
-      0.6875,
-      0.75,
-      0.8125,
-      0.875,
-      0.9375,
-      1,
-      1.0625,
-      1.125,
-      1.1875,
-      1.25,
-      1.3125,
-      1.375,
-      1.4375
+      0.6875
     ],
     "_values": [
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8fc45",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c97c3",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@797f6",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@90447",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9b637",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@92688",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7de82",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@32ea4",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@59ef4",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7d3f1",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@40425",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@af72a",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@bead9",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@00c97",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@87f28",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9d62e",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@4842a",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1cc80",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@616fa",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ff855",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@d14cd",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@db922",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@6bd09",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@67aca",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1fc07",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e95db",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7feeb",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ffd11",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@5006c",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@3ec88",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@94a7b",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@bbca6",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@dd597",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@5d698",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c103b",
+        "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@81e5a",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]
diff --git a/assets/resources/game/skills/buff2.prefab b/assets/resources/game/skills/buff2.prefab
deleted file mode 100644
index d1e5fb46..00000000
--- a/assets/resources/game/skills/buff2.prefab
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "buff2",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "persistent": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "buff2",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "_prefab": {
-      "__id__": 12
-    },
-    "_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": 1,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "anm",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      },
-      {
-        "__id__": 5
-      }
-    ],
-    "_prefab": {
-      "__id__": 7
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -10,
-      "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": 1,
-    "_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": 187.1199951171875,
-      "height": 208.8300018310547
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.4559106444245401,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "efXM7jZYFDhaaMfRXZDS5R"
-  },
-  {
-    "__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": 139
-    },
-    "_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": "00VJ/kXoREi5DvWZhz/sGv"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "104XmOXdJEOY1f8nMgyyWG",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 9
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 187.1199951171875,
-      "height": 166.58999633789062
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.4559106444245401,
-      "y": 0.21982111613478442
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "89ju37xNVPJJOPezJpA7XB"
-  },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 11
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "5b0c6934-43af-44c6-a4d5-6fa512dc5f1e",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "5b0c6934-43af-44c6-a4d5-6fa512dc5f1e",
-      "__expectedType__": "cc.AnimationClip"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f5eUTOvKpETKxHpKKvR8mE"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "65v9q/98dMjafRlb094Ctr",
-    "instance": null,
-    "targetOverrides": null
-  }
-]
\ No newline at end of file
diff --git a/assets/resources/game/skills/bwind.prefab b/assets/resources/game/skills/bwind.prefab
index 3ecdc3bb..02e958e9 100644
--- a/assets/resources/game/skills/bwind.prefab
+++ b/assets/resources/game/skills/bwind.prefab
@@ -462,12 +462,12 @@
     "_offset": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 40
+      "y": 60
     },
     "_size": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 80
+      "height": 200
     },
     "_id": ""
   },
diff --git a/assets/resources/game/skills/fire.prefab b/assets/resources/game/skills/fire.prefab
index 4de79fa9..7945e97f 100644
--- a/assets/resources/game/skills/fire.prefab
+++ b/assets/resources/game/skills/fire.prefab
@@ -99,7 +99,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 70,
       "z": 0
     },
     "_lrot": {
@@ -298,8 +298,8 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 15,
-      "height": 80
+      "width": 100,
+      "height": 180
     },
     "_id": ""
   },
diff --git a/assets/resources/game/skills/heath.prefab b/assets/resources/game/skills/heath.prefab
index 0f8f5a77..e77c574d 100644
--- a/assets/resources/game/skills/heath.prefab
+++ b/assets/resources/game/skills/heath.prefab
@@ -22,32 +22,32 @@
         "__id__": 2
       },
       {
-        "__id__": 14
+        "__id__": 13
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 19
       },
       {
-        "__id__": 22
+        "__id__": 21
       },
       {
-        "__id__": 24
+        "__id__": 23
       },
       {
-        "__id__": 26
+        "__id__": 25
       },
       {
-        "__id__": 28
+        "__id__": 27
       },
       {
-        "__id__": 30
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 31
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -80,276 +80,155 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "skill",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [
+    "_prefab": {
+      "__id__": 3
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 2
+    },
+    "asset": {
+      "__uuid__": "7c02fdcf-20fe-40f6-a8a5-f5a8c1460861",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": {
+      "__id__": 4
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "80t5h5Hd1H2YZB/aurwYsr",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
       {
-        "__id__": 3
-      }
-    ],
-    "_active": true,
-    "_components": [
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 8
+      },
       {
         "__id__": 9
       },
+      {
+        "__id__": 10
+      },
       {
         "__id__": 11
       }
     ],
-    "_prefab": {
-      "__id__": 13
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 153.75,
-      "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": ""
+    "removedComponents": []
   },
   {
-    "__type__": "cc.Node",
-    "_name": "9002",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 4
-      },
-      {
-        "__id__": 6
-      }
+    "propertyPath": [
+      "_name"
     ],
-    "_prefab": {
-      "__id__": 8
+    "value": "skill"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "c46/YsCPVOJYA4mWEpNYRx"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_lpos": {
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 20,
+      "x": 24.893,
+      "y": 205.185,
       "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_lrot": {
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
       "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.4,
-      "y": 0.4,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    },
-    "_id": ""
+    }
   },
   {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 5
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 112,
-      "height": 116
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
+    "propertyPath": [
+      "_lscale"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
       "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
+      "y": 0.5,
+      "z": 1
+    }
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "75xpQHXMxEMpc6+amd6mJd"
-  },
-  {
-    "__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": 0,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "767c21dd-b2a2-4118-a12d-f67a8039abd4@2a96a",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_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": "26Tur+CalF46c3Q8i+YdSW"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "10dMoKJuJB9KLywP88Ll8O",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 10
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 24,
-      "height": 24
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b4sNQPJWFKha7x75SWXmRj"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
       "__id__": 12
     },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 51,
-      "g": 255,
-      "b": 0,
-      "a": 255
-    },
-    "_spriteFrame": null,
-    "_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": ""
+    "propertyPath": [
+      "_spriteFrame"
+    ],
+    "value": {
+      "__uuid__": "767c21dd-b2a2-4118-a12d-f67a8039abd4@2a96a",
+      "__expectedType__": "cc.SpriteFrame"
+    }
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9a+65VIghBm4HQxuHPQ/mg"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "7a5LvbdlxEc6FKa7cun2oB",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "85FjuP7AFBvr2ZutPHmCqx"
+    ]
   },
   {
     "__type__": "cc.Node",
@@ -363,14 +242,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 14
       },
       {
-        "__id__": 17
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -407,11 +286,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -435,11 +314,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -497,17 +376,17 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 20
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
-      "height": 80
+      "width": 720,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0.5156666649712457
+      "x": 0.5,
+      "y": 0.5
     },
     "_id": ""
   },
@@ -525,7 +404,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 22
     },
     "enabledContactListener": true,
     "bullet": true,
@@ -559,7 +438,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 24
     },
     "tag": 8,
     "_group": 4,
@@ -574,8 +453,8 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 30,
-      "height": 30
+      "width": 720,
+      "height": 60
     },
     "_id": ""
   },
@@ -593,7 +472,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 26
     },
     "_id": ""
   },
@@ -601,24 +480,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "8ahZv91itPcYJm8S0veHYl"
   },
-  {
-    "__type__": "3a728/XIrpLz7uIWIOQNGox",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 29
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "2d0cjhmGNJ7pfPLiY0xvaq"
-  },
   {
     "__type__": "cc.Animation",
     "_name": "",
@@ -629,7 +490,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 28
     },
     "playOnLoad": true,
     "_clips": [
@@ -648,6 +509,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "684O4uajxIsKmwoOacfpUS"
   },
+  {
+    "__type__": "38c69ebGPNGs5g0wcmjNHqR",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 30
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "aeKuNdU4RH0aHU657oxakt"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -658,6 +537,11 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 2
+      }
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/resources/game/skills/heath/heath.anim b/assets/resources/game/skills/heath/heath.anim
index 72b07103..17de61f3 100644
--- a/assets/resources/game/skills/heath/heath.anim
+++ b/assets/resources/game/skills/heath/heath.anim
@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.5,
+    "_duration": 0.6666666666666666,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -74,15 +74,15 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.25,
-      0.5
+      0.3333333333333333,
+      0.6666666666666666
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 1,
+        "value": 0.5,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -94,7 +94,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 1.2000000476837158,
+        "value": 0.6,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -106,7 +106,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 1,
+        "value": 0.5,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -128,15 +128,15 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.25,
-      0.5
+      0.3333333333333333,
+      0.6666666666666666
     ],
     "_values": [
       {
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 1,
+        "value": 0.5,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -148,7 +148,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 1.2000000476837158,
+        "value": 0.6,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -160,7 +160,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 1,
+        "value": 0.5,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -182,8 +182,8 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.25,
-      0.5
+      0.3333333333333333,
+      0.6666666666666666
     ],
     "_values": [
       {
diff --git a/assets/resources/game/skills/ice.prefab b/assets/resources/game/skills/ice.prefab
index 6808f7da..fec12b0c 100644
--- a/assets/resources/game/skills/ice.prefab
+++ b/assets/resources/game/skills/ice.prefab
@@ -99,7 +99,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 50,
       "z": 0
     },
     "_lrot": {
@@ -111,8 +111,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 2,
-      "y": 2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -298,8 +298,8 @@
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 20,
-      "height": 80
+      "width": 120,
+      "height": 150
     },
     "_id": ""
   },
diff --git a/assets/resources/game/skills/okill.prefab b/assets/resources/game/skills/okill.prefab
new file mode 100644
index 00000000..41754537
--- /dev/null
+++ b/assets/resources/game/skills/okill.prefab
@@ -0,0 +1,562 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "okill",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "okill",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_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": 1,
+      "y": 1,
+      "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": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "18OCnD8CNCp7/2Y14VdEwf"
+  },
+  {
+    "__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": 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": "1cEJRu54FEnYXVCLbC5qGF"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "55/1JAS1lPCYZRA0EZ/tWe",
+    "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": 6,
+      "y": -5,
+      "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.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8dMv48uzJBBJboTRplSxnp"
+  },
+  {
+    "__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": "balgfo/j5DnZHwJRFeWAIp"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "30ywjOQxZMorH5o0zuaiUk",
+    "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": 150,
+      "height": 89
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5cF3YtaNJO6arYWX/tn4cL"
+  },
+  {
+    "__type__": "cc.RigidBody2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "enabledContactListener": true,
+    "bullet": true,
+    "awakeOnLoad": true,
+    "_group": 4,
+    "_type": 2,
+    "_allowSleep": false,
+    "_gravityScale": 0,
+    "_linearDamping": 0,
+    "_angularDamping": 0,
+    "_linearVelocity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_angularVelocity": 0,
+    "_fixedRotation": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4bdBL+TclP+79aZSabYtfK"
+  },
+  {
+    "__type__": "cc.BoxCollider2D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "tag": 8,
+    "_group": 4,
+    "_density": 1,
+    "_sensor": true,
+    "_friction": 0.2,
+    "_restitution": 0,
+    "_offset": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 40
+    },
+    "_size": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 80
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f70rkggRZACZKqkR8MhiBL"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "playOnLoad": true,
+    "_clips": [
+      {
+        "__uuid__": "00f9792c-c224-4956-8ca1-03eb646274a4",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "00f9792c-c224-4956-8ca1-03eb646274a4",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7eyI0wz25MRJ+VGkQWHxz8"
+  },
+  {
+    "__type__": "45646oIyIdA24W+0c5rdELD",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0f1YvlzyZOLIAHiCyCBXRz"
+  },
+  {
+    "__type__": "34a04mZHI1DgLIYWdikGBim",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6cKfw7nVpIeaUlhgvnM6bz"
+  },
+  {
+    "__type__": "f5c0acU9TtA5JBGObMPOZe3",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 27
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2aEXX6h8VN2LGz4+46sa8t"
+  },
+  {
+    "__type__": "b7a2b+F9x9MTL2g4T6HMN1D",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 29
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "23sOGER+dM7oamzeBjdtxW"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff2.prefab.meta b/assets/resources/game/skills/okill.prefab.meta
similarity index 63%
rename from assets/resources/game/skills/buff2.prefab.meta
rename to assets/resources/game/skills/okill.prefab.meta
index 6ce70713..3b5ec992 100644
--- a/assets/resources/game/skills/buff2.prefab.meta
+++ b/assets/resources/game/skills/okill.prefab.meta
@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "7f4c3449-8ea1-45f7-bedd-eed51d745b56",
+  "uuid": "ad382963-fd94-46da-9013-adf64ff3d709",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "buff2"
+    "syncNodeName": "okill"
   }
 }
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index bf5d59a8..ae5b13ed 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -7704,7 +7704,7 @@
         "__id__": 340
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 346
@@ -8451,7 +8451,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -168.236,
+      "x": 0,
       "y": 0,
       "z": 0
     },
@@ -8738,7 +8738,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 104,
+      "width": 54,
       "height": 48.1
     },
     "_anchorPoint": {
@@ -8774,7 +8774,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "不要十倍",
+    "_string": "确定",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 25,
@@ -33599,7 +33599,7 @@
         "__id__": 1574
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3066
diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts
index 4e1f47c5..594279e0 100644
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -29,49 +29,53 @@ debuff: 0depb:50,:无，1：冰，2：灼烧，3：眩晕，4：降低攻击，5
 */
 export const SkillSet={
     6001:{uuid: 6001,path: "6001",type: 1,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "寒冰弹",sp_name:"ball_blue",info:"释放一个火球术攻击敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, },
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, sonsk:0},
 
     6002:{uuid: 6002,path: "6002",type: 1,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "火焰弹",sp_name:"ball_red",info:"释放一个火球术攻击敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, },
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, sonsk:0},
 
     6003:{uuid: 6003,path: "6003",type: 1,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "魔法弹",sp_name:"ball_green",info:"释放一个火球术攻击敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, },
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, sonsk:0},
 
     6004:{uuid: 6004,path: "6004",type: 1,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "圣光弹",sp_name:"ball_yellow",info:"释放一个火球术攻击敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, },
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, sonsk:0},
 
     6005:{uuid: 6005,path: "6005",type: 1,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "无形剑气",sp_name:"patk",info:"释放无形剑气攻击前方直线100码的敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,},
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,sonsk:0},
 
     6006:{uuid: 6006,path: "6006",type: 1,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "射击",sp_name:"arrow",info:"释放无形剑气攻击前方直线100码的敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,},
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,sonsk:0},
 
     6011:{uuid: 6011,path: "6011",type: 2,tg:3,debuff:0,depb:50,debtime:2,derate:1,name: "烈火呼吸",sp_name:"firequan",info:"释放烈火剑气攻击前方地方,对前方敌人造成3段伤害",
-    in:3,count:1,apup:0,ap:2,hp:0,cd:0.5,shield:0,speed:100,},
+    in:3,count:1,apup:0,ap:2,hp:0,cd:0.5,shield:0,speed:100,sonsk:0},
 
     6012:{uuid: 6012,path: "6012",type: 2,tg:3,debuff:2,depb:50,debtime:6,derate:1,name: "大火球",sp_name:"fire",info:"释放有形剑气攻击前方直线300码的敌人",
-    in:1,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,},
+    in:1,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,sonsk:0},
 
     6013:{uuid: 6013,path: "6013",type: 2,tg:3,debuff:7,depb:50,debtime:2,derate:0.01,name: "火墙",sp_name:"fires",info:"释放有形剑气攻击前方直线300码的敌人",
-    in:10,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,},
+    in:10,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450,sonsk:0},
 
     6014:{uuid: 6014,path: "6014",type: 2,tg:3,debuff:1,depb:50,debtime:2,derate:1,name: "冰破术",sp_name:"ice",info:"释放有形剑气攻击前方直线300码的敌人",
-    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:450,},
+    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:450,sonsk:0},
 
     6015:{uuid: 6015,path: "6015",type: 2,tg:3,debuff:3,depb:50,debtime:6,derate:1,name: "火焰射击",sp_name:"arrow_yellow",info:"释放有形剑气攻击前方直线300码的敌人",
-    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:450,},
+    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:450,sonsk:0},
 
     6016:{uuid: 6016,path: "6016",type: 2,tg:3,debuff:8,depb:50,debtime:6,derate:1,name: "龙卷风",sp_name:"bwind",info:"释放有形剑气攻击前方直线300码的敌人",
-    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:300,},
+    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:300,sonsk:0},
 
-    6017:{uuid: 6017,path: "6017",type: 91,tg:1,debuff:0,depb:50,debtime:2,derate:1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
-    in:10,count:1,apup:0,ap:1,hp:3,cd:1,shield:0,speed:450, },
+    6017:{uuid: 6017,path: "6017",type: 91,tg:2,debuff:0,depb:50,debtime:2,derate:1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
+    in:10,count:1,apup:0,ap:1,hp:3,cd:1,shield:0,speed:450, sonsk:0},
 
     6018:{uuid: 6018,path: "6018",type: 91,tg:0,debuff:0,depb:50,debtime:2,derate:1,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:1,speed:450, },
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:1,speed:450, sonsk:0},
 
     6019:{uuid: 6019,path: "6019",type: 91,tg:0,debuff:0,depb:50,debtime:2,derate:1,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人",
-    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, },
+    in:0.8,count:1,apup:0,ap:1,hp:0,cd:1,shield:0,speed:450, sonsk:0},
+
+    6020:{uuid: 6020,path: "6014",type: 81,tg:3,debuff:0,depb:50,debtime:0,derate:0,name: "阻击",sp_name:"okill",info:"释放有形剑气攻击前方直线300码的敌人",
+    in:1,count:1,apup:0,ap:2,hp:0,cd:1,shield:0,speed:450,sonsk:0},
+    
     
 }
 
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index c7706048..fe1eefa0 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -72,28 +72,28 @@ export const HeroInfo = {
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5004: {
-      uuid:5004,name: "绿箭",path:"a1",quality:3,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5004,name: "绿箭",path:"a1",quality:3,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6015,6015,6015,6015,6015,6015],sk3:[6015,6015,6015,6015,6015,6015],pw:140,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5005: {
-      uuid:5005,name: "罗宾汉",path:"a2",quality:2,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5005,name: "罗宾汉",path:"a2",quality:2,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6016,6016,6016,6016,6016,6016],sk3:[6016,6016,6016,6016,6016,6016],pw:140,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5006: {
-      uuid:5006,name: "鹰眼",path:"a3",quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5006,name: "鹰眼",path:"a3",quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5007: {
-      uuid:5007,name: "冰法",path:"m1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5007,name: "冰法",path:"m1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6001,6001,6001,6001,6001,6001],sk2:[6014,6014,6014,6014,6014,6014],sk3:[6014,6014,6014,6014,6014,6014],pw:140,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
@@ -107,56 +107,56 @@ export const HeroInfo = {
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5009: {
-      uuid:5009,name: "火法",path:"m3",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5009,name: "火法",path:"m3",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6002,6002,6002,6002,6002,6002],sk2:[6012,6012,6012,6012,6012,6012],sk3:[6012,6012,6012,6012,6012,6012],pw:140,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5010: {
-      uuid:5010,name: "牧师",path:"h1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5010,name: "牧师",path:"h1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6004,6004,6004,6004,6004,6004],sk2:[6017,6017,6017,6017,6017,6017],sk3:[6017,6017,6017,6017,6017,6017],pw:0,pwm:50,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5011: {
-      uuid:5011,name: "冰精灵",path:"ice1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5011,name: "冰精灵",path:"ice1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5012: {
-      uuid:5012,name: "船长",path:"cz1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5012,name: "船长",path:"cz1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5013: {
-      uuid:5013,name: "风暴斧",path:"ft1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5013,name: "风暴斧",path:"ft1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5014: {
-      uuid:5014,name: "召唤师",path:"zh1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5014,name: "召唤师",path:"zh1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5015: {
-      uuid:5015,name: "死灵法师",path:"zh2",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
-      lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6013,6013,6013,6013,6013,6013],sk3:[6013,6013,6013,6013,6013,6013],pw:100,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      uuid:5015,name: "死灵法师",path:"zh2",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
+      lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6017,6013,6013,6013,6013,6013],sk3:[6013,6013,6013,6013,6013,6013],pw:100,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5016: {
-      uuid:5016,name: "下忍",path:"n1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5016,name: "下忍",path:"n1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
@@ -164,28 +164,28 @@ export const HeroInfo = {
    },
 
    5017: {
-      uuid:5017,name: "德鲁伊",path:"d1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5017,name: "德鲁伊",path:"d1",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5018: {
-      uuid:5018,name: "猎人",path:"d2",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5018,name: "野兽德鲁伊",path:"d2",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5019: {
-      uuid:5019,name: "狙击手",path:"a4",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
-      lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
+      uuid:5019,name: "狙击手",path:"a4",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
+      lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6020,6020,6020,6020,6020,6020],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5020: {
-      uuid:5020,name: "亚瑟王",path:"k5",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5,
+      uuid:5020,name: "亚瑟王",path:"k5",quality:3,kind:2,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
@@ -290,21 +290,21 @@ export const HeroInfo = {
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5213: {
-      uuid: 5213,name: "骷髅射手",  path: "mkla1", quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:250,a_cd:1.5,
+      uuid: 5213,name: "骷髅射手",  path: "mkla1", quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5214: {
-      uuid: 5214,name: "骷髅射手",  path: "mkla2", quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:250,a_cd:1.5,
+      uuid: 5214,name: "骷髅射手",  path: "mkla2", quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
       tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5215: {
-      uuid: 5215,name: "骷髅射手",  path: "mkla3", quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:250,a_cd:1.5,
+      uuid: 5215,name: "骷髅射手",  path: "mkla3", quality:1,kind:1,type:1,hp:2000,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,a_cd:1.5,
       lvexp:100,slvexp:10,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
       akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts
index 85d80859..79503357 100644
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -237,6 +237,26 @@ export class HeroViewComp extends CCComp {
         this.move(dt);
     }   
 
+    //移动
+    move(dt: number){
+        if(this.stop_cd > 0||smc.mission.is_victory||smc.mission.is_defeat){
+            this.status_change("idle")
+            return
+        }
+        if (this.node.position.x >= 300 && this.scale==1) {
+            return;
+        }
+        if(this.scale===-1&&this.node.position.x <= -300){
+            return;
+        }
+        this.status_change("move")
+        
+        
+        // if(this.enemy){
+        //     return
+        // }
+        this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z);
+    }
     check_mission_buff(){
         this.ap_max=(100+smc.vmdata.mission.ap)/100*this.ap
         this.crit_max=(100+smc.vmdata.mission.crit)/100*this.crit
@@ -252,7 +272,7 @@ export class HeroViewComp extends CCComp {
         }
     }
     check_enemy_alive(){
-        let dir = 320
+        let dir = 720
         let enemys=smc.enemy_pos
         this.enemy = v3(720,this.node.position.y)
         if(this.box_group == BoxSet.MONSTER){
@@ -290,26 +310,6 @@ export class HeroViewComp extends CCComp {
             // this.as.change_default("move")
         }
     }
-    //移动
-    move(dt: number){
-        if(this.stop_cd > 0||smc.mission.is_victory||smc.mission.is_defeat){
-            this.status_change("idle")
-            return
-        }
-        if (this.node.position.x >= 300 && this.scale==1) {
-            return;
-        }
-        if(this.scale===-1&&this.node.position.x <= -300){
-            return;
-        }
-        this.status_change("move")
-        
-        
-        // if(this.enemy){
-        //     return
-        // }
-        this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z);
-    }
 
     skill_pos(){
         return v3((this.node.position.x,this.node.position.y + 35))
@@ -355,6 +355,8 @@ export class HeroViewComp extends CCComp {
         if(is_crit){
             l_hp = l_hp * (150+crit_add)/100
         }
+        let luck = RandomManager.instance.getRandomInt(-10,10)
+        l_hp=l_hp*(100+luck)/100
         return Math.ceil(l_hp)
     }
     check_debuff(skill:any,l_hp:number=0){
@@ -531,69 +533,31 @@ export class HeroViewComp extends CCComp {
 
         switch (SkillSet[skill].tg) {
             case 0: //自己
-                this.to_add_buff(this.node.getComponent(HeroViewComp),skill)
+                this.do_add_buff(this.node.getComponent(HeroViewComp),skill)
                 break;
             case 1: //伙伴
-                this.push_least_buff(skill)
+                this.check_other_buff(skill)
                 break;
             case 2: //自己和伙伴
-             
-                this.to_all_buff(skill)
+                this.do_all_buff(skill)
                 break;
             case 3: //敌人
                 this.shoot_enemy(skill)
                 break;
             case 4: //敌人和自己
-                this.to_add_buff(this.node.getComponent(HeroViewComp),skill)
+                this.do_add_buff(this.node.getComponent(HeroViewComp),skill)
                 this.shoot_enemy(skill)
                 break;    
         }
     }
-    to_all_buff(sk:number){
+    
 
-    }
-    shoot_enemy(sk:number,y:number=0,x:number=0){
-        // console.log("mon shoot_enemy");
-        let skill = ecs.getEntity<Skill>(Skill);
-        let t_pos=this.get_enemy_pos()
-        let pos =this.skill_pos()
-        pos.y=this.node.position.y + y
-        pos.x=this.node.position.x + x
-        let is_crit=this.check_crit()
-        skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add);
-        console.log(this.scale+this.hero_name+"使用技能:"+sk+" t_pos:"+t_pos+" box:"+this.box_group,);
-    }
-    to_add_buff(hero:any,sk:number){
-        let skill = ecs.getEntity<Skill>(Skill);
-        let t_pos=this.get_hero_pos(hero)
-        let pos = this.skill_pos()
-        console.log("to_add_buff:"+hero.hero_name+"  "+sk);
-        let is_crit=this.check_crit()
-        skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add);
-        console.log(this.scale+this.hero_name+"使用buff:"+sk+" t_pos:"+t_pos+" box:"+this.box_group,);
-
-        if(SkillSet[sk].hp > 0){  //buff加血
-            let increase_hp=Math.floor(SkillSet[sk].hp*this.ap_max)
-            hero.add_hp(increase_hp)
-        }
-        if(SkillSet[sk].apup > 0){  //buff加攻击
-            let increase_atk=Math.floor(SkillSet[sk].apup*this.ap_max)
-            hero.add_ap(increase_atk)
-        }
-
-        if(SkillSet[sk].shield > 0){ //buff护盾
-            hero.add_shield(SkillSet[sk].shield)
-        }
-
-    }
-
-    push_least_buff(skill:number){
+    check_other_buff(skill:number){
         let heros:any = ecs.query(ecs.allOf(HeroModelComp));
         let least_hp:number=0
         let t_hero:any= null
         if (heros.length > 0) {
             if(SkillSet[skill].type==92){   //随机添加buff
-
                 let i = RandomManager.instance.getRandomInt(0,heros.length-1,3)
                 while(!heros[i].HeroView){
                     i = RandomManager.instance.getRandomInt(0,heros.length-1,3)
@@ -601,7 +565,7 @@ export class HeroViewComp extends CCComp {
                         break
                     }
                 }
-                this.to_add_buff(heros[i].HeroView,skill)
+                this.do_add_buff(heros[i].HeroView,skill)
             }else{
                 for (let i = 0; i < heros.length; i++) {
                     if(!heros[i].HeroView) continue
@@ -611,14 +575,11 @@ export class HeroViewComp extends CCComp {
                             least_hp = (hero.rhp_max-hero.hp)
                             t_hero = hero
                         }
-                    }else{  //群体
-                        this.to_add_buff(hero,skill)
-                    }   
-                    
+                    } 
+                    //todo 最前排   最后排  远程   近战  辅助
                 }
-                if(t_hero){  //血量最少单体
-                    
-                    this.to_add_buff(t_hero,skill)
+                if(t_hero){  //存在目标
+                    this.do_add_buff(t_hero,skill)
                 }
                 
             }
@@ -626,7 +587,42 @@ export class HeroViewComp extends CCComp {
         }
 
     }
-    
+    do_all_buff(sk:number){
+        let skill = ecs.getEntity<Skill>(Skill);
+        let t_pos=v3(-320,0)
+        if(this.box_group==BoxSet.MONSTER){
+            t_pos=v3(320,0)
+        }
+        let pos = t_pos
+        this.to_console("to_all_buff:"+sk)
+        let is_crit=this.check_crit()
+        skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add);
+        this.to_console("使用buff:"+sk+" t_pos:"+t_pos+" box:"+this.box_group);
+    }
+    shoot_enemy(sk:number,y:number=0,x:number=0){
+        // console.log("mon shoot_enemy");
+        let skill = ecs.getEntity<Skill>(Skill);
+        let t_pos=this.get_enemy_pos()
+        if(SkillSet[sk].type==81){
+            //获取最远敌军位置
+        }
+        let pos =this.skill_pos()
+        pos.y=this.node.position.y + y
+        pos.x=this.node.position.x + x
+        let is_crit=this.check_crit()
+        skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add);
+        this.to_console(this.scale+this.hero_name+"使用技能:"+sk+" t_pos:"+t_pos+" box:"+this.box_group,);
+    }
+    do_add_buff(hero:any,sk:number){
+        let skill = ecs.getEntity<Skill>(Skill);
+        let t_pos=this.get_hero_pos(hero)
+        let pos = this.skill_pos()
+        this.to_console("do_add_buff:"+hero.hero_name+"  "+sk);
+        let is_crit=this.check_crit()
+        skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add);
+        this.to_console(this.scale+this.hero_name+"使用buff:"+sk+" t_pos:"+t_pos+" box:"+this.box_group,);
+    }
+
     exp_add(exp:number=0){
         if(this.box_group==BoxSet.HERO){
             smc.vmdata.mission.exp +=exp
@@ -644,7 +640,7 @@ export class HeroViewComp extends CCComp {
      * @param time 可选参数，表示增加行动点数的时间，默认为0。
      */
     add_ap(ap: number){
-        this.ap += ap;
+        this.ap += Math.floor(ap);
     }
     add_shield(shield:number){
         this.shield =shield
@@ -652,38 +648,32 @@ export class HeroViewComp extends CCComp {
     }
     add_hp(hp: number=0){
         this.BUFFCOMP.heathed();
-        this.hp+=hp;
+        this.hp+=Math.floor(hp);
         if(this.hp > this.rhp_max){
             this.hp = this.rhp_max;
         }
         this.BUFFCOMP.tooltip(2,hp.toFixed(0));
     }
     add_hp_max(hp: number=0){
-        this.BUFFCOMP.show_buff(1)
-        this.hp +=  hp/100*this.hp_max;                
+        this.BUFFCOMP.show_buff(0.5)
+        this.hp += Math.floor(hp/100*this.hp_max) ;                
     }
     hp_less(hp: number,is_crit:boolean=false){
-        if(this.is_dead){
-            return;
-        }
-        this.hp -= hp;
+        if(this.is_dead) return
+        hp=Math.floor(hp)
+        this.hp -= hp
         if(is_crit){
             this.BUFFCOMP.tooltip(4,hp.toFixed(0),250);
         }else{
             this.BUFFCOMP.tooltip(1,hp.toFixed(0),250);
         }
-        
         if(this.hp > this.rhp_max){
             this.hp = this.rhp_max;
         }
-
         if(this.hp <= 0){
             this.dead();
             this.to_grave()
             this.is_dead = true;
-            // setTimeout(() => {
-            //     this.ent.destroy();
-            // }, 15);     
         }
     }
     /** 静止时间 */
@@ -720,7 +710,6 @@ export class HeroViewComp extends CCComp {
             smc.vmdata.mission.dead +=1
         }
         this.node.setPosition(pos)
-        
     }
     //是否在墓地
     in_grave(){
@@ -730,6 +719,10 @@ export class HeroViewComp extends CCComp {
         let pos =v3(HeroSet.StartPos[this.type],this.node.position.y,this.node.position.z)
         this.node.setPosition(pos)
     }   
+    
+    to_console(value:any){
+        console.log("["+this.scale+this.hero_name+']'+value) 
+     }
     reset() {
         this.is_dead = false;
         this.node.destroy();
diff --git a/assets/script/game/skills/BuffCom.ts b/assets/script/game/skills/BuffCom.ts
new file mode 100644
index 00000000..49e922d4
--- /dev/null
+++ b/assets/script/game/skills/BuffCom.ts
@@ -0,0 +1,35 @@
+import { _decorator, Component, Node, tween, Vec3 } from 'cc';
+import { SkillCom } from './SkillCom';
+import { HeroViewComp } from '../hero/HeroViewComp';
+import { smc } from '../common/SingletonModuleComp';
+const { ccclass, property } = _decorator;
+
+@ccclass('BuffCom')
+export class BuffCom extends Component {
+    cd:number = 0;
+    base:SkillCom = null
+    start() {
+        this.base =this.node.getComponent(SkillCom)
+        tween(this.node).to( this.base.in_time,
+            { position: new Vec3(this.node.position.x,this.node.position.y) },
+            {
+                onComplete: (target?: object) => {   
+                    this.base.is_destroy=true
+                },
+            }  
+        ).start();  
+    }
+
+    update(deltaTime: number) {
+        if(smc.mission.pause) return
+        this.cd+=deltaTime
+        if(this.cd>=this.base.cd){
+            // this.node.setPosition(v3(-1000,0,0))
+            this.node.active = false            
+            this.node.active = true
+            this.cd=0
+        }
+    }
+}
+
+
diff --git a/assets/script/game/skills/BuffCom.ts.meta b/assets/script/game/skills/BuffCom.ts.meta
new file mode 100644
index 00000000..2f721691
--- /dev/null
+++ b/assets/script/game/skills/BuffCom.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "38c6979b-18f3-46b3-9834-c1c9a3347a91",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts
index 9e031f60..211fc525 100644
--- a/assets/script/game/skills/Skill.ts
+++ b/assets/script/game/skills/Skill.ts
@@ -46,6 +46,7 @@ export class Skill extends ecs.Entity {
             sv.s_name = SkillSet[uuid].name;
             sv.ap = ap*SkillSet[uuid].ap;
             sv.cd = SkillSet[uuid].cd;
+            sv.tg = SkillSet[uuid].tg;
             sv.debtime = SkillSet[uuid].debtime;
             sv.debuff = SkillSet[uuid].debuff;
             sv.depb = SkillSet[uuid].depb;
diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts
index b9f5d694..3b79753b 100644
--- a/assets/script/game/skills/SkillCom.ts
+++ b/assets/script/game/skills/SkillCom.ts
@@ -7,6 +7,7 @@ import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/
 import { HeroViewComp } from "../hero/HeroViewComp";
 import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
 import { GameEvent } from "../common/config/GameEvent";
+import { SkillSet } from "../common/config/SkillSet";
 
 
 const { ccclass, property } = _decorator;
@@ -34,6 +35,7 @@ export class SkillCom extends CCComp {
     box_group:number = 0;
     box_tag:number=0;
     type:number = 1;
+    tg:number = 3;
     in_time:number = 0.3; // 不动技能持续时间
     enemys:any = [];
     start() {
@@ -46,19 +48,19 @@ export class SkillCom extends CCComp {
         if (collider) {
             collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
             // collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
-            collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
+            // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
         }
 
     }
-    onBeginContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) {
-        if(otherCollider.group != selfCollider.group&&otherCollider.tag ==0){
+    onBeginContact (seCol: Collider2D, otCol: Collider2D, contact: IPhysics2DContact | null) {
+        if(otCol.group != seCol.group&&otCol.tag ==0){
             this.atk_count+=1
-            // console.log("skill onBeginContact",otherCollider.node.getComponent(HeroViewComp).uuid)
-            // let uid=otherCollider.node.getComponent(HeroViewComp).uuid
+            // console.log("skill onBeginContact",otCol.node.getComponent(HeroViewComp).uuid)
+            // let uid=otCol.node.getComponent(HeroViewComp).uuid
             // const count = this.enemys.filter(enemy => enemy.uid === uid).length;
             // if(count==0){
-            //     // otherCollider.node.getComponent(HeroViewComp).check_uatk(this)
-            //     console.log("count==0",otherCollider.node.getComponent(HeroViewComp).uuid)
+            //     // otCol.node.getComponent(HeroViewComp).check_uatk(this)
+            //     console.log("count==0",otCol.node.getComponent(HeroViewComp).uuid)
             //     this.enemys.push(uid)
             // }
             
@@ -66,13 +68,35 @@ export class SkillCom extends CCComp {
             if(this.type==1 ){
                 this.is_destroy=true
             }
-            // console.log("skill onBeginContact",selfCollider.group,otherCollider.group)
+            // console.log("skill onBeginContact",seCol.group,otCol.group)
             // if(this.type==1 ){
             //     this.is_destroy=true
             // }
         }
+        if(otCol.group == seCol.group&&otCol.tag ==0&&this.tg==2){
+            this.to_console("skill onBeginContact 是对自己人的buff",seCol,otCol)
+            this.do_buff(otCol.node.getComponent(HeroViewComp))
+        }
     }
-    onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) {
+    to_console(value:any,value2:any=null,value3:any=null){
+        console.log("["+this.s_name+this.s_uuid+"]:",value,value2,value3)
+    }
+
+    do_buff(hero:any){
+        this.to_console(" do_buff hero: ",hero)
+        if(SkillSet[this.s_uuid].hp > 0){  //buff加血
+            let increase_hp=Math.floor(SkillSet[this.s_uuid].hp*this.ap/(this.in_time/this.cd))
+            hero.add_hp(increase_hp)
+        }
+
+        if(SkillSet[this.s_uuid].apup > 0){  //buff加攻击
+            let increase_atk=Math.floor(SkillSet[this.s_uuid].apup*this.ap/(this.in_time/this.cd))
+            hero.add_ap(increase_atk)
+        }
+
+        if(SkillSet[this.s_uuid].shield > 0){ //buff护盾
+            hero.add_shield(SkillSet[this.s_uuid].shield/(this.in_time/this.cd))
+        }
 
     }
     update(deltaTime: number) {
diff --git a/assets/script/game/skills/TgLineCom.ts b/assets/script/game/skills/TgLineCom.ts
new file mode 100644
index 00000000..4f67d6f0
--- /dev/null
+++ b/assets/script/game/skills/TgLineCom.ts
@@ -0,0 +1,14 @@
+import { _decorator, Component, Node } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('TgLineCom')
+export class TgLineCom extends Component {
+    start() {
+
+    }
+
+    update(deltaTime: number) {
+        
+    }
+}
+

diff --git a/assets/script/game/skills/TgLineCom.ts.meta b/assets/script/game/skills/TgLineCom.ts.meta
new file mode 100644
index 00000000..b205b3f5
--- /dev/null
+++ b/assets/script/game/skills/TgLineCom.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "b7a2bf85-f71f-4c4c-bda0-e13e8730dd43",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/script/game/skills/seCom.ts b/assets/script/game/skills/seCom.ts
new file mode 100644
index 00000000..b662b563
--- /dev/null
+++ b/assets/script/game/skills/seCom.ts
@@ -0,0 +1,21 @@
+import { _decorator, Component, Node } from 'cc';
+import { SkillCom } from './SkillCom';
+import { SkillSet } from '../common/config/SkillSet';
+const { ccclass, property } = _decorator;
+
+@ccclass('seCom')
+export class seCom extends Component {    
+    base:SkillCom = null
+
+    start() {
+        this.base =this.node.getComponent(SkillCom)
+    }
+
+    update(deltaTime: number) {
+        if (this.base.is_destroy) {
+            console.log("执行第二技能",SkillSet[this.base.s_uuid].sonsk)
+        }
+    }
+}
+
+
diff --git a/assets/script/game/skills/seCom.ts.meta b/assets/script/game/skills/seCom.ts.meta
new file mode 100644
index 00000000..511354f9
--- /dev/null
+++ b/assets/script/game/skills/seCom.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "f5c0a714-f53b-40e4-9046-39b30f3997b7",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}