dd

assets/resources/game/heros/a1.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/a2.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/a3.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/k1.prefab

@@ -44,28 +44,31 @@
       },
       {
         "__id__": 82
+      },
+      {
+        "__id__": 91
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 91
-      },
-      {
-        "__id__": 93
-      },
-      {
-        "__id__": 95
-      },
-      {
-        "__id__": 97
-      },
       {
         "__id__": 99
+      },
+      {
+        "__id__": 101
+      },
+      {
+        "__id__": 103
+      },
+      {
+        "__id__": 105
+      },
+      {
+        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 109
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -315,7 +318,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -4.526,
+      "y": -0.07,
       "z": 0
     }
   },
@@ -1003,7 +1006,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }
@@ -1401,6 +1404,174 @@
     ],
     "value": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "buff_add",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 92
+      },
+      {
+        "__id__": 94
+      },
+      {
+        "__id__": 96
+      }
+    ],
+    "_prefab": {
+      "__id__": 98
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.7,
+      "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__": 91
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 93
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 106.70999908447266,
+      "height": 108
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5000468659746804,
+      "y": 0.11898148501360858
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "92iyOUSpROt5I/Qbr0n0VR"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 91
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 95
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_skeletonData": {
+      "__uuid__": "af716091-7de8-4a09-9f4e-bb7c9c40d0db",
+      "__expectedType__": "sp.SkeletonData"
+    },
+    "defaultSkin": "default",
+    "defaultAnimation": "show",
+    "_premultipliedAlpha": true,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a32g1O2bxLI6D28EOYFjld"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 91
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 97
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20Q1ZTb3VN+IH3gAk13P9s"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "733PKzwANLyJWD2ume4u5f",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1411,7 +1582,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 100
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1439,7 +1610,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 102
     },
     "enabledContactListener": true,
     "bullet": true,
@@ -1473,7 +1644,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 96
+      "__id__": 104
     },
     "tag": 0,
     "_group": 4,
@@ -1507,7 +1678,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 106
     },
     "anm": {
       "__id__": 37
@@ -1528,7 +1699,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 108
     },
     "_id": ""
   },

assets/resources/game/heros/k2.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/k3.prefab

@@ -34,38 +34,38 @@
         "__id__": 40
       },
       {
-        "__id__": 52
+        "__id__": 55
       },
       {
-        "__id__": 63
+        "__id__": 66
       },
       {
-        "__id__": 72
+        "__id__": 75
       },
       {
-        "__id__": 82
+        "__id__": 85
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 94
       },
       {
-        "__id__": 93
+        "__id__": 96
       },
       {
-        "__id__": 95
+        "__id__": 98
       },
       {
-        "__id__": 97
+        "__id__": 100
       },
       {
-        "__id__": 99
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -743,6 +743,12 @@
       },
       {
         "__id__": 51
+      },
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 53
       }
     ],
     "removedComponents": []
@@ -854,6 +860,32 @@
       "z": 1
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 44
+    },
+    "propertyPath": [
+      "_layer"
+    ],
+    "value": 1
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 54
+    },
+    "propertyPath": [
+      "_layer"
+    ],
+    "value": 1
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "7a5LvbdlxEc6FKa7cun2oB"
+    ]
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -861,14 +893,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 53
+      "__id__": 56
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 52
+      "__id__": 55
     },
     "asset": {
       "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -876,7 +908,7 @@
     },
     "fileId": "5fqU0L3/FOhKaco5UkHuWT",
     "instance": {
-      "__id__": 54
+      "__id__": 57
     },
     "targetOverrides": null
   },
@@ -889,23 +921,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 55
-      },
-      {
-        "__id__": 57
-      },
       {
         "__id__": 58
       },
-      {
-        "__id__": 59
-      },
       {
         "__id__": 60
       },
+      {
+        "__id__": 61
+      },
       {
         "__id__": 62
+      },
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 65
       }
     ],
     "removedComponents": []
@@ -913,7 +945,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 59
     },
     "propertyPath": [
       "_name"
@@ -929,7 +961,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 59
     },
     "propertyPath": [
       "_lpos"
@@ -944,7 +976,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 59
     },
     "propertyPath": [
       "_lrot"
@@ -960,7 +992,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 59
     },
     "propertyPath": [
       "_euler"
@@ -975,7 +1007,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 61
+      "__id__": 64
     },
     "propertyPath": [
       "_lpos"
@@ -996,14 +1028,14 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 59
     },
     "propertyPath": [
       "_lscale"
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }
@@ -1015,14 +1047,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 64
+      "__id__": 67
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 63
+      "__id__": 66
     },
     "asset": {
       "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1030,7 +1062,7 @@
     },
     "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
     "instance": {
-      "__id__": 65
+      "__id__": 68
     },
     "targetOverrides": null
   },
@@ -1043,20 +1075,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 66
-      },
-      {
-        "__id__": 68
-      },
       {
         "__id__": 69
       },
       {
-        "__id__": 70
+        "__id__": 71
       },
       {
-        "__id__": 71
+        "__id__": 72
+      },
+      {
+        "__id__": 73
+      },
+      {
+        "__id__": 74
       }
     ],
     "removedComponents": []
@@ -1064,7 +1096,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 67
+      "__id__": 70
     },
     "propertyPath": [
       "_name"
@@ -1080,7 +1112,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 67
+      "__id__": 70
     },
     "propertyPath": [
       "_lpos"
@@ -1095,7 +1127,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 67
+      "__id__": 70
     },
     "propertyPath": [
       "_lrot"
@@ -1111,7 +1143,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 67
+      "__id__": 70
     },
     "propertyPath": [
       "_euler"
@@ -1126,7 +1158,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 67
+      "__id__": 70
     },
     "propertyPath": [
       "_active"
@@ -1140,14 +1172,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 73
+      "__id__": 76
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 72
+      "__id__": 75
     },
     "asset": {
       "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1155,7 +1187,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 74
+      "__id__": 77
     },
     "targetOverrides": null
   },
@@ -1168,23 +1200,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 75
-      },
-      {
-        "__id__": 77
-      },
       {
         "__id__": 78
       },
-      {
-        "__id__": 79
-      },
       {
         "__id__": 80
       },
       {
         "__id__": 81
+      },
+      {
+        "__id__": 82
+      },
+      {
+        "__id__": 83
+      },
+      {
+        "__id__": 84
       }
     ],
     "removedComponents": []
@@ -1192,7 +1224,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 79
     },
     "propertyPath": [
       "_name"
@@ -1208,7 +1240,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 79
     },
     "propertyPath": [
       "_lpos"
@@ -1223,7 +1255,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 79
     },
     "propertyPath": [
       "_lrot"
@@ -1239,7 +1271,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 79
     },
     "propertyPath": [
       "_euler"
@@ -1254,7 +1286,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 79
     },
     "propertyPath": [
       "_lscale"
@@ -1269,7 +1301,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 79
     },
     "propertyPath": [
       "_active"
@@ -1283,14 +1315,14 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 83
+      "__id__": 86
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 82
+      "__id__": 85
     },
     "asset": {
       "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1298,7 +1330,7 @@
     },
     "fileId": "91yoyAQGNDm5ziI7NUChZ+",
     "instance": {
-      "__id__": 84
+      "__id__": 87
     },
     "targetOverrides": null
   },
@@ -1311,20 +1343,20 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 85
-      },
-      {
-        "__id__": 87
-      },
       {
         "__id__": 88
       },
       {
-        "__id__": 89
+        "__id__": 90
       },
       {
-        "__id__": 90
+        "__id__": 91
+      },
+      {
+        "__id__": 92
+      },
+      {
+        "__id__": 93
       }
     ],
     "removedComponents": []
@@ -1332,7 +1364,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 89
     },
     "propertyPath": [
       "_name"
@@ -1348,7 +1380,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 89
     },
     "propertyPath": [
       "_lpos"
@@ -1363,7 +1395,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 89
     },
     "propertyPath": [
       "_lrot"
@@ -1379,7 +1411,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 89
     },
     "propertyPath": [
       "_euler"
@@ -1394,7 +1426,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 86
+      "__id__": 89
     },
     "propertyPath": [
       "_active"
@@ -1411,7 +1443,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 95
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1439,7 +1471,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 97
     },
     "enabledContactListener": true,
     "bullet": true,
@@ -1473,7 +1505,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 96
+      "__id__": 99
     },
     "tag": 0,
     "_group": 4,
@@ -1507,7 +1539,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 101
     },
     "anm": {
       "__id__": 37
@@ -1528,7 +1560,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 103
     },
     "_id": ""
   },
@@ -1549,16 +1581,16 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 82
+        "__id__": 85
       },
       {
-        "__id__": 72
+        "__id__": 75
       },
       {
-        "__id__": 63
+        "__id__": 66
       },
       {
-        "__id__": 52
+        "__id__": 55
       },
       {
         "__id__": 40

assets/resources/game/heros/mor1.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/mor2.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/mor3.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/heros/pd1.prefab

@@ -1003,7 +1003,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1,
       "y": 1,
       "z": 1
     }

assets/resources/game/skills/atked.prefab

@@ -102,8 +102,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 1.5,
-      "y": 1,
+      "y": 1.5,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skills/atked/atked.anim

@@ -86,7 +86,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0.30000001192092896,
+        "value": 0.3,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,
@@ -127,7 +127,7 @@
         "__type__": "cc.RealKeyframeValue",
         "interpolationMode": 0,
         "tangentWeightMode": 0,
-        "value": 0.30000001192092896,
+        "value": 0.4000000059604645,
         "rightTangent": 0,
         "rightTangentWeight": 1,
         "leftTangent": 0,

assets/resources/game/skills/buff/ap_up.atlas

@@ -0,0 +1,34 @@
+
+ap_up.png
+size: 123,80
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+buff_0
+  rotate: false
+  xy: 2, 2
+  size: 76, 76
+  orig: 82, 82
+  offset: 3, 3
+  index: -1
+buff_1_1
+  rotate: false
+  xy: 80, 2
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1
+buff_1_3
+  rotate: false
+  xy: 80, 2
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1
+buff_1_2
+  rotate: false
+  xy: 80, 37
+  size: 41, 41
+  orig: 82, 81
+  offset: 21, 20
+  index: -1

assets/resources/game/skills/buff/ap_up.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "0b8a49e6-8eeb-446f-bb1d-810553ff7cfe",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/ap_up.json

@@ -0,0 +1,90 @@
+{
+"skeleton": {
+	"hash": "FNNmwbijC7nZIvTsWlu3NlBldhM=",
+	"spine": "3.8.75",
+	"x": -32.8,
+	"y": -32.8,
+	"width": 65.6,
+	"height": 65.6,
+	"images": "./images/",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root", "scaleX": 0.8, "scaleY": 0.8 },
+	{ "name": "main", "parent": "root", "rotation": 43.44 },
+	{ "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+	{ "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+	{ "name": "bone", "parent": "root" }
+],
+"slots": [
+	{ "name": "buff_0_1", "bone": "root" },
+	{ "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+	{ "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+	{ "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+	{ "name": "buff_1_2", "bone": "main", "attachment": "buff_1_2" },
+	{ "name": "buff_1_4", "bone": "main", "attachment": "buff_1_2", "blend": "screen" },
+	{ "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+	{ "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"buff_0": {
+				"buff_0": { "width": 82, "height": 82 }
+			},
+			"buff_1_1": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_2": {
+				"buff_1_2": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 82, "height": 81 }
+			},
+			"buff_1_3": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_4": {
+				"buff_1_2": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 82, "height": 81 }
+			},
+			"buff_1_5": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_6": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			}
+		}
+	}
+],
+"animations": {
+	"loop": {
+		"bones": {
+			"bone2": {
+				"scale": [
+					{ "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333, "x": 0.929, "y": 0.929 }
+				]
+			},
+			"bone3": {
+				"scale": [
+					{ "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.1, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.9333, "x": 1.057, "y": 1.057 }
+				]
+			},
+			"root": {
+				"translate": [
+					{ "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/buff/ap_up.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "e53bbef1-7515-4aed-ab0b-4fb1bfb2c906",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/ap_up.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "70a3d41b-f33f-4e61-8683-290204a2ea6d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "70a3d41b-f33f-4e61-8683-290204a2ea6d@6c48a",
+      "displayName": "ap_up",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "70a3d41b-f33f-4e61-8683-290204a2ea6d",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "70a3d41b-f33f-4e61-8683-290204a2ea6d@6c48a"
+  }
+}

assets/resources/game/skills/buff/baiqi.atlas

@@ -0,0 +1,41 @@
+
+baiqi.png
+size: 169,217
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+图层 1
+  rotate: false
+  xy: 2, 48
+  size: 165, 42
+  orig: 195, 199
+  offset: 11, 77
+  index: -1
+图层 2
+  rotate: false
+  xy: 2, 2
+  size: 157, 44
+  orig: 195, 199
+  offset: 24, 77
+  index: -1
+图层 3
+  rotate: false
+  xy: 2, 176
+  size: 158, 39
+  orig: 195, 199
+  offset: 16, 77
+  index: -1
+图层 4
+  rotate: false
+  xy: 2, 134
+  size: 150, 40
+  orig: 195, 199
+  offset: 21, 77
+  index: -1
+图层 5
+  rotate: false
+  xy: 2, 92
+  size: 161, 40
+  orig: 195, 199
+  offset: 16, 77
+  index: -1

assets/resources/game/skills/buff/baiqi.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "bf00ddf5-681f-454e-8b56-8f2fd5f49006",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/baiqi.json

@@ -0,0 +1,68 @@
+{
+"skeleton": { "hash": "aiACg+2Kezlndge7x6TK3wT4iYM=", "spine": "3.8.75", "images": "./images/", "audio": "C:\\Users\\25141\\Desktop\\buff\\buff_97" },
+"bones": [
+	{ "name": "root", "scaleX": 0.4, "scaleY": 0.4 },
+	{ "name": "bone2", "parent": "root", "y": -8.73, "scaleX": 1.4989, "scaleY": 1.4989 }
+],
+"slots": [
+	{ "name": "图层 1", "bone": "bone2", "blend": "screen" },
+	{ "name": "图层 2", "bone": "bone2", "color": "ffffff3c", "blend": "additive" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"图层 1": {
+				"图层 1": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 2": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 3": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 4": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 5": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 }
+			},
+			"图层 2": {
+				"图层 1": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 2": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 3": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 4": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+				"图层 5": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 }
+			}
+		}
+	}
+],
+"animations": {
+	"loop": {
+		"slots": {
+			"图层 2": {
+				"attachment": [
+					{ "name": "图层 1" },
+					{ "time": 0.0667, "name": "图层 2" },
+					{ "time": 0.1333, "name": "图层 3" },
+					{ "time": 0.2, "name": "图层 4" },
+					{ "time": 0.2667, "name": "图层 5" },
+					{ "time": 0.3333, "name": "图层 1" },
+					{ "time": 0.4, "name": "图层 2" },
+					{ "time": 0.4667, "name": "图层 3" },
+					{ "time": 0.5333, "name": "图层 4" },
+					{ "time": 0.6, "name": "图层 5" },
+					{ "time": 0.6667, "name": "图层 1" }
+				]
+			},
+			"图层 1": {
+				"attachment": [
+					{ "name": "图层 1" },
+					{ "time": 0.0667, "name": "图层 2" },
+					{ "time": 0.1333, "name": "图层 3" },
+					{ "time": 0.2, "name": "图层 4" },
+					{ "time": 0.2667, "name": "图层 5" },
+					{ "time": 0.3333, "name": "图层 1" },
+					{ "time": 0.4, "name": "图层 2" },
+					{ "time": 0.4667, "name": "图层 3" },
+					{ "time": 0.5333, "name": "图层 4" },
+					{ "time": 0.6, "name": "图层 5" },
+					{ "time": 0.6667, "name": "图层 1" }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/buff/baiqi.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "3ad5c35e-0872-46d6-a974-561ada3589d8",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/baiqi.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c584cddd-5f6b-4fed-b081-d5347d11d2c5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c584cddd-5f6b-4fed-b081-d5347d11d2c5@6c48a",
+      "displayName": "baiqi",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c584cddd-5f6b-4fed-b081-d5347d11d2c5",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c584cddd-5f6b-4fed-b081-d5347d11d2c5@6c48a"
+  }
+}

assets/resources/game/skills/buff/baoqi.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "2ac31d0b-0c4f-43f9-b584-03a46484108a",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/buff_add.atlas

@@ -0,0 +1,62 @@
+
+buff_add.png
+size: 291,185
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+tl0019
+  rotate: true
+  xy: 175, 8
+  size: 42, 47
+  orig: 150, 99
+  offset: 93, 42
+  index: -1
+tl0020
+  rotate: false
+  xy: 122, 112
+  size: 115, 71
+  orig: 150, 99
+  offset: 22, 17
+  index: -1
+tl0021
+  rotate: false
+  xy: 2, 110
+  size: 118, 73
+  orig: 150, 99
+  offset: 19, 15
+  index: -1
+tl0022
+  rotate: false
+  xy: 122, 52
+  size: 113, 58
+  orig: 150, 99
+  offset: 19, 13
+  index: -1
+tl0023
+  rotate: true
+  xy: 239, 94
+  size: 89, 50
+  orig: 150, 99
+  offset: 18, 13
+  index: -1
+tl0024
+  rotate: false
+  xy: 110, 3
+  size: 63, 47
+  orig: 150, 99
+  offset: 18, 13
+  index: -1
+tl0025
+  rotate: false
+  xy: 237, 43
+  size: 52, 49
+  orig: 150, 99
+  offset: 17, 14
+  index: -1
+光柱2
+  rotate: false
+  xy: 2, 2
+  size: 106, 106
+  orig: 108, 108
+  offset: 1, 1
+  index: -1

assets/resources/game/skills/buff/buff_add.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "247880a1-480a-496e-ad6e-f26d65403301",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/buff_add.json

@@ -0,0 +1,124 @@
+{
+"skeleton": {
+	"hash": "ocvFvvgx79LvV8lxsuBjdnnkDN4=",
+	"spine": "3.8.75",
+	"x": -53.36,
+	"y": -12.85,
+	"width": 106.71,
+	"height": 108,
+	"images": "./images/",
+	"audio": "C:\\Users\\25141\\Desktop\\buff\\buff_93"
+},
+"bones": [
+	{ "name": "root" },
+	{ "name": "bone", "parent": "root", "rotation": 25.77, "x": 6.55, "y": 14.28, "scaleX": -1 },
+	{ "name": "bone2", "parent": "root", "rotation": 25.77, "x": 6.55, "y": 44.28, "scaleX": -1 },
+	{ "name": "bone3", "parent": "root", "rotation": 25.77, "x": 6.55, "y": 74.28, "scaleX": -1 },
+	{ "name": "bone4", "parent": "root", "scaleX": 0.9881 }
+],
+"slots": [
+	{ "name": "光柱2", "bone": "bone4", "color": "ffe80000", "attachment": "光柱2", "blend": "additive" },
+	{ "name": "tl0019", "bone": "bone" },
+	{ "name": "tl19", "bone": "bone2" },
+	{ "name": "tl20", "bone": "bone3" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"tl0019": {
+				"tl0019": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0020": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0021": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0022": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0023": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0024": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0025": { "y": 0.5, "width": 150, "height": 99 }
+			},
+			"tl19": {
+				"tl0019": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0020": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0021": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0022": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0023": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0024": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0025": { "y": 0.5, "width": 150, "height": 99 }
+			},
+			"光柱2": {
+				"光柱2": { "y": 41.15, "width": 108, "height": 108 }
+			},
+			"tl20": {
+				"tl0019": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0020": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0021": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0022": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0023": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0024": { "y": 0.5, "width": 150, "height": 99 },
+				"tl0025": { "y": 0.5, "width": 150, "height": 99 }
+			}
+		}
+	}
+],
+"animations": {
+	"show": {
+		"slots": {
+			"tl0019": {
+				"attachment": [
+					{ "name": "tl0019" },
+					{ "time": 0.0667, "name": "tl0020" },
+					{ "time": 0.1333, "name": "tl0021" },
+					{ "time": 0.2, "name": "tl0022" },
+					{ "time": 0.2667, "name": "tl0023" },
+					{ "time": 0.3333, "name": "tl0024" },
+					{ "time": 0.4, "name": "tl0025" },
+					{ "time": 0.4667, "name": null }
+				]
+			},
+			"tl19": {
+				"attachment": [
+					{ "time": 0.2667, "name": "tl0019" },
+					{ "time": 0.3333, "name": "tl0020" },
+					{ "time": 0.4, "name": "tl0021" },
+					{ "time": 0.4667, "name": "tl0022" },
+					{ "time": 0.5333, "name": "tl0023" },
+					{ "time": 0.6, "name": "tl0024" },
+					{ "time": 0.6667, "name": "tl0025" },
+					{ "time": 0.7333, "name": null }
+				]
+			},
+			"光柱2": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.2667, "color": "ffdd4981", "curve": "stepped" },
+					{ "time": 0.3333, "color": "ffdd4981" },
+					{ "time": 0.6667, "color": "ffdd4900" }
+				]
+			},
+			"tl20": {
+				"attachment": [
+					{ "time": 0.4667, "name": "tl0019" },
+					{ "time": 0.5333, "name": "tl0020" },
+					{ "time": 0.6, "name": "tl0021" },
+					{ "time": 0.6667, "name": "tl0022" },
+					{ "time": 0.7333, "name": "tl0023" },
+					{ "time": 0.8, "name": "tl0024" },
+					{ "time": 0.8667, "name": "tl0025" },
+					{ "time": 0.9333, "name": null }
+				]
+			}
+		},
+		"bones": {
+			"bone4": {
+				"translate": [
+					{ "curve": 0.146, "c2": 0.51, "c3": 0.75 },
+					{ "time": 0.2667, "y": 2.83 }
+				],
+				"scale": [
+					{ "x": 0.478, "y": 0.478, "curve": 0.16, "c2": 0.5, "c3": 0.75 },
+					{ "time": 0.2667, "x": 0.949, "y": 1.2 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/buff/buff_add.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "af716091-7de8-4a09-9f4e-bb7c9c40d0db",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/buff_add.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8@6c48a",
+      "displayName": "buff_add",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8@6c48a"
+  }
+}

assets/resources/game/skills/buff/cd_up.atlas

@@ -0,0 +1,34 @@
+
+cd_up.png
+size: 121,80
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Icon_Sword02
+  rotate: false
+  xy: 80, 39
+  size: 39, 39
+  orig: 39, 39
+  offset: 0, 0
+  index: -1
+buff_0
+  rotate: false
+  xy: 2, 2
+  size: 76, 76
+  orig: 82, 82
+  offset: 3, 3
+  index: -1
+buff_1_1
+  rotate: false
+  xy: 80, 4
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1
+buff_1_3
+  rotate: false
+  xy: 80, 4
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1

assets/resources/game/skills/buff/cd_up.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "60562de8-1fdc-4b61-a8ae-2726aba94a19",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/cd_up.json

@@ -0,0 +1,90 @@
+{
+"skeleton": {
+	"hash": "u1Kcf+EHdtiLrMlOhOSZHtC8gLI=",
+	"spine": "3.8.75",
+	"x": -32.8,
+	"y": -32.21,
+	"width": 65.6,
+	"height": 65.6,
+	"images": "./images/",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root", "y": 0.59, "scaleX": 0.8, "scaleY": 0.8 },
+	{ "name": "main", "parent": "root", "rotation": 43.44 },
+	{ "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+	{ "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+	{ "name": "bone", "parent": "root" }
+],
+"slots": [
+	{ "name": "buff_0_1", "bone": "root" },
+	{ "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+	{ "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+	{ "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+	{ "name": "buff_1_2", "bone": "main", "attachment": "Icon_Sword02" },
+	{ "name": "buff_1_4", "bone": "main", "attachment": "Icon_Sword02", "blend": "screen" },
+	{ "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+	{ "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"buff_0": {
+				"buff_0": { "width": 82, "height": 82 }
+			},
+			"buff_1_1": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_2": {
+				"Icon_Sword02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 39, "height": 39 }
+			},
+			"buff_1_3": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_4": {
+				"Icon_Sword02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 39, "height": 39 }
+			},
+			"buff_1_5": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_6": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			}
+		}
+	}
+],
+"animations": {
+	"loop": {
+		"bones": {
+			"bone2": {
+				"scale": [
+					{ "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333, "x": 0.929, "y": 0.929 }
+				]
+			},
+			"bone3": {
+				"scale": [
+					{ "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.1, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.9333, "x": 1.057, "y": 1.057 }
+				]
+			},
+			"root": {
+				"translate": [
+					{ "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/buff/cd_up.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "3f3890f8-95ab-44e3-92b8-6b144223e1d0",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/cd_up.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "4ca8a5ce-8f45-4560-8a62-9870732e4e23",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "4ca8a5ce-8f45-4560-8a62-9870732e4e23@6c48a",
+      "displayName": "cd_up",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "4ca8a5ce-8f45-4560-8a62-9870732e4e23",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "4ca8a5ce-8f45-4560-8a62-9870732e4e23@6c48a"
+  }
+}

assets/resources/game/skills/buff/crit_up.atlas

@@ -0,0 +1,34 @@
+
+crit_up.png
+size: 141,81
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Icon_Fire02
+  rotate: false
+  xy: 80, 33
+  size: 59, 46
+  orig: 59, 46
+  offset: 0, 0
+  index: -1
+buff_0
+  rotate: false
+  xy: 2, 3
+  size: 76, 76
+  orig: 82, 82
+  offset: 3, 3
+  index: -1
+buff_1_1
+  rotate: true
+  xy: 80, 2
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1
+buff_1_3
+  rotate: true
+  xy: 80, 2
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1

assets/resources/game/skills/buff/crit_up.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "deccfb06-bf4a-4b9e-8e73-031a1f66686f",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/crit_up.json

@@ -0,0 +1,90 @@
+{
+"skeleton": {
+	"hash": "lvs4ZvyHfANnPU4Kp+6e51YupD4=",
+	"spine": "3.8.75",
+	"x": -32.8,
+	"y": -32.8,
+	"width": 65.6,
+	"height": 65.6,
+	"images": "./images/",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root", "scaleX": 0.8, "scaleY": 0.8 },
+	{ "name": "main", "parent": "root", "rotation": 43.44 },
+	{ "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+	{ "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+	{ "name": "bone", "parent": "root" }
+],
+"slots": [
+	{ "name": "buff_0_1", "bone": "root" },
+	{ "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+	{ "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+	{ "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+	{ "name": "buff_1_2", "bone": "main", "attachment": "Icon_Fire02" },
+	{ "name": "buff_1_4", "bone": "main", "attachment": "Icon_Fire02", "blend": "screen" },
+	{ "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+	{ "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"buff_0": {
+				"buff_0": { "width": 82, "height": 82 }
+			},
+			"buff_1_1": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_2": {
+				"Icon_Fire02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 59, "height": 46 }
+			},
+			"buff_1_3": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_4": {
+				"Icon_Fire02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 59, "height": 46 }
+			},
+			"buff_1_5": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_6": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			}
+		}
+	}
+],
+"animations": {
+	"loop": {
+		"bones": {
+			"bone2": {
+				"scale": [
+					{ "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333, "x": 0.929, "y": 0.929 }
+				]
+			},
+			"bone3": {
+				"scale": [
+					{ "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.1, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.9333, "x": 1.057, "y": 1.057 }
+				]
+			},
+			"root": {
+				"translate": [
+					{ "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/buff/crit_up.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "10f1c534-e608-4b93-b5ef-9167d6a511b2",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/crit_up.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f@6c48a",
+      "displayName": "crit_up",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f@6c48a"
+  }
+}

assets/resources/game/skills/buff/def_up.atlas

@@ -0,0 +1,34 @@
+
+def_up.png
+size: 135,88
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Icon_Shield
+  rotate: false
+  xy: 80, 33
+  size: 53, 53
+  orig: 53, 53
+  offset: 0, 0
+  index: -1
+buff_0
+  rotate: false
+  xy: 2, 10
+  size: 76, 76
+  orig: 82, 82
+  offset: 3, 3
+  index: -1
+buff_1_1
+  rotate: true
+  xy: 80, 2
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1
+buff_1_3
+  rotate: true
+  xy: 80, 2
+  size: 29, 33
+  orig: 31, 36
+  offset: 1, 2
+  index: -1

assets/resources/game/skills/buff/def_up.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "5522dff4-e8bb-4a1c-bbee-42499400066a",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/def_up.json

@@ -0,0 +1,90 @@
+{
+"skeleton": {
+	"hash": "dH6pKhTB/o05k6Za95T509y6ka4=",
+	"spine": "3.8.75",
+	"x": -32.8,
+	"y": -32.8,
+	"width": 65.6,
+	"height": 65.6,
+	"images": "./images/",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root", "scaleX": 0.8, "scaleY": 0.8 },
+	{ "name": "main", "parent": "root", "rotation": 43.44 },
+	{ "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+	{ "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+	{ "name": "bone", "parent": "root" }
+],
+"slots": [
+	{ "name": "buff_0_1", "bone": "root" },
+	{ "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+	{ "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+	{ "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+	{ "name": "buff_1_2", "bone": "main", "attachment": "Icon_Shield" },
+	{ "name": "buff_1_4", "bone": "main", "attachment": "Icon_Shield", "blend": "screen" },
+	{ "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+	{ "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"buff_0": {
+				"buff_0": { "width": 82, "height": 82 }
+			},
+			"buff_1_1": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_2": {
+				"Icon_Shield": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 53, "height": 53 }
+			},
+			"buff_1_3": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_4": {
+				"Icon_Shield": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 53, "height": 53 }
+			},
+			"buff_1_5": {
+				"buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+			},
+			"buff_1_6": {
+				"buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+			}
+		}
+	}
+],
+"animations": {
+	"loop": {
+		"bones": {
+			"bone2": {
+				"scale": [
+					{ "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333, "x": 0.929, "y": 0.929 }
+				]
+			},
+			"bone3": {
+				"scale": [
+					{ "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.1, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+					{ "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+					{ "time": 0.9333, "x": 1.057, "y": 1.057 }
+				]
+			},
+			"root": {
+				"translate": [
+					{ "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/buff/def_up.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "4c5cb1cc-5985-4ebe-918c-61fd50774b2f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/buff/def_up.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07@6c48a",
+      "displayName": "def_up",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07@6c48a"
+  }
+}

assets/resources/game/skills/dead.prefab

@@ -52,8 +52,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.5,
+      "x": 1,
-      "y": 0.5,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,

assets/resources/game/skills/heath/buff_3.atlas

@@ -0,0 +1,48 @@
+
+buff_3.png
+size: 300,275
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+BUFF/buff/1/baodian3
+  rotate: false
+  xy: 2, 86
+  size: 187, 187
+  orig: 205, 205
+  offset: 9, 9
+  index: -1
+BUFF/buff/1/hfgq_0
+  rotate: false
+  xy: 2, 18
+  size: 243, 66
+  orig: 400, 400
+  offset: 79, 152
+  index: -1
+BUFF/buff/1/hfgt_0
+  rotate: true
+  xy: 2, 2
+  size: 14, 133
+  orig: 400, 400
+  offset: 193, 134
+  index: -1
+BUFF/buff/1/jiahao
+  rotate: false
+  xy: 191, 226
+  size: 45, 47
+  orig: 45, 47
+  offset: 0, 0
+  index: -1
+BUFF/buff/1/lt_0
+  rotate: false
+  xy: 247, 11
+  size: 51, 262
+  orig: 400, 400
+  offset: 189, 69
+  index: -1
+BUFF/buff/1/star2
+  rotate: false
+  xy: 191, 182
+  size: 39, 42
+  orig: 39, 42
+  offset: 0, 0
+  index: -1

assets/resources/game/skills/heath/buff_3.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "*",
+  "imported": true,
+  "uuid": "9b5b6140-ba94-4204-9b20-d71a91abb287",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/heath/buff_3.json

@@ -0,0 +1,380 @@
+{
+"skeleton": {
+	"hash": "EbXEScNLje0TiSOzlAPeSiBc2pQ=",
+	"spine": "3.8.75",
+	"x": -85.26,
+	"y": -78.87,
+	"width": 187.07,
+	"height": 208.83,
+	"images": "./images/",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root", "rotation": -0.03 },
+	{ "name": "all", "parent": "root", "y": -62.2, "scaleX": 0.4, "scaleY": 0.4 },
+	{ "name": "bone2", "parent": "all", "y": 158.43, "color": "24ff00ff" },
+	{ "name": "bd", "parent": "root", "y": 55.48, "scaleX": 0.7263, "scaleY": 0.7263 },
+	{ "name": "all2", "parent": "all", "x": 101.57, "y": 216.94, "scaleX": 0.7643, "scaleY": 0.7643 },
+	{ "name": "all3", "parent": "all", "x": -88.03, "y": 215.31, "scaleX": 0.6106, "scaleY": 0.6106 },
+	{ "name": "lt1", "parent": "all", "x": -60.93, "y": 176.71, "scaleX": 0.7001, "scaleY": 0.7001 },
+	{ "name": "lt2", "parent": "all", "x": -4.31, "y": 146.54, "scaleX": 0.7001, "scaleY": 0.9049 },
+	{ "name": "lt3", "parent": "all", "x": 52.98, "y": 172, "scaleX": 0.7001, "scaleY": 0.7593 },
+	{ "name": "all4", "parent": "all", "x": -103.68, "y": 216.41, "color": "39ff00ff" },
+	{
+		"name": "all5",
+		"parent": "all",
+		"x": 88.68,
+		"y": 190.01,
+		"scaleX": 0.809,
+		"scaleY": 0.809,
+		"color": "39ff00ff"
+	},
+	{
+		"name": "all6",
+		"parent": "all",
+		"x": 120.02,
+		"y": 235.09,
+		"scaleX": 0.5614,
+		"scaleY": 0.5614,
+		"color": "39ff00ff"
+	},
+	{
+		"name": "all7",
+		"parent": "all",
+		"x": 20.32,
+		"y": 325.43,
+		"scaleX": 0.6012,
+		"scaleY": 0.6012,
+		"color": "39ff00ff"
+	},
+	{ "name": "all8", "parent": "all", "x": 349.65, "y": 257.04, "scaleX": 0.4, "scaleY": 0.4 },
+	{ "name": "all9", "parent": "all", "x": 389.75, "y": 257.04, "scaleX": 0.3, "scaleY": 0.3 },
+	{ "name": "all10", "parent": "all", "x": 68.38, "y": 154.57, "scaleX": 0.5, "scaleY": 0.5 },
+	{ "name": "all11", "parent": "all", "x": -44.31, "y": 154.09, "scaleX": 0.5, "scaleY": 0.5 }
+],
+"slots": [
+	{ "name": "BUFF/buff/1/baodian3", "bone": "bd", "color": "ffffff00", "attachment": "BUFF/buff/1/baodian3", "blend": "additive" },
+	{ "name": "BUFF/buff/1/hfgt_0", "bone": "all2", "color": "000000ff", "attachment": "BUFF/buff/1/hfgt_0", "blend": "additive" },
+	{ "name": "BUFF/buff/1/hfgt_1", "bone": "all3", "color": "ffffff00", "attachment": "BUFF/buff/1/hfgt_0", "blend": "additive" },
+	{ "name": "BUFF/buff/1/hfgq_0", "bone": "bone2", "color": "ffffff00", "attachment": "BUFF/buff/1/hfgq_0", "blend": "additive" },
+	{ "name": "BUFF/buff/1/lt_0", "bone": "lt1", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+	{ "name": "BUFF/buff/1/lt_1", "bone": "lt2", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+	{ "name": "BUFF/buff/1/lt_2", "bone": "lt3", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+	{ "name": "BUFF/buff/1/jiahao", "bone": "all4", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+	{ "name": "BUFF/buff/1/jiahao2", "bone": "all5", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+	{ "name": "BUFF/buff/1/jiahao3", "bone": "all6", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+	{ "name": "BUFF/buff/1/jiahao4", "bone": "all7", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+	{ "name": "BUFF/buff/1/star2", "bone": "all8", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+	{ "name": "BUFF/buff/1/star3", "bone": "all9", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+	{ "name": "BUFF/buff/1/star4", "bone": "all10", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+	{ "name": "BUFF/buff/1/star5", "bone": "all11", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+	{ "name": "1", "bone": "root" },
+	{ "name": "2", "bone": "root" }
+],
+"path": [
+	{
+		"name": "1",
+		"bones": [ "all8" ],
+		"target": "1"
+	},
+	{
+		"name": "2",
+		"order": 1,
+		"bones": [ "all9" ],
+		"target": "2"
+	}
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"BUFF/buff/1/jiahao2": {
+				"BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+			},
+			"BUFF/buff/1/jiahao3": {
+				"BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+			},
+			"BUFF/buff/1/jiahao4": {
+				"BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+			},
+			"BUFF/buff/1/star3": {
+				"BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+			},
+			"BUFF/buff/1/star4": {
+				"BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+			},
+			"BUFF/buff/1/star5": {
+				"BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+			},
+			"BUFF/buff/1/baodian3": {
+				"BUFF/buff/1/baodian3": { "width": 205, "height": 205 }
+			},
+			"BUFF/buff/1/lt_0": {
+				"BUFF/buff/1/lt_0": { "x": -17.39, "y": 131.99, "width": 400, "height": 400 }
+			},
+			"BUFF/buff/1/lt_1": {
+				"BUFF/buff/1/lt_0": { "x": -17.39, "y": 145.29, "width": 400, "height": 400 }
+			},
+			"BUFF/buff/1/lt_2": {
+				"BUFF/buff/1/lt_0": { "x": -17.39, "y": 131.99, "width": 400, "height": 400 }
+			},
+			"BUFF/buff/1/jiahao": {
+				"BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+			},
+			"BUFF/buff/1/hfgq_0": {
+				"BUFF/buff/1/hfgq_0": { "width": 400, "height": 400 }
+			},
+			"BUFF/buff/1/star2": {
+				"BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+			},
+			"BUFF/buff/1/hfgt_0": {
+				"BUFF/buff/1/hfgt_0": { "width": 400, "height": 400 }
+			},
+			"BUFF/buff/1/hfgt_1": {
+				"BUFF/buff/1/hfgt_0": { "width": 400, "height": 400 }
+			}
+		}
+	}
+],
+"animations": {
+	"show": {
+		"slots": {
+			"BUFF/buff/1/hfgt_1": {
+				"color": [
+					{ "color": "ffffff65", "curve": "stepped" },
+					{ "time": 0.3333, "color": "ffffff65" },
+					{ "time": 0.6, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/jiahao2": {
+				"color": [
+					{ "time": 0.3333, "color": "ffffff00" },
+					{ "time": 0.5, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.6667, "color": "ffffffff" },
+					{ "time": 1, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/hfgq_0": {
+				"color": [
+					{ "color": "ffffff00", "curve": 0.25, "c4": 0.88 },
+					{ "time": 0.3333, "color": "ffffffff", "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.8333, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/star4": {
+				"color": [
+					{ "color": "ffffffff" }
+				]
+			},
+			"BUFF/buff/1/star5": {
+				"color": [
+					{ "color": "ffffffff" }
+				]
+			},
+			"BUFF/buff/1/jiahao3": {
+				"color": [
+					{ "color": "ffffff00" },
+					{ "time": 0.1667, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.3333, "color": "ffffffff" },
+					{ "time": 0.6667, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/lt_1": {
+				"color": [
+					{ "time": 0.1667, "color": "fffc0095", "curve": "stepped" },
+					{ "time": 0.5, "color": "fffc0095" },
+					{ "time": 0.8333, "color": "fffc0000" }
+				]
+			},
+			"BUFF/buff/1/lt_0": {
+				"color": [
+					{ "color": "fffc0095", "curve": "stepped" },
+					{ "time": 0.3333, "color": "fffc0095" },
+					{ "time": 0.6667, "color": "fffc0000" }
+				]
+			},
+			"BUFF/buff/1/hfgt_0": {
+				"color": [
+					{ "time": 0.4333, "color": "ffffff00" },
+					{ "time": 0.6, "color": "ffffff79", "curve": "stepped" },
+					{ "time": 0.8667, "color": "ffffff79" },
+					{ "time": 1.1, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/baodian3": {
+				"color": [
+					{ "color": "ffffff00", "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.2333, "color": "ffffff5f", "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.6, "color": "ffffff4f", "curve": 0.25, "c3": 0.75 },
+					{ "time": 0.9333, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/star2": {
+				"color": [
+					{ "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.6667, "color": "ffffffff" },
+					{ "time": 1, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/star3": {
+				"color": [
+					{ "color": "ffffffff" }
+				]
+			},
+			"BUFF/buff/1/jiahao": {
+				"color": [
+					{ "time": 0.1, "color": "ffffff00" },
+					{ "time": 0.2667, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.4333, "color": "ffffffff" },
+					{ "time": 0.7667, "color": "ffffff00" }
+				]
+			},
+			"BUFF/buff/1/lt_2": {
+				"color": [
+					{ "time": 0.3333, "color": "fffc0095", "curve": "stepped" },
+					{ "time": 0.6667, "color": "fffc0095" },
+					{ "time": 1, "color": "fffc0000" }
+				]
+			},
+			"BUFF/buff/1/jiahao4": {
+				"color": [
+					{ "time": 0.1667, "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.5, "color": "ffffffff" },
+					{ "time": 0.8333, "color": "ffffff00" }
+				]
+			}
+		},
+		"bones": {
+			"bone2": {
+				"translate": [
+					{ "y": 1.94 }
+				],
+				"scale": [
+					{ "x": 0.3, "y": 0.3, "curve": 0, "c2": 0.8, "c3": 0.75 },
+					{ "time": 0.8333 }
+				]
+			},
+			"all2": {
+				"translate": [
+					{ "time": 0.4333, "curve": 0.126, "c2": 0.16, "c3": 0.75 },
+					{ "time": 1.1, "y": 45.87 }
+				]
+			},
+			"all3": {
+				"translate": [
+					{ "y": 13.54 },
+					{ "time": 0.6, "y": 55.27 }
+				]
+			},
+			"all4": {
+				"translate": [
+					{ "time": 0.1, "curve": 0.104, "c2": 0.15, "c3": 0 },
+					{ "time": 0.7667, "y": 109.04 }
+				],
+				"scale": [
+					{ "time": 0.1, "x": 0.8, "y": 0.8 },
+					{ "time": 0.2667 }
+				]
+			},
+			"all5": {
+				"translate": [
+					{ "time": 0.3333, "curve": 0.104, "c2": 0.15, "c3": 0.363 },
+					{ "time": 1, "y": 109.04 }
+				],
+				"scale": [
+					{ "time": 0.3333, "x": 0.8, "y": 0.8 },
+					{ "time": 0.5 }
+				]
+			},
+			"all6": {
+				"translate": [
+					{ "curve": 0.104, "c2": 0.15, "c3": 0.385 },
+					{ "time": 0.6667, "y": 109.04 }
+				],
+				"scale": [
+					{ "x": 0.8, "y": 0.8 },
+					{ "time": 0.1667 }
+				]
+			},
+			"all7": {
+				"translate": [
+					{ "time": 0.1667, "curve": 0.104, "c2": 0.15, "c3": 0.314 },
+					{ "time": 0.8333, "y": 109.04 }
+				],
+				"scale": [
+					{ "time": 0.1667, "x": 0.8, "y": 0.8 },
+					{ "time": 0.3333 }
+				]
+			},
+			"lt1": {
+				"scale": [
+					{ "x": 1.086, "y": 0.343, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+					{ "time": 0.3333, "x": 0.337, "y": 1.034 },
+					{ "time": 0.6667, "x": 0, "y": 1.034 }
+				]
+			},
+			"lt2": {
+				"scale": [
+					{ "time": 0.1667, "x": 1.055, "y": 0.316, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+					{ "time": 0.5, "x": 0.337, "y": 1.034 },
+					{ "time": 0.8333, "x": 0, "y": 1.034 }
+				]
+			},
+			"lt3": {
+				"scale": [
+					{ "time": 0.3333, "x": 0.984, "y": 0.493, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+					{ "time": 0.6667, "x": 0.233, "y": 1.237 },
+					{ "time": 1, "x": 0, "y": 1.034 }
+				]
+			},
+			"all8": {
+				"scale": [
+					{ "time": 0.3333 },
+					{ "time": 1, "x": 0, "y": 0 }
+				]
+			},
+			"all9": {
+				"scale": [
+					{ "time": 0.5 },
+					{ "time": 1, "x": 0, "y": 0 }
+				]
+			},
+			"all10": {
+				"translate": [
+					{ "time": 0.1, "curve": 0.111, "c2": 0.16, "c3": 0.75 },
+					{ "time": 0.7667, "x": 54.69, "y": 52.01 }
+				],
+				"scale": [
+					{ "time": 0.2667 },
+					{ "time": 0.7667, "x": 0, "y": 0 }
+				]
+			},
+			"all11": {
+				"translate": [
+					{ "time": 0.1, "curve": 0.111, "c2": 0.16, "c3": 0.75 },
+					{ "time": 0.7667, "x": -31.26, "y": 41.99 }
+				],
+				"scale": [
+					{ "time": 0.2667, "x": 0.565, "y": 0.565 },
+					{ "time": 0.7667, "x": 0, "y": 0 }
+				]
+			}
+		},
+		"path": {
+			"1": {
+				"position": [
+					{},
+					{ "time": 1, "position": 1 }
+				]
+			},
+			"2": {
+				"position": [
+					{ "time": 0.1667 },
+					{ "time": 1.1667, "position": 1 }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/game/skills/heath/buff_3.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.2.6",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "767d0128-62fa-4398-882a-1f79f30ac5f7",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/game/skills/heath/buff_3.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e@6c48a",
+      "displayName": "buff_3",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e@6c48a"
+  }
+}

assets/resources/game/skills/heathed.prefab

@@ -20,16 +20,19 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -51,7 +54,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 1,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -69,7 +72,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3
@@ -104,7 +107,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 1,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -228,6 +231,142 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "anm",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -6.767,
+      "y": -40.599,
+      "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__": 10
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 187.07000732421875,
+      "height": 208.8300018310547
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.45576521514997775,
+      "y": 0.37767563115949476
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a5/hl0+N9OUb944a49zzKF"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_skeletonData": {
+      "__uuid__": "767d0128-62fa-4398-882a-1f79f30ac5f7",
+      "__expectedType__": "sp.SkeletonData"
+    },
+    "defaultSkin": "default",
+    "defaultAnimation": "show",
+    "_premultipliedAlpha": true,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8fL0GfHp5NgI1lAzpAcih3"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "87+cbUTwZOXIIFCkVHG/aJ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -238,7 +377,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 11
+      "__id__": 17
     },
     "_contentSize": {
       "__type__": "cc.Size",

assets/resources/game/skills/max.prefab

@@ -20,19 +20,22 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 8
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 14
       },
       {
-        "__id__": 10
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -72,7 +75,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3
@@ -127,8 +130,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 64,
+      "width": 84,
-      "height": 48
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -199,6 +202,142 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "anm",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 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__": 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": "3c/cqhm69LxrUeWFQsrPv+"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_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
+    },
+    "_skeletonData": {
+      "__uuid__": "3ad5c35e-0872-46d6-a974-561ada3589d8",
+      "__expectedType__": "sp.SkeletonData"
+    },
+    "defaultSkin": "default",
+    "defaultAnimation": "loop",
+    "_premultipliedAlpha": true,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "93Y91kgfdDlLRx8EM4EtbQ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "bcO0Hg1dJN6ZtgtSNpygqs",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -209,7 +348,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 9
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -237,7 +376,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 11
+      "__id__": 17
     },
     "playOnLoad": true,
     "_clips": [

assets/resources/game/skills/shield.prefab

@@ -24,6 +24,9 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 6
+      },
       {
         "__id__": 8
       },
@@ -35,13 +38,10 @@
       },
       {
         "__id__": 14
-      },
-      {
-        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -85,13 +85,10 @@
     "_components": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 5
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -150,51 +147,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "b4sNQPJWFKha7x75SWXmRj"
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 6
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@103fd",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9a+65VIghBm4HQxuHPQ/mg"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -218,7 +170,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 9
+      "__id__": 7
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -246,7 +198,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 11
+      "__id__": 9
     },
     "enabledContactListener": true,
     "bullet": true,
@@ -280,7 +232,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 11
     },
     "tag": 8,
     "_group": 4,
@@ -314,7 +266,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 13
     },
     "_id": ""
   },
@@ -332,7 +284,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 15
     },
     "playOnLoad": false,
     "_clips": [

assets/resources/game/skills/shielded.prefab

@@ -54,7 +54,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 1,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -107,7 +107,7 @@
       "z": 1
     },
     "_mobility": 0,
-    "_layer": 1073741824,
+    "_layer": 1,
     "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,

assets/resources/gui/items.plist

@@ -17,9 +17,9 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{439,1},{71,65}}</string>
+                <string>{{153,144},{71,65}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1002.png</key>
             <dict>
@@ -34,7 +34,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{80,137},{73,61}}</string>
+                <string>{{202,81},{73,61}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -51,7 +51,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{123,74},{77,61}}</string>
+                <string>{{123,81},{77,61}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -68,7 +68,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{202,1},{77,65}}</string>
+                <string>{{1,206},{77,65}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -85,9 +85,9 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{281,68},{77,61}}</string>
+                <string>{{289,218},{77,61}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1006.png</key>
             <dict>
@@ -102,7 +102,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{360,1},{77,63}}</string>
+                <string>{{277,74},{77,63}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -119,7 +119,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{123,1},{77,71}}</string>
+                <string>{{1,133},{77,71}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -136,7 +136,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{1,206},{71,71}}</string>
+                <string>{{286,1},{71,71}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -153,9 +153,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{264,202},{54,60}}</string>
+                <string>{{208,217},{54,60}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1010.png</key>
             <dict>
@@ -170,7 +170,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{155,137},{62,54}}</string>
+                <string>{{438,1},{62,54}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -187,7 +187,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{320,202},{54,60}}</string>
+                <string>{{233,273},{54,60}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -204,7 +204,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{206,202},{56,60}}</string>
+                <string>{{1,273},{56,60}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -221,7 +221,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{376,195},{54,60}}</string>
+                <string>{{438,65},{54,60}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -238,7 +238,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{143,268},{62,54}}</string>
+                <string>{{80,217},{62,54}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,7 +255,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{391,257},{54,60}}</string>
+                <string>{{425,131},{54,60}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -272,9 +272,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{267,264},{56,60}}</string>
+                <string>{{59,273},{56,60}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1018.png</key>
             <dict>
@@ -289,9 +289,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{329,264},{56,60}}</string>
+                <string>{{117,273},{56,60}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1019.png</key>
             <dict>
@@ -306,9 +306,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{447,141},{56,60}}</string>
+                <string>{{175,273},{56,60}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1020.png</key>
             <dict>
@@ -323,9 +323,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{432,199},{54,60}}</string>
+                <string>{{419,269},{54,60}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1021.png</key>
             <dict>
@@ -340,9 +340,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{349,131},{62,54}}</string>
+                <string>{{144,217},{62,54}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1022.png</key>
             <dict>
@@ -357,7 +357,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,70}</string>
                 <key>textureRect</key>
-                <string>{{447,255},{54,60}}</string>
+                <string>{{423,200},{54,60}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -408,7 +408,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{1,133},{77,71}}</string>
+                <string>{{207,1},{77,71}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -425,9 +425,9 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{202,68},{77,63}}</string>
+                <string>{{289,139},{77,63}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>3004.Png</key>
             <dict>
@@ -442,7 +442,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{281,1},{77,65}}</string>
+                <string>{{359,1},{77,65}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -459,7 +459,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{360,66},{77,61}}</string>
+                <string>{{359,68},{77,61}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -476,9 +476,9 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{143,201},{61,65}}</string>
+                <string>{{352,269},{61,65}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>9002.Png</key>
             <dict>
@@ -493,7 +493,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{439,68},{71,71}}</string>
+                <string>{{80,144},{71,71}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -506,11 +506,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{58,58}</string>
+                <string>{82,78}</string>
                 <key>spriteSourceSize</key>
-                <string>{58,58}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{207,264},{58,58}}</string>
+                <string>{{123,1},{82,78}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -527,7 +527,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{211,133},{67,67}}</string>
+                <string>{{220,144},{67,67}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -544,7 +544,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{74,206},{67,67}}</string>
+                <string>{{356,131},{67,67}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -561,7 +561,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,77}</string>
                 <key>textureRect</key>
-                <string>{{280,133},{67,67}}</string>
+                <string>{{354,200},{67,67}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -577,9 +577,9 @@
             <key>realTextureFileName</key>
             <string>items.png</string>
             <key>size</key>
-            <string>{511,323}</string>
+            <string>{493,334}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:04bbd6cd0407699a1595d0e401af7d1e:24aad079ba91bf6aa5e1937f9fc6b373:9b2c40378ce3448cae3ca053079d3001$</string>
+            <string>$TexturePacker:SmartUpdate:1bc512f8dc1baac0d03997c773bef4ca:0631a07c70b9bd4ccdd225f169eb27c3:9b2c40378ce3448cae3ca053079d3001$</string>
             <key>textureFileName</key>
             <string>items.png</string>
         </dict>

assets/resources/gui/items.plist.meta

@@ -16,11 +16,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 281,
+        "trimX": 289,
-        "trimY": 68,
+        "trimY": 218,
         "width": 77,
         "height": 61,
         "rawWidth": 77,
@@ -62,11 +62,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 432,
+        "trimX": 419,
-        "trimY": 199,
+        "trimY": 269,
         "width": 54,
         "height": 60,
         "rawWidth": 70,
@@ -111,8 +111,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 74,
+        "trimX": 356,
-        "trimY": 206,
+        "trimY": 131,
         "width": 67,
         "height": 67,
         "rawWidth": 77,
@@ -157,8 +157,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 360,
+        "trimX": 277,
-        "trimY": 1,
+        "trimY": 74,
         "width": 77,
         "height": 63,
         "rawWidth": 77,
@@ -200,11 +200,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 439,
+        "trimX": 153,
-        "trimY": 1,
+        "trimY": 144,
         "width": 71,
         "height": 65,
         "rawWidth": 77,
@@ -249,8 +249,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 80,
+        "trimX": 202,
-        "trimY": 137,
+        "trimY": 81,
         "width": 73,
         "height": 61,
         "rawWidth": 77,
@@ -296,7 +296,7 @@
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 123,
-        "trimY": 74,
+        "trimY": 81,
         "width": 77,
         "height": 61,
         "rawWidth": 77,
@@ -341,8 +341,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 202,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 206,
         "width": 77,
         "height": 65,
         "rawWidth": 77,
@@ -387,8 +387,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 123,
+        "trimX": 1,
-        "trimY": 1,
+        "trimY": 133,
         "width": 77,
         "height": 71,
         "rawWidth": 77,
@@ -433,8 +433,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
+        "trimX": 286,
-        "trimY": 206,
+        "trimY": 1,
         "width": 71,
         "height": 71,
         "rawWidth": 77,
@@ -476,11 +476,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 264,
+        "trimX": 208,
-        "trimY": 202,
+        "trimY": 217,
         "width": 54,
         "height": 60,
         "rawWidth": 70,
@@ -525,8 +525,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 155,
+        "trimX": 438,
-        "trimY": 137,
+        "trimY": 1,
         "width": 62,
         "height": 54,
         "rawWidth": 70,
@@ -571,8 +571,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -1,
-        "trimX": 320,
+        "trimX": 233,
-        "trimY": 202,
+        "trimY": 273,
         "width": 54,
         "height": 60,
         "rawWidth": 70,
@@ -617,8 +617,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 206,
+        "trimX": 1,
-        "trimY": 202,
+        "trimY": 273,
         "width": 56,
         "height": 60,
         "rawWidth": 70,
@@ -663,8 +663,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 376,
+        "trimX": 438,
-        "trimY": 195,
+        "trimY": 65,
         "width": 54,
         "height": 60,
         "rawWidth": 70,
@@ -709,8 +709,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 143,
+        "trimX": 80,
-        "trimY": 268,
+        "trimY": 217,
         "width": 62,
         "height": 54,
         "rawWidth": 70,
@@ -755,8 +755,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -1,
-        "trimX": 391,
+        "trimX": 425,
-        "trimY": 257,
+        "trimY": 131,
         "width": 54,
         "height": 60,
         "rawWidth": 70,
@@ -798,11 +798,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 267,
+        "trimX": 59,
-        "trimY": 264,
+        "trimY": 273,
         "width": 56,
         "height": 60,
         "rawWidth": 70,
@@ -844,11 +844,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 329,
+        "trimX": 117,
-        "trimY": 264,
+        "trimY": 273,
         "width": 56,
         "height": 60,
         "rawWidth": 70,
@@ -890,11 +890,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 447,
+        "trimX": 175,
-        "trimY": 141,
+        "trimY": 273,
         "width": 56,
         "height": 60,
         "rawWidth": 70,
@@ -936,11 +936,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 349,
+        "trimX": 144,
-        "trimY": 131,
+        "trimY": 217,
         "width": 62,
         "height": 54,
         "rawWidth": 70,
@@ -985,8 +985,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -1,
-        "trimX": 447,
+        "trimX": 423,
-        "trimY": 255,
+        "trimY": 200,
         "width": 54,
         "height": 60,
         "rawWidth": 70,
@@ -1123,8 +1123,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
+        "trimX": 207,
-        "trimY": 133,
+        "trimY": 1,
         "width": 77,
         "height": 71,
         "rawWidth": 77,
@@ -1166,11 +1166,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 202,
+        "trimX": 289,
-        "trimY": 68,
+        "trimY": 139,
         "width": 77,
         "height": 63,
         "rawWidth": 77,
@@ -1215,7 +1215,7 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 281,
+        "trimX": 359,
         "trimY": 1,
         "width": 77,
         "height": 65,
@@ -1261,8 +1261,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 360,
+        "trimX": 359,
-        "trimY": 66,
+        "trimY": 68,
         "width": 77,
         "height": 61,
         "rawWidth": 77,
@@ -1304,11 +1304,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 143,
+        "trimX": 352,
-        "trimY": 201,
+        "trimY": 269,
         "width": 61,
         "height": 65,
         "rawWidth": 77,
@@ -1353,8 +1353,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 439,
+        "trimX": 80,
-        "trimY": 68,
+        "trimY": 144,
         "width": 71,
         "height": 71,
         "rawWidth": 77,
@@ -1399,12 +1399,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 207,
+        "trimX": 123,
-        "trimY": 264,
+        "trimY": 1,
-        "width": 58,
+        "width": 82,
-        "height": 58,
+        "height": 78,
-        "rawWidth": 58,
+        "rawWidth": 90,
-        "rawHeight": 58,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1445,8 +1445,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 211,
+        "trimX": 220,
-        "trimY": 133,
+        "trimY": 144,
         "width": 67,
         "height": 67,
         "rawWidth": 77,
@@ -1491,8 +1491,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 280,
+        "trimX": 354,
-        "trimY": 133,
+        "trimY": 200,
         "width": 67,
         "height": 67,
         "rawWidth": 77,

assets/resources/gui/role_controller.prefab

@@ -357,6 +357,8 @@
       "__id__": 0
     },
     "fileId": "dbtEsaAyZBrq4EVQEtirXK",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -10513,7 +10515,7 @@
         "__id__": 901
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 1440
@@ -11418,8 +11420,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 108,
+      "width": 128,
-      "height": 108
+      "height": 102
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -11455,7 +11457,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@780b2",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0b270",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

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

@@ -7,9 +7,9 @@ type:
 
 export const Items={
 
-     1001:{uuid: 1001,path: "1001",type:1,lv:2,name: "宝箱",info:"打开宝箱获得随机奖励", },
+     1001:{uuid: 1001,path: "1001",type:1,lv:2,name: "宝箱",info:"随机获取物品", },
-     1002:{uuid: 1002,path: "1002",type:1,lv:3,name: "稀有宝箱",info:"打开宝箱获得随机奖励", },
+     1002:{uuid: 1002,path: "1002",type:1,lv:3,name: "稀有宝箱",info:"随机获取少量英雄碎片", },
-     1003:{uuid: 1003,path: "1003",type:1,lv:4,name: "传说宝箱",info:"打开宝箱获得随机奖励", }, 
+     1003:{uuid: 1003,path: "1003",type:1,lv:4,name: "传说宝箱",info:"随机获取大量英雄碎片", }, 
      1004:{uuid: 1004,path: "1004",type:1,lv:3,name: "xxx",info:"英雄升级三星需要的凭证", },
      1005:{uuid: 1005,path: "1005",type:1,lv:3,name: "xxx",info:"英雄升级四星需要的凭证", },
      1006:{uuid: 1006,path: "1006",type:1,lv:4,name: "xxx",info:"英雄升级五星需要的凭证", },
@@ -25,6 +25,6 @@ export const Items={
      1016:{uuid: 1016,path: "1016",type:1,lv:4,name: "传说生命石",info:"增加装备生命值50,成功几率50%", },
      9001:{uuid: 9001,path: "9001",type:1,lv:0,name: "金币",info:"金币不是万能的,但是没有金币是万万不能的", },
      9002:{uuid: 9002,path: "9002",type:1,lv:1,name: "叶子",info:"提升英雄等级的神奇叶子", },
-     9003:{uuid: 9003,path: "9003",type:1,lv:1,name: "经验",info:"提升英雄等级", },
+     9003:{uuid: 9003,path: "9003",type:1,lv:1,name: "英雄经验",info:"提升英雄等级", },
 }
 

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

@@ -46,7 +46,7 @@ import { Talents } from "./TalentSet"
 export const HeroInfo = {
    //坦克， 高防 ，圣盾 
    5001: {
-      uuid:5001,name: "圣盾骑士",path:"k1",type:0,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:100,a_cd:1.5,
+      uuid:5001,name: "圣盾骑士",path:"k1",type:0,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:150,a_cd:1.5,
       lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10,
       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,
@@ -54,7 +54,7 @@ export const HeroInfo = {
    },
   //坦克，高血量 ，回血
    5002: {
-      uuid:5002,name: "狂暴骑士",path:"k2",type:0,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:100,a_cd:1.5,
+      uuid:5002,name: "狂暴骑士",path:"k2",type:0,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:150,a_cd:1.5,
       lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],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,
@@ -62,7 +62,7 @@ export const HeroInfo = {
    },
    //坦克，高闪避 ，加闪避
    5003: {
-      uuid:5003,name: "防御骑士",path:"k3",type:0,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:100,a_cd:1.5,
+      uuid:5003,name: "防御骑士",path:"k3",type:0,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:150,a_cd:1.5,
       lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],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,
@@ -112,21 +112,21 @@ export const HeroInfo = {
 
 
    5201: {
-      uuid: 5201,name: "兽人战士",  path: "mor1", type:0,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:100,a_cd:1.5,
+      uuid: 5201,name: "兽人战士",  path: "mor1", type:0,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:150,a_cd:1.5,
       lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],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:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5202: {
-      uuid: 5202,name: "兽人刺客",  path: "mor2", type:0,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:100,a_cd:1.5,
+      uuid: 5202,name: "兽人刺客",  path: "mor2", type:0,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:150,a_cd:1.5,
       lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],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:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
    },
    5203: {
-      uuid: 5203,name: "兽人护卫",  path: "mor3", type:0,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:100,a_cd:1.5,
+      uuid: 5203,name: "兽人护卫",  path: "mor3", type:0,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:150,a_cd:1.5,
       lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],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,

assets/script/game/hero/HeroViewComp.ts

@@ -256,6 +256,8 @@ export class HeroViewComp extends CCComp {
         if(dir < this.dis){
             this.is_atking=true
             if(this.dis-dir > 80 &&this.type > 0 ) this.stop_cd = 0.1
+            if(dir < 65 &&this.type == 0 ) this.stop_cd = 0.1
+            
         }else{
             this.is_atking=false
         }
@@ -717,7 +719,7 @@ export class HeroViewComp extends CCComp {
         var path =  "game/skills/atked";
         var prefab: Prefab = oops.res.get(path, Prefab)!;
         var node = instantiate(prefab);
-        let pos =v3(0,30);
+        let pos =v3(15,30);
         node.setPosition(pos)
         node.parent = this.node;
         // this.as.atked();
@@ -730,7 +732,7 @@ export class HeroViewComp extends CCComp {
         var prefab: Prefab = oops.res.get(path, Prefab)!;
         var node = instantiate(prefab);
         let pos = v3(this.node.position.x,this.node.position.y+30,this.node.position.z);
-        node.parent = this.node.parent;
+        node.parent = this.node;
         node.setPosition(pos);
         this.exp_add(this.dexp)
         this.power_add(this.dpw)