英雄升级改为仅等级升级，slv根据等级确定，下步修改抽卡，改为以此抽多次卡

assets/resources/game/gui/hchip.prefab

@@ -32,19 +32,25 @@
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 49
+      },
+      {
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 61
       },
       {
-        "__id__": 51
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -114,8 +120,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 0.9,
-      "y": 1,
+      "y": 0.9,
       "z": 1
     },
     "_mobility": 0,
@@ -142,8 +148,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 130,
+      "width": 128,
-      "height": 145
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -184,7 +190,7 @@
     },
     "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -295,7 +301,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 12
@@ -325,8 +331,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 0.9,
-      "y": 1,
+      "y": 0.9,
       "z": 1
     },
     "_mobility": 0,
@@ -353,8 +359,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 130,
+      "width": 128,
-      "height": 145
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -395,7 +401,7 @@
     },
     "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -506,7 +512,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 21
@@ -536,8 +542,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 0.9,
-      "y": 1,
+      "y": 0.9,
       "z": 1
     },
     "_mobility": 0,
@@ -564,8 +570,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 130,
+      "width": 128,
-      "height": 145
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -604,9 +610,9 @@
       "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@419a0",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 1,
+    "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -788,8 +794,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 4.996,
-      "y": -89.732,
+      "y": -50.051,
       "z": 0
     },
     "_lrot": {
@@ -801,8 +807,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.7,
+      "x": 0.5,
-      "y": 0.7,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -829,8 +835,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 215,
+      "width": 171,
-      "height": 233
+      "height": 203
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1033,8 +1039,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 37.317,
+      "x": 44.811,
-      "y": -46.597,
+      "y": -47.063,
       "z": 0
     },
     "_lrot": {
@@ -1169,6 +1175,278 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "suip",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 50
+      },
+      {
+        "__id__": 52
+      }
+    ],
+    "_prefab": {
+      "__id__": 54
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -45.265,
+      "y": -45.265,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 51
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 81,
+      "height": 82
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d6phCLobNC6ZDQDeOkVJ+e"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 53
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 235,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0420e",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b1dChAQytMNYPrESASwk9M"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "63Xq1gXo5C5Kr7NBfX1QGD",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "suip2",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 56
+      },
+      {
+        "__id__": 58
+      }
+    ],
+    "_prefab": {
+      "__id__": 60
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -45.265,
+      "y": -45.265,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 55
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 57
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 87,
+      "height": 88
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "99UFvuJxBD/IYlL1eglWzr"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 55
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 59
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 235,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@56197",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f7lHlCkVxOCoUwajn/LtOO"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d9EnipbkJCSZk7w5zW6OpE",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1179,7 +1457,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 62
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1207,7 +1485,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 64
     },
     "_id": ""
   },

assets/resources/game/skills/apup.prefab

@@ -163,8 +163,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -100,
-      "y": 120,
+      "y": 300,
       "z": 0
     }
   },

assets/resources/game/skills/heath.prefab

@@ -166,8 +166,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -180,
+      "x": -260,
-      "y": 180,
+      "y": 300,
       "z": 0
     }
   },

assets/resources/game/skills/heath/heath2.anim

@@ -11,7 +11,7 @@
     "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 1.3333333333333333,
+    "_duration": 2.6666666666666665,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -77,7 +77,11 @@
       0.3333333432674408,
       0.6666666865348816,
       1,
-      1.3333333730697632
+      1.3333333730697632,
+      1.6666666269302368,
+      2,
+      2.3333332538604736,
+      2.6666667461395264
     ],
     "_values": [
       {
@@ -126,9 +130,7 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
+        "__editorExtras__": null
-          "tangentMode": 0
-        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -140,9 +142,55 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
+        "__editorExtras__": null
-          "tangentMode": 0
+      },
-        }
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.6000000238418579,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.6000000238418579,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
       }
     ],
     "preExtrapolation": 1,
@@ -161,7 +209,11 @@
       0.3333333432674408,
       0.6666666865348816,
       1,
-      1.3333333730697632
+      1.3333333730697632,
+      1.6666666269302368,
+      2,
+      2.3333332538604736,
+      2.6666667461395264
     ],
     "_values": [
       {
@@ -210,9 +262,7 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
+        "__editorExtras__": null
-          "tangentMode": 0
-        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -224,9 +274,55 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
+        "__editorExtras__": null
-          "tangentMode": 0
+      },
-        }
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.6000000238418579,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.6000000238418579,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0.5,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
       }
     ],
     "preExtrapolation": 1,

assets/resources/game/skills/heath2.prefab

@@ -167,7 +167,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": -180,
-      "y": 130,
+      "y": 300,
       "z": 0
     }
   },

assets/resources/game/skills/shielded.prefab

@@ -25,14 +25,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 14
       },
       {
-        "__id__": 28
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -74,25 +74,19 @@
     "_children": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 15
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 9
       },
       {
-        "__id__": 23
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -125,7 +119,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "gd",
+    "_name": "dun",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -147,7 +141,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 53.879,
+      "y": 57.141,
       "z": 0
     },
     "_lrot": {
@@ -187,8 +181,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 83,
+      "width": 86,
-      "height": 81
+      "height": 84
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -199,7 +193,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d3y+cyEe9NDI27l0exjRQZ"
+    "fileId": "3bUbh0xIxD3bWsgoihHHMi"
   },
   {
     "__type__": "cc.Sprite",
@@ -220,11 +214,11 @@
       "__type__": "cc.Color",
       "r": 255,
       "g": 255,
-      "b": 255,
+      "b": 19,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@a3f8b",
+      "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@bbb42",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -244,7 +238,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "41/Q5MP4lPwIqf54akEHlt"
+    "fileId": "01YAunEG9INZKk02SQk8jM"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -254,277 +248,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "01wcwMAERIK4ZFFFMjDMWt",
+    "fileId": "a00GJBc2xG2pmgSQAt0tvL",
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "OK_ult_2_0001",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
-      }
-    ],
-    "_prefab": {
-      "__id__": 14
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 57.141,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.9,
-      "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__": 9
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 11
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 104,
-      "height": 94
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "66GGP31KBH54vNy29wK4Wd"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 9
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 13
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@accaf",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "98WjpD6sFCzrxReMeikSQN"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "75K4z+0QBOMq4sdx/s8g4i",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "zhao",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 18
-      }
-    ],
-    "_prefab": {
-      "__id__": 20
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 53.879,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.9,
-      "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__": 15
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 17
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 82,
-      "height": 82
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "bbS5E6Hz5Cnow7ZqFTnB9V"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 15
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 19
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@79dcd",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4ch3h/kcNMpoieZ4BRPmxC"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "769SBvJpJDsKfC3h45rlH5",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -539,7 +263,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 10
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -567,7 +291,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 24
+      "__id__": 12
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -579,10 +303,7 @@
       "b": 255,
       "a": 206
     },
-    "_spriteFrame": {
+    "_spriteFrame": null,
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91c2a",
-      "__expectedType__": "cc.SpriteFrame"
-    },
     "_type": 3,
     "_fillType": 1,
     "_sizeMode": 0,
@@ -625,7 +346,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -653,7 +374,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 17
     },
     "playOnLoad": true,
     "_clips": [

assets/resources/game/skills/skills.plist

@@ -68,9 +68,9 @@
                 <key>spriteSourceSize</key>
                 <string>{184,61}</string>
                 <key>textureRect</key>
-                <string>{{445,562},{138,51}}</string>
+                <string>{{293,612},{138,51}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Fireball_2_blue_02.png</key>
             <dict>
@@ -102,9 +102,9 @@
                 <key>spriteSourceSize</key>
                 <string>{184,61}</string>
                 <key>textureRect</key>
-                <string>{{445,562},{138,51}}</string>
+                <string>{{293,612},{138,51}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Fireball_2_loop_01.png</key>
             <dict>
@@ -119,7 +119,7 @@
                 <key>spriteSourceSize</key>
                 <string>{102,102}</string>
                 <key>textureRect</key>
-                <string>{{145,1442},{84,50}}</string>
+                <string>{{445,562},{84,50}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -136,7 +136,7 @@
                 <key>spriteSourceSize</key>
                 <string>{102,102}</string>
                 <key>textureRect</key>
-                <string>{{407,702},{88,46}}</string>
+                <string>{{407,840},{88,46}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -153,7 +153,7 @@
                 <key>spriteSourceSize</key>
                 <string>{102,102}</string>
                 <key>textureRect</key>
-                <string>{{168,1284},{90,46}}</string>
+                <string>{{353,1286},{90,46}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -170,9 +170,9 @@
                 <key>spriteSourceSize</key>
                 <string>{102,102}</string>
                 <key>textureRect</key>
-                <string>{{154,1376},{90,52}}</string>
+                <string>{{340,1194},{90,52}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Fx05_00.png</key>
             <dict>
@@ -187,7 +187,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{60,1284},{53,53}}</string>
+                <string>{{424,1393},{53,53}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -204,7 +204,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{1,1284},{63,57}}</string>
+                <string>{{365,1393},{63,57}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -221,7 +221,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{423,1356},{73,67}}</string>
+                <string>{{401,1253},{73,67}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -238,7 +238,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{326,1347},{95,93}}</string>
+                <string>{{114,1293},{95,93}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,9 +255,9 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{112,1177},{107,105}}</string>
+                <string>{{108,1389},{107,105}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Fx05_10.png</key>
             <dict>
@@ -272,7 +272,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{384,879},{111,109}}</string>
+                <string>{{122,1182},{111,109}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -289,7 +289,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{251,970},{115,113}}</string>
+                <string>{{247,1012},{115,113}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -306,7 +306,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{1,1058},{119,117}}</string>
+                <string>{{1,1064},{119,117}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -323,7 +323,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{259,847},{123,121}}</string>
+                <string>{{255,889},{123,121}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -340,7 +340,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{1,852},{125,125}}</string>
+                <string>{{1,818},{125,125}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -357,7 +357,7 @@
                 <key>spriteSourceSize</key>
                 <string>{137,127}</string>
                 <key>textureRect</key>
-                <string>{{149,646},{127,127}}</string>
+                <string>{{280,665},{127,127}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -374,9 +374,9 @@
                 <key>spriteSourceSize</key>
                 <string>{171,155}</string>
                 <key>textureRect</key>
-                <string>{{115,1284},{51,53}}</string>
+                <string>{{424,1448},{51,53}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Hit_1_blue_01.png</key>
             <dict>
@@ -391,7 +391,7 @@
                 <key>spriteSourceSize</key>
                 <string>{171,155}</string>
                 <key>textureRect</key>
-                <string>{{239,1085},{111,103}}</string>
+                <string>{{1,1183},{111,103}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -408,7 +408,7 @@
                 <key>spriteSourceSize</key>
                 <string>{171,155}</string>
                 <key>textureRect</key>
-                <string>{{122,1062},{113,115}}</string>
+                <string>{{122,1067},{113,115}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -425,7 +425,7 @@
                 <key>spriteSourceSize</key>
                 <string>{171,155}</string>
                 <key>textureRect</key>
-                <string>{{128,943},{117,121}}</string>
+                <string>{{1,945},{117,121}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -442,7 +442,7 @@
                 <key>spriteSourceSize</key>
                 <string>{171,155}</string>
                 <key>textureRect</key>
-                <string>{{1,979},{77,121}}</string>
+                <string>{{124,988},{77,121}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -459,7 +459,7 @@
                 <key>spriteSourceSize</key>
                 <string>{228,207}</string>
                 <key>textureRect</key>
-                <string>{{246,1352},{70,69}}</string>
+                <string>{{401,1322},{70,69}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -544,7 +544,7 @@
                 <key>spriteSourceSize</key>
                 <string>{113,113}</string>
                 <key>textureRect</key>
-                <string>{{377,1442},{33,41}}</string>
+                <string>{{364,1012},{33,41}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -561,9 +561,9 @@
                 <key>spriteSourceSize</key>
                 <string>{113,113}</string>
                 <key>textureRect</key>
-                <string>{{197,1442},{83,95}}</string>
+                <string>{{280,1388},{83,95}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Hit_3_normal_02.png</key>
             <dict>
@@ -578,7 +578,7 @@
                 <key>spriteSourceSize</key>
                 <string>{113,113}</string>
                 <key>textureRect</key>
-                <string>{{221,1255},{95,103}}</string>
+                <string>{{235,1194},{95,103}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -595,7 +595,7 @@
                 <key>spriteSourceSize</key>
                 <string>{113,113}</string>
                 <key>textureRect</key>
-                <string>{{352,1150},{99,111}}</string>
+                <string>{{1,1288},{99,111}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -612,7 +612,7 @@
                 <key>spriteSourceSize</key>
                 <string>{113,113}</string>
                 <key>textureRect</key>
-                <string>{{368,990},{91,113}}</string>
+                <string>{{364,1074},{91,113}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -646,26 +646,9 @@
                 <key>spriteSourceSize</key>
                 <string>{85,86}</string>
                 <key>textureRect</key>
-                <string>{{58,1442},{85,86}}</string>
+                <string>{{409,753},{85,86}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
-            </dict>
-            <key>OK_ult_2_0001.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,5}</string>
-                <key>spriteSize</key>
-                <string>{104,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{110,110}</string>
-                <key>textureRect</key>
-                <string>{{330,1251},{104,94}}</string>
-                <key>textureRotated</key>
-                <false/>
             </dict>
             <key>Uzi_blue_00.png</key>
             <dict>
@@ -680,7 +663,7 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{407,750},{127,87}}</string>
+                <string>{{407,888},{127,87}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -697,7 +680,7 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{259,782},{125,63}}</string>
+                <string>{{128,850},{125,63}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -714,7 +697,7 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{368,1083},{113,65}}</string>
+                <string>{{239,1127},{113,65}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -731,7 +714,7 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{436,1251},{103,59}}</string>
+                <string>{{433,648},{103,59}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -748,9 +731,9 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{221,1190},{107,63}}</string>
+                <string>{{215,1388},{107,63}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Uzi_blue_05.png</key>
             <dict>
@@ -765,7 +748,7 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{85,1339},{95,67}}</string>
+                <string>{{284,1291},{95,67}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -782,9 +765,9 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{1,1442},{87,55}}</string>
+                <string>{{407,1017},{87,55}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Uzi_blue_07.png</key>
             <dict>
@@ -799,9 +782,9 @@
                 <key>spriteSourceSize</key>
                 <string>{129,97}</string>
                 <key>textureRect</key>
-                <string>{{221,1190},{107,63}}</string>
+                <string>{{215,1388},{107,63}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Weapon.png</key>
             <dict>
@@ -871,22 +854,22 @@
                 <key>textureRotated</key>
                 <true/>
             </dict>
-            <key>gd.png</key>
+            <key>dun.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,0}</string>
+                <string>{-1,1}</string>
                 <key>spriteSize</key>
-                <string>{83,81}</string>
+                <string>{86,84}</string>
                 <key>spriteSourceSize</key>
-                <string>{83,81}</string>
+                <string>{110,110}</string>
                 <key>textureRect</key>
-                <string>{{294,1442},{83,81}}</string>
+                <string>{{401,1167},{86,84}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>hit.png</key>
             <dict>
@@ -901,7 +884,7 @@
                 <key>spriteSourceSize</key>
                 <string>{127,127}</string>
                 <key>textureRect</key>
-                <string>{{1,723},{127,127}}</string>
+                <string>{{149,721},{127,127}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1088,9 +1071,9 @@
                 <key>spriteSourceSize</key>
                 <string>{155,155}</string>
                 <key>textureRect</key>
-                <string>{{1,1177},{105,109}}</string>
+                <string>{{1,1389},{105,109}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>s2.png</key>
             <dict>
@@ -1122,7 +1105,7 @@
                 <key>spriteSourceSize</key>
                 <string>{155,155}</string>
                 <key>textureRect</key>
-                <string>{{278,687},{93,127}}</string>
+                <string>{{278,794},{93,127}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1139,7 +1122,7 @@
                 <key>spriteSourceSize</key>
                 <string>{155,155}</string>
                 <key>textureRect</key>
-                <string>{{130,775},{93,127}}</string>
+                <string>{{1,723},{93,127}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1156,7 +1139,7 @@
                 <key>spriteSourceSize</key>
                 <string>{155,155}</string>
                 <key>textureRect</key>
-                <string>{{293,612},{73,129}}</string>
+                <string>{{149,646},{73,129}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1173,7 +1156,7 @@
                 <key>spriteSourceSize</key>
                 <string>{155,155}</string>
                 <key>textureRect</key>
-                <string>{{128,870},{71,123}}</string>
+                <string>{{128,915},{71,123}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1190,24 +1173,7 @@
                 <key>spriteSourceSize</key>
                 <string>{155,155}</string>
                 <key>textureRect</key>
-                <string>{{423,1425},{71,93}}</string>
+                <string>{{211,1293},{71,93}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>zhao.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{82,82}</string>
-                <key>spriteSourceSize</key>
-                <string>{82,82}</string>
-                <key>textureRect</key>
-                <string>{{1,1352},{82,82}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1223,9 +1189,9 @@
             <key>realTextureFileName</key>
             <string>skills.png</string>
             <key>size</key>
-            <string>{497,1530}</string>
+            <string>{496,1500}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:1bc724099fb0aa13656f465d84a34aea:d64711c202cafa9cff231b9cdf764c7d:37e596914ac459dbdf00101432af5e18$</string>
+            <string>$TexturePacker:SmartUpdate:6509ff2c88248c0c013be537ed4699dc:f10faa31c371c326cf886bc02d68b6eb:37e596914ac459dbdf00101432af5e18$</string>
             <key>textureFileName</key>
             <string>skills.png</string>
         </dict>

assets/resources/game/skills/skills.plist.meta

@@ -157,8 +157,8 @@
         "rotated": true,
         "offsetX": -1,
         "offsetY": -13,
-        "trimX": 293,
+        "trimX": 149,
-        "trimY": 612,
+        "trimY": 646,
         "width": 73,
         "height": 129,
         "rawWidth": 155,
@@ -204,7 +204,7 @@
         "offsetX": -5,
         "offsetY": -2,
         "trimX": 122,
-        "trimY": 1062,
+        "trimY": 1067,
         "width": 113,
         "height": 115,
         "rawWidth": 171,
@@ -246,11 +246,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 58,
+        "trimX": 409,
-        "trimY": 1442,
+        "trimY": 753,
         "width": 85,
         "height": 86,
         "rawWidth": 85,
@@ -342,7 +342,7 @@
         "offsetX": -1,
         "offsetY": -4,
         "trimX": 407,
-        "trimY": 750,
+        "trimY": 888,
         "width": 127,
         "height": 87,
         "rawWidth": 129,
@@ -387,8 +387,8 @@
         "rotated": true,
         "offsetX": -4,
         "offsetY": -14,
-        "trimX": 130,
+        "trimX": 1,
-        "trimY": 775,
+        "trimY": 723,
         "width": 93,
         "height": 127,
         "rawWidth": 155,
@@ -522,11 +522,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 18,
         "offsetY": 1,
-        "trimX": 445,
+        "trimX": 293,
-        "trimY": 562,
+        "trimY": 612,
         "width": 138,
         "height": 51,
         "rawWidth": 184,
@@ -568,11 +568,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 18,
         "offsetY": 1,
-        "trimX": 445,
+        "trimX": 293,
-        "trimY": 562,
+        "trimY": 612,
         "width": 138,
         "height": 51,
         "rawWidth": 184,
@@ -617,8 +617,8 @@
         "rotated": true,
         "offsetX": -6,
         "offsetY": -1,
-        "trimX": 145,
+        "trimX": 445,
-        "trimY": 1442,
+        "trimY": 562,
         "width": 84,
         "height": 50,
         "rawWidth": 102,
@@ -664,7 +664,7 @@
         "offsetX": -3,
         "offsetY": 0,
         "trimX": 407,
-        "trimY": 702,
+        "trimY": 840,
         "width": 88,
         "height": 46,
         "rawWidth": 102,
@@ -709,8 +709,8 @@
         "rotated": true,
         "offsetX": -2,
         "offsetY": 0,
-        "trimX": 168,
+        "trimX": 353,
-        "trimY": 1284,
+        "trimY": 1286,
         "width": 90,
         "height": 46,
         "rawWidth": 102,
@@ -752,11 +752,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -2,
         "offsetY": 0,
-        "trimX": 154,
+        "trimX": 340,
-        "trimY": 1376,
+        "trimY": 1194,
         "width": 90,
         "height": 52,
         "rawWidth": 102,
@@ -801,8 +801,8 @@
         "rotated": false,
         "offsetX": 3,
         "offsetY": -1,
-        "trimX": 60,
+        "trimX": 424,
-        "trimY": 1284,
+        "trimY": 1393,
         "width": 53,
         "height": 53,
         "rawWidth": 137,
@@ -847,8 +847,8 @@
         "rotated": true,
         "offsetX": 3,
         "offsetY": -3,
-        "trimX": 1,
+        "trimX": 365,
-        "trimY": 1284,
+        "trimY": 1393,
         "width": 63,
         "height": 57,
         "rawWidth": 137,
@@ -893,8 +893,8 @@
         "rotated": false,
         "offsetX": 3,
         "offsetY": -1,
-        "trimX": 423,
+        "trimX": 401,
-        "trimY": 1356,
+        "trimY": 1253,
         "width": 73,
         "height": 67,
         "rawWidth": 137,
@@ -939,8 +939,8 @@
         "rotated": false,
         "offsetX": 2,
         "offsetY": 2,
-        "trimX": 326,
+        "trimX": 114,
-        "trimY": 1347,
+        "trimY": 1293,
         "width": 95,
         "height": 93,
         "rawWidth": 137,
@@ -982,11 +982,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 1,
         "offsetY": 2,
-        "trimX": 112,
+        "trimX": 108,
-        "trimY": 1177,
+        "trimY": 1389,
         "width": 107,
         "height": 105,
         "rawWidth": 137,
@@ -1031,8 +1031,8 @@
         "rotated": false,
         "offsetX": 1,
         "offsetY": 2,
-        "trimX": 384,
+        "trimX": 122,
-        "trimY": 879,
+        "trimY": 1182,
         "width": 111,
         "height": 109,
         "rawWidth": 137,
@@ -1077,8 +1077,8 @@
         "rotated": false,
         "offsetX": 1,
         "offsetY": 1,
-        "trimX": 251,
+        "trimX": 247,
-        "trimY": 970,
+        "trimY": 1012,
         "width": 115,
         "height": 113,
         "rawWidth": 137,
@@ -1124,7 +1124,7 @@
         "offsetX": 0,
         "offsetY": 1,
         "trimX": 1,
-        "trimY": 1058,
+        "trimY": 1064,
         "width": 119,
         "height": 117,
         "rawWidth": 137,
@@ -1169,8 +1169,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 259,
+        "trimX": 255,
-        "trimY": 847,
+        "trimY": 889,
         "width": 123,
         "height": 121,
         "rawWidth": 137,
@@ -1216,7 +1216,7 @@
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 1,
-        "trimY": 852,
+        "trimY": 818,
         "width": 125,
         "height": 125,
         "rawWidth": 137,
@@ -1261,8 +1261,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 149,
+        "trimX": 280,
-        "trimY": 646,
+        "trimY": 665,
         "width": 127,
         "height": 127,
         "rawWidth": 137,
@@ -1304,11 +1304,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -1,
         "offsetY": -9,
-        "trimX": 115,
+        "trimX": 424,
-        "trimY": 1284,
+        "trimY": 1448,
         "width": 51,
         "height": 53,
         "rawWidth": 171,
@@ -1353,8 +1353,8 @@
         "rotated": false,
         "offsetX": -2,
         "offsetY": -4,
-        "trimX": 239,
+        "trimX": 1,
-        "trimY": 1085,
+        "trimY": 1183,
         "width": 111,
         "height": 103,
         "rawWidth": 171,
@@ -1399,8 +1399,8 @@
         "rotated": true,
         "offsetX": -3,
         "offsetY": -1,
-        "trimX": 128,
+        "trimX": 1,
-        "trimY": 943,
+        "trimY": 945,
         "width": 117,
         "height": 121,
         "rawWidth": 171,
@@ -1445,8 +1445,8 @@
         "rotated": true,
         "offsetX": 14,
         "offsetY": -2,
-        "trimX": 1,
+        "trimX": 124,
-        "trimY": 979,
+        "trimY": 988,
         "width": 77,
         "height": 121,
         "rawWidth": 171,
@@ -1491,8 +1491,8 @@
         "rotated": false,
         "offsetX": -2,
         "offsetY": -12,
-        "trimX": 246,
+        "trimX": 401,
-        "trimY": 1352,
+        "trimY": 1322,
         "width": 70,
         "height": 69,
         "rawWidth": 228,
@@ -1675,8 +1675,8 @@
         "rotated": true,
         "offsetX": -2,
         "offsetY": -1,
-        "trimX": 377,
+        "trimX": 364,
-        "trimY": 1442,
+        "trimY": 1012,
         "width": 33,
         "height": 41,
         "rawWidth": 113,
@@ -1718,11 +1718,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -2,
         "offsetY": 3,
-        "trimX": 197,
+        "trimX": 280,
-        "trimY": 1442,
+        "trimY": 1388,
         "width": 83,
         "height": 95,
         "rawWidth": 113,
@@ -1767,8 +1767,8 @@
         "rotated": true,
         "offsetX": -1,
         "offsetY": 3,
-        "trimX": 221,
+        "trimX": 235,
-        "trimY": 1255,
+        "trimY": 1194,
         "width": 95,
         "height": 103,
         "rawWidth": 113,
@@ -1813,8 +1813,8 @@
         "rotated": true,
         "offsetX": 1,
         "offsetY": 1,
-        "trimX": 352,
+        "trimX": 1,
-        "trimY": 1150,
+        "trimY": 1288,
         "width": 99,
         "height": 111,
         "rawWidth": 113,
@@ -1859,8 +1859,8 @@
         "rotated": true,
         "offsetX": 6,
         "offsetY": 0,
-        "trimX": 368,
+        "trimX": 364,
-        "trimY": 990,
+        "trimY": 1074,
         "width": 91,
         "height": 113,
         "rawWidth": 113,
@@ -1939,52 +1939,6 @@
       ],
       "subMetas": {}
     },
-    "accaf": {
-      "importer": "sprite-frame",
-      "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@accaf",
-      "displayName": "",
-      "id": "accaf",
-      "name": "OK_ult_2_0001",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 5,
-        "trimX": 330,
-        "trimY": 1251,
-        "width": 104,
-        "height": 94,
-        "rawWidth": 110,
-        "rawHeight": 110,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
-        "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
     "11efd": {
       "importer": "sprite-frame",
       "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@11efd",
@@ -1997,8 +1951,8 @@
         "rotated": false,
         "offsetX": -2,
         "offsetY": -2,
-        "trimX": 259,
+        "trimX": 128,
-        "trimY": 782,
+        "trimY": 850,
         "width": 125,
         "height": 63,
         "rawWidth": 129,
@@ -2043,8 +1997,8 @@
         "rotated": false,
         "offsetX": 4,
         "offsetY": -1,
-        "trimX": 368,
+        "trimX": 239,
-        "trimY": 1083,
+        "trimY": 1127,
         "width": 113,
         "height": 65,
         "rawWidth": 129,
@@ -2089,8 +2043,8 @@
         "rotated": true,
         "offsetX": 9,
         "offsetY": -3,
-        "trimX": 436,
+        "trimX": 433,
-        "trimY": 1251,
+        "trimY": 648,
         "width": 103,
         "height": 59,
         "rawWidth": 129,
@@ -2132,11 +2086,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 8,
         "offsetY": -1,
-        "trimX": 221,
+        "trimX": 215,
-        "trimY": 1190,
+        "trimY": 1388,
         "width": 107,
         "height": 63,
         "rawWidth": 129,
@@ -2181,8 +2135,8 @@
         "rotated": true,
         "offsetX": 14,
         "offsetY": -2,
-        "trimX": 85,
+        "trimX": 284,
-        "trimY": 1339,
+        "trimY": 1291,
         "width": 95,
         "height": 67,
         "rawWidth": 129,
@@ -2224,11 +2178,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 17,
         "offsetY": -3,
-        "trimX": 1,
+        "trimX": 407,
-        "trimY": 1442,
+        "trimY": 1017,
         "width": 87,
         "height": 55,
         "rawWidth": 129,
@@ -2270,11 +2224,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 8,
         "offsetY": -1,
-        "trimX": 221,
+        "trimX": 215,
-        "trimY": 1190,
+        "trimY": 1388,
         "width": 107,
         "height": 63,
         "rawWidth": 129,
@@ -2491,24 +2445,24 @@
       ],
       "subMetas": {}
     },
-    "a3f8b": {
+    "bbb42": {
       "importer": "sprite-frame",
-      "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@a3f8b",
+      "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@bbb42",
       "displayName": "",
-      "id": "a3f8b",
+      "id": "bbb42",
-      "name": "gd",
+      "name": "dun",
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
-        "offsetX": 0,
+        "offsetX": -1,
-        "offsetY": 0,
+        "offsetY": 1,
-        "trimX": 294,
+        "trimX": 401,
-        "trimY": 1442,
+        "trimY": 1167,
-        "width": 83,
+        "width": 86,
-        "height": 81,
+        "height": 84,
-        "rawWidth": 83,
+        "rawWidth": 110,
-        "rawHeight": 81,
+        "rawHeight": 110,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -2549,8 +2503,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
+        "trimX": 149,
-        "trimY": 723,
+        "trimY": 721,
         "width": 127,
         "height": 127,
         "rawWidth": 127,
@@ -3006,11 +2960,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 1,
         "offsetY": -19,
         "trimX": 1,
-        "trimY": 1177,
+        "trimY": 1389,
         "width": 105,
         "height": 109,
         "rawWidth": 155,
@@ -3102,7 +3056,7 @@
         "offsetX": -4,
         "offsetY": -14,
         "trimX": 278,
-        "trimY": 687,
+        "trimY": 794,
         "width": 93,
         "height": 127,
         "rawWidth": 155,
@@ -3148,7 +3102,7 @@
         "offsetX": 0,
         "offsetY": -1,
         "trimX": 128,
-        "trimY": 870,
+        "trimY": 915,
         "width": 71,
         "height": 123,
         "rawWidth": 155,
@@ -3193,8 +3147,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -3,
-        "trimX": 423,
+        "trimX": 211,
-        "trimY": 1425,
+        "trimY": 1293,
         "width": 71,
         "height": 93,
         "rawWidth": 155,
@@ -3226,52 +3180,6 @@
         ".json"
       ],
       "subMetas": {}
-    },
-    "79dcd": {
-      "importer": "sprite-frame",
-      "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@79dcd",
-      "displayName": "",
-      "id": "79dcd",
-      "name": "zhao",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1,
-        "trimY": 1352,
-        "width": 82,
-        "height": 82,
-        "rawWidth": 82,
-        "rawHeight": 82,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
-        "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
     }
   },
   "userData": {

assets/resources/game/skills/tooltip.prefab

@@ -31,20 +31,20 @@
         "__id__": 32
       },
       {
-        "__id__": 48
+        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 52
       },
       {
-        "__id__": 60
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -845,19 +845,16 @@
     "_children": [
       {
         "__id__": 33
-      },
-      {
-        "__id__": 39
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 41
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -888,142 +885,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label_Badge01_Yellow",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 32
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 34
-      },
-      {
-        "__id__": 36
-      }
-    ],
-    "_prefab": {
-      "__id__": 38
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 3.856,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.7,
-      "y": 0.6,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 33
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 35
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 129,
-      "height": 132
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "d5MF1+t65N5pv+g9Bis5vU"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 33
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 37
-    },
-    "_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@3ac22",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "995KsdydJIkrkR8mECle/S"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "3d8wiAOzxFarKeT1zVPCIg",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.Node",
     "_name": "hp",
@@ -1036,14 +897,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 34
       },
       {
-        "__id__": 42
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 38
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1080,11 +941,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 35
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1108,11 +969,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 37
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1196,7 +1057,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 40
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1237,17 +1098,17 @@
     },
     "_children": [
       {
-        "__id__": 49
+        "__id__": 43
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 51
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1284,20 +1145,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 48
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 44
       },
       {
-        "__id__": 52
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1334,11 +1195,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1362,11 +1223,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 47
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1443,11 +1304,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 48
+      "__id__": 42
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 50
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1488,7 +1349,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1516,7 +1377,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 55
     },
     "_id": ""
   },

assets/resources/gui/element/btn1.prefab

@@ -163,11 +163,11 @@
       "__type__": "cc.Color",
       "r": 255,
       "g": 255,
-      "b": 0,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d27fa",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@55671",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -303,7 +303,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0ec4f",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f0088",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -439,7 +439,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b6f73",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f0088",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,

assets/script/game/common/SingletonModuleComp.ts

@@ -40,7 +40,7 @@ export class SingletonModuleComp extends ecs.Comp {
     };
     /** 游戏主角 */
     heros:any={
-        5001:{uuid:5001,lv:1,exp:0,slv:1,num:0,x1:0},
+        5001:{uuid:5001,lv:1,exp:0,slv:1,num:10000,x1:0},
         5002:{uuid:5002,lv:2,exp:0,slv:1,num:0,x1:0},
         5003:{uuid:5003,lv:3,exp:0,slv:1,num:0,x1:0},
         5004:{uuid:5004,lv:1,exp:0,slv:1,num:0,x1:0},

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

@@ -1,6 +1,28 @@
 export const SlvUp =[10,20,40,80,160,320,99999]
 export const LvUp =[100]
 export enum UpGold {
-    LvUp=100,
+    LvUp=1000,
     SlvUp=100,
-}
+}
+
+export function getUpGoldByRange(range: number): number {
+    if (range >= 1 && range <= 10) return 100;
+    if (range >= 11 && range <= 20) return 2000;
+    if (range >= 21 && range <= 40) return 3000;
+    if (range >= 41 && range <= 80) return 4000;
+    if (range >= 81 && range <= 160) return 5000;
+    if (range >= 161 && range <= 320) return 6000;
+    if (range >= 321 && range <= 99999) return 7000;
+    return 0;
+}
+export function getUpChipByLv(lv: number): number {
+    if (lv >= 1 && lv <= 5) return 10;
+    if (lv >= 6 && lv <= 10) return 20;
+    if (lv >= 11 && lv <= 15) return 30;
+    if (lv >= 16 && lv <= 20) return 40;
+    if (lv >= 21 && lv <= 25) return 50;
+    if (lv >= 26 && lv <= 30) return 60;
+    if (lv >= 31 && lv <= 35) return 70;
+    if (lv >= 36 && lv <= 40) return 80;
+    if (lv >= 41 && lv <= 45) return 90;
+}

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

@@ -606,7 +606,7 @@ export const SkillSet = {
     "sonsk": 0,
     "hero": 0,
     "name": "狂暴",
-    "sp_name": "atkup",
+    "sp_name": "apup",
     "info": "为全体友方增加施法者攻击力20%的攻击"
   },
   "6021": {

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

@@ -66,7 +66,7 @@ export const HeroInfo = {
     5001:{uuid:5001,name:"圣盾战",path:"k2",quality:2,kind:1,type:0,
         hp:5120,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6018,6018,6018,6018,6018,6018],sk3:[6018,6018,6018,6018,6018,6018],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -75,7 +75,7 @@ export const HeroInfo = {
     5002:{uuid:5002,name:"冰女",path:"df3",quality:2,kind:2,type:2,
         hp:3120,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6022,6022,6022,6022,6022,6022],sk3:[6022,6022,6022,6022,6022,6022],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -84,7 +84,7 @@ export const HeroInfo = {
     5003:{uuid:5003,name:"牧师",path:"h1",quality:2,kind:2,type:2,
         hp:6210,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6004,6004,6004,6004,6004,6004],sk2:[6017,6017,6017,6017,6017,6017],sk3:[6017,6017,6017,6017,6017,6017],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -93,7 +93,7 @@ export const HeroInfo = {
     5004:{uuid:5004,name:"自愈骑",path:"k3",quality:2,kind:1,type:0,
         hp:5510,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6032,6032,6032,6032,6032,6032],sk3:[6032,6032,6032,6032,6032,6032],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -102,7 +102,7 @@ export const HeroInfo = {
     5005:{uuid:5005,name:"船长",path:"cz1",quality:2,kind:2,type:0,
         hp:4720,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6026,6026,6026,6026,6026,6026],sk3:[6026,6026,6026,6026,6026,6026],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -111,7 +111,7 @@ export const HeroInfo = {
     5006:{uuid:5006,name:"亚瑟王",path:"k5",quality:2,kind:2,type:0,
         hp:5230,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6027,6027,6027,6027,6027,6027],sk3:[6027,6027,6027,6027,6027,6027],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -120,7 +120,7 @@ export const HeroInfo = {
     5007:{uuid:5007,name:"院长",path:"m2",quality:2,kind:1,type:2,
         hp:3300,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6029,6029,6029,6029,6029,6029],sk3:[6029,6029,6029,6029,6029,6029],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -129,7 +129,7 @@ export const HeroInfo = {
     5008:{uuid:5008,name:"火女",path:"m3",quality:2,kind:2,type:2,
         hp:3160,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6002,6002,6002,6002,6002,6002],sk2:[6012,6012,6012,6012,6012,6012],sk3:[6012,6012,6012,6012,6012,6012],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -138,7 +138,7 @@ export const HeroInfo = {
     5009:{uuid:5009,name:"风暴精灵",path:"m4",quality:2,kind:2,type:2,
         hp:3110,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6016,6016,6016,6016,6016,6016],sk3:[6016,6016,6016,6016,6016,6016],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -147,7 +147,7 @@ export const HeroInfo = {
     5010:{uuid:5010,name:"召唤师",path:"zh1",quality:2,kind:2,type:2,
         hp:6160,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6031,6031,6031,6031,6031,6031],sk3:[6031,6031,6031,6031,6031,6031],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -156,7 +156,7 @@ export const HeroInfo = {
     5011:{uuid:5011,name:"自然德",path:"d1",quality:2,kind:2,type:2,
         hp:6220,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6028,6028,6028,6028,6028,6028],sk3:[6028,6028,6028,6028,6028,6028],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -165,7 +165,7 @@ export const HeroInfo = {
     5012:{uuid:5012,name:"野兽德",path:"d2",quality:2,kind:2,type:2,
         hp:6010,hp_up:150,shp_up:20,def:50,def_up:2,sdef_up:0,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6019,6019,6019,6019,6019,6019],sk3:[6019,6019,6019,6019,6019,6019],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -174,7 +174,7 @@ export const HeroInfo = {
     5013:{uuid:5013,name:"绿箭",path:"a1",quality:2,kind:1,type:1,
         hp:3110,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6015,6015,6015,6015,6015,6015],sk3:[6015,6015,6015,6015,6015,6015],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -183,7 +183,7 @@ export const HeroInfo = {
     5014:{uuid:5014,name:"罗宾汉",path:"a2",quality:2,kind:1,type:1,
         hp:3210,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6016,6016,6016,6016,6016,6016],sk3:[6016,6016,6016,6016,6016,6016],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -192,7 +192,7 @@ export const HeroInfo = {
     5015:{uuid:5015,name:"鹰眼",path:"a3",quality:2,kind:1,type:1,
         hp:3230,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6014,6014,6014,6014,6014,6014],sk3:[6014,6014,6014,6014,6014,6014],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -201,7 +201,7 @@ export const HeroInfo = {
     5016:{uuid:5016,name:"狙击手",path:"a4",quality:2,kind:2,type:1,
         hp:3090,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6021,6021,6021,6021,6021,6021],sk3:[6021,6021,6021,6021,6021,6021],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -210,7 +210,7 @@ export const HeroInfo = {
     5017:{uuid:5017,name:"死灵法师",path:"zh2",quality:2,kind:2,type:1,
         hp:3110,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6017,6013,6013,6013,6013,6013],sk3:[6013,6013,6013,6013,6013,6013],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -219,7 +219,7 @@ export const HeroInfo = {
     5018:{uuid:5018,name:"风暴斧",path:"ft1",quality:2,kind:2,type:0,
         hp:4650,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6024,6024,6024,6024,6024,6024],sk3:[6024,6024,6024,6024,6024,6024],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -228,7 +228,7 @@ export const HeroInfo = {
     5019:{uuid:5019,name:"剑圣",path:"k1",quality:2,kind:2,type:0,
         hp:4650,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6024,6024,6024,6024,6024,6024],sk3:[6024,6024,6024,6024,6024,6024],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -237,7 +237,7 @@ export const HeroInfo = {
     5020:{uuid:5020,name:"黑桃K",path:"k6",quality:2,kind:2,type:0,
         hp:5110,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6027,6027,6027,6027,6027,6027],sk3:[6027,6027,6027,6027,6027,6027],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -246,7 +246,7 @@ export const HeroInfo = {
     5021:{uuid:5021,name:"红桃K",path:"k7",quality:2,kind:2,type:0,
         hp:5110,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6027,6027,6027,6027,6027,6027],sk3:[6027,6027,6027,6027,6027,6027],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -255,7 +255,7 @@ export const HeroInfo = {
     5022:{uuid:5022,name:"武道家",path:"k4",quality:2,kind:2,type:0,
         hp:4550,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6027,6027,6027,6027,6027,6027],sk3:[6027,6027,6027,6027,6027,6027],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -264,52 +264,52 @@ export const HeroInfo = {
     5023:{uuid:5023,name:"射手未定",path:"a5",quality:2,kind:2,type:1,
         hp:3080,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
-        sk1:[6006,6006,6006,6006,6006,6006],sk2:[6020,6020,6020,6020,6020,6020],sk3:[6020,6020,6020,6020,6020,6020],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
+        sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
         uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0],
         crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]},
     5024:{uuid:5024,name:"射手未定",path:"a6",quality:2,kind:2,type:1,
         hp:3060,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
-        sk1:[6006,6006,6006,6006,6006,6006],sk2:[6020,6020,6020,6020,6020,6020],sk3:[6020,6020,6020,6020,6020,6020],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
+        sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
         uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0],
         crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]},
     5025:{uuid:5025,name:"法师待定",path:"m7",quality:2,kind:2,type:2,
         hp:3210,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
-        sk1:[6001,6001,6001,6001,6001,6001],sk2:[6023,6023,6023,6023,6023,6023],sk3:[6023,6023,6023,6023,6023,6023],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
+        sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6001,6001,6001,6001,6001,6001],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
         uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0],
         crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]},
     5026:{uuid:5026,name:"法师待定",path:"m8",quality:2,kind:2,type:2,
         hp:3150,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
-        sk1:[6001,6001,6001,6001,6001,6001],sk2:[6023,6023,6023,6023,6023,6023],sk3:[6023,6023,6023,6023,6023,6023],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
+        sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6001,6001,6001,6001,6001,6001],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
         uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0],
         crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]},
     5027:{uuid:5027,name:"法师待定",path:"m9",quality:2,kind:2,type:2,
         hp:3130,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:4,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
-        sk1:[6001,6001,6001,6001,6001,6001],sk2:[6023,6023,6023,6023,6023,6023],sk3:[6023,6023,6023,6023,6023,6023],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
+        sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6001,6001,6001,6001,6001,6001],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
         uar:[0,0,0,0,0,0],uac:[1,1,1,1,1,1],dgr:[0,0,0,0,0,0],dgc:[1,1,1,1,1,1],crr:[0,0,0,0,0,0],
         crc:[1,1,1,1,1,1],tals:["无","无","无","无","无"]},
     5201:{uuid:5201,name:"兽人战士",path:"mor1",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -318,7 +318,7 @@ export const HeroInfo = {
     5202:{uuid:5202,name:"兽人刺客",path:"mor2",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -327,7 +327,7 @@ export const HeroInfo = {
     5203:{uuid:5203,name:"兽人护卫",path:"mor3",quality:2,kind:1,type:1,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6007,6007,6007,6007,6007,6007],sk2:[6007,6007,6007,6007,6007,6007],sk3:[6007,6007,6007,6007,6007,6007],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -336,7 +336,7 @@ export const HeroInfo = {
     5204:{uuid:5204,name:"石卫",path:"mgem1",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -345,7 +345,7 @@ export const HeroInfo = {
     5205:{uuid:5205,name:"土卫",path:"mgem2",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -354,7 +354,7 @@ export const HeroInfo = {
     5206:{uuid:5206,name:"树人",path:"mgem3",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -363,7 +363,7 @@ export const HeroInfo = {
     5207:{uuid:5207,name:"小骷髅",path:"mkl1",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -372,7 +372,7 @@ export const HeroInfo = {
     5208:{uuid:5208,name:"小骷髅",path:"mkl2",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -381,7 +381,7 @@ export const HeroInfo = {
     5209:{uuid:5209,name:"小骷髅",path:"mkl3",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -390,7 +390,7 @@ export const HeroInfo = {
     5210:{uuid:5210,name:"骷髅战士",path:"mkl4",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -399,7 +399,7 @@ export const HeroInfo = {
     5211:{uuid:5211,name:"骷髅战士",path:"mkl5",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -408,7 +408,7 @@ export const HeroInfo = {
     5212:{uuid:5212,name:"骷髅战士",path:"mkl6",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -417,7 +417,7 @@ export const HeroInfo = {
     5213:{uuid:5213,name:"骷髅射手",path:"mkla1",quality:2,kind:1,type:1,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -426,7 +426,7 @@ export const HeroInfo = {
     5214:{uuid:5214,name:"骷髅射手",path:"mkla2",quality:2,kind:1,type:1,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -435,7 +435,7 @@ export const HeroInfo = {
     5215:{uuid:5215,name:"骷髅射手",path:"mkla3",quality:2,kind:1,type:1,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -444,7 +444,7 @@ export const HeroInfo = {
     5216:{uuid:5216,name:"元素1",path:"my1",quality:2,kind:1,type:2,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6001,6001,6001,6001,6001,6001],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -453,7 +453,7 @@ export const HeroInfo = {
     5217:{uuid:5217,name:"元素2",path:"my2",quality:2,kind:1,type:2,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6002,6002,6002,6002,6002,6002],sk2:[6002,6002,6002,6002,6002,6002],sk3:[6002,6002,6002,6002,6002,6002],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -462,7 +462,7 @@ export const HeroInfo = {
     5218:{uuid:5218,name:"元素3",path:"my3",quality:2,kind:1,type:2,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1.5,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.5,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6003,6003,6003,6003,6003,6003],sk2:[6003,6003,6003,6003,6003,6003],sk3:[6003,6003,6003,6003,6003,6003],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -471,7 +471,7 @@ export const HeroInfo = {
     5219:{uuid:5219,name:"牛头战士",path:"mn1",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -480,7 +480,7 @@ export const HeroInfo = {
     5220:{uuid:5220,name:"牛头战士",path:"mn2",quality:2,kind:1,type:1,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6010,6010,6010,6010,6010,6010],sk2:[6010,6010,6010,6010,6010,6010],sk3:[6010,6010,6010,6010,6010,6010],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -489,7 +489,7 @@ export const HeroInfo = {
     5221:{uuid:5221,name:"牛头战士",path:"mn3",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -498,7 +498,7 @@ export const HeroInfo = {
     5222:{uuid:5222,name:"独眼巨人",path:"md1",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -507,7 +507,7 @@ export const HeroInfo = {
     5223:{uuid:5223,name:"独眼巨人",path:"md2",quality:2,kind:1,type:0,
         hp:5000,hp_up:120,shp_up:20,def:100,def_up:15,sdef_up:10,ap:100,ap_up:5,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,
-        a_cd:1,speed:120,lvexp:100,slvexp:10,slv:0,aexp:5,uaexp:2,cexp:5,
+        a_cd:1,speed:120,lvexp:0,slvexp:0,slv:0,aexp:5,uaexp:2,cexp:5,
         doexp:5,dexp:20,pw:0,pwm:150,pws:10,apw:2,uapw:1,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6008,6008,6008,6008,6008,6008],sk2:[6008,6008,6008,6008,6008,6008],sk3:[6008,6008,6008,6008,6008,6008],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -516,7 +516,7 @@ export const HeroInfo = {
     5224:{uuid:5224,name:"独眼巨人",path:"md3",quality:2,kind:1,type:1,
         hp:3000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:400,
-        a_cd:1.2,speed:80,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1.2,speed:80,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6005,6005,6005,6005,6005,6005],sk2:[6005,6005,6005,6005,6005,6005],sk3:[6005,6005,6005,6005,6005,6005],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -525,7 +525,7 @@ export const HeroInfo = {
     5225:{uuid:5225,name:"精英独眼",path:"md4",quality:2,kind:1,type:2,
         hp:6000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6009,6009,6009,6009,6009,6009],sk2:[6009,6009,6009,6009,6009,6009],sk3:[6009,6009,6009,6009,6009,6009],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -534,7 +534,7 @@ export const HeroInfo = {
     5226:{uuid:5226,name:"精英牛头",path:"mn4",quality:2,kind:1,type:2,
         hp:6000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6010,6010,6010,6010,6010,6010],sk2:[6010,6010,6010,6010,6010,6010],sk3:[6010,6010,6010,6010,6010,6010],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],
@@ -543,7 +543,7 @@ export const HeroInfo = {
     5227:{uuid:5227,name:"精英兽人",path:"mor4",quality:2,kind:1,type:2,
         hp:6000,hp_up:100,shp_up:20,def:50,def_up:2,sdef_up:0,ap:150,ap_up:10,
         sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:500,
-        a_cd:1,speed:50,lvexp:100,slvexp:10,slv:0,aexp:6,uaexp:1,cexp:10,
+        a_cd:1,speed:50,lvexp:0,slvexp:0,slv:0,aexp:6,uaexp:1,cexp:10,
         doexp:10,dexp:20,pw:0,pwm:150,pws:10,apw:3,uapw:2,cpw:5,dpw:5,
         dopw:5,wp:1001,arm:2001,ring:3001,shoes:4001,
         sk1:[6009,6009,6009,6009,6009,6009],sk2:[6009,6009,6009,6009,6009,6009],sk3:[6009,6009,6009,6009,6009,6009],akr:[0,0,0,0,0,0],akc:[1,1,1,1,1,1],

assets/script/game/hero/Hero.ts

@@ -76,30 +76,25 @@ export class Hero extends ecs.Entity {
         hv.dopw=hero.dopw;
         
         hv.lv = role.lv;        
-        hv.slv = role.slv;
         hv.type = hero.type;
-        let slv=0
+        let slv= Math.floor(( hv.lv) / 5);
-        if (role.slv >= 5) slv=1       
+        let sklv=slv
-        if (role.slv >= 10) slv=2
+        if(sklv >= 5) sklv=5;
-        if (role.slv >= 15) slv=3
-        if (role.slv >= 20) slv=4
-        if (role.slv >= 25) slv=5
 
-
+        hv.sk1 = hero.sk1[sklv]; 
-        hv.sk1 = hero.sk1[slv]; 
+        hv.sk2 = hero.sk2[sklv]; 
-        hv.sk2 = hero.sk2[slv]; 
+        hv.sk3 = hero.sk3[sklv];
-        hv.sk3 = hero.sk3[slv];
+        hv.akc = hero.akc[sklv]; 
-        hv.akc = hero.akc[slv]; 
+        hv.uac = hero.uac[sklv];
-        hv.uac = hero.uac[slv];
+        hv.crc = hero.crc[sklv];
-        hv.crc = hero.crc[slv];
+        hv.dgc = hero.dgc[sklv];
-        hv.dgc = hero.dgc[slv];
+        hv.akr = hero.akr[sklv]; 
-        hv.akr = hero.akr[slv]; 
+        hv.uar = hero.uar[sklv];
-        hv.uar = hero.uar[slv];
+        hv.crr = hero.crr[sklv];
-        hv.crr = hero.crr[slv];
+        hv.dgr = hero.dgr[sklv];
-        hv.dgr = hero.dgr[slv];
+        hv.rhp_max=hv.hp= hv.hp_max =(hero.hp+hero.hp_up*hv.lv)*(1+hero.shp_up/100*slv)  ;
-        hv.rhp_max=hv.hp= hv.hp_max =(hero.hp+hero.hp_up*hv.lv)*(1+hero.shp_up/100*(hv.slv-1))  ;
+        hv.ap = (hero.ap+hero.ap_up*hv.lv) *(1+hero.sap_up/100*slv);
-        hv.ap = (hero.ap+hero.ap_up*hv.lv) *(1+hero.sap_up/100*(hv.slv-1));
+        hv.def= (hero.def+hero.def_up*hv.lv)*(1+hero.sdef_up/100*slv);
-        hv.def= (hero.def+hero.def_up*hv.lv)*(1+hero.sdef_up/100*(hv.slv-1));
         hv.cd = hero.a_cd
         hv.crit = hero.crit; //暴击率
         hv.crit_add = hero.crit_add;//暴击伤害加成

assets/script/game/hero/HeroCardComp.ts

@@ -1,4 +1,4 @@
-import { _decorator, Color, Label, Sprite } from "cc";
+import { _decorator, Color, Label, ProgressBar, Sprite } from "cc";
 import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
 import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
 import { HeroHomeComp } from "../map/HeroHomeComp";
@@ -6,7 +6,7 @@ import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/O
 import { smc } from "../common/SingletonModuleComp";
 import { HeroInfo } from "../common/config/heroSet";
 import { ColorSet } from "../common/config/BoxSet";
-import { SlvUp } from "../common/config/RoleSet";
+import { getUpChipByLv, SlvUp } from "../common/config/RoleSet";
 
 const { ccclass, property } = _decorator;
 
@@ -44,28 +44,31 @@ export class HeroCardComp extends CCComp {
         
         let slv = this.node.getChildByName("slv")
         this.node.getChildByName("lv").getComponent(Label).string=smc.heros[this.h_uuid].lv.toString()+"级"
-        if(smc.heros[this.h_uuid].slv==0){
+        // if(smc.heros[this.h_uuid].slv==0){
-            this.node.getChildByName("lock").active=true
+        //     this.node.getChildByName("lock").active=true
-            slv.active=false
+        //     slv.active=false
-        }else{
+        // }else{
-            slv.active=true
+        //     slv.active=true
-            this.node.getChildByName("lock").active=false
+        //     this.node.getChildByName("lock").active=false
-            slv.getChildByName("slv").getComponent(Label).string=smc.heros[this.h_uuid].slv.toString()
+        //     slv.getChildByName("slv").getComponent(Label).string=smc.heros[this.h_uuid].slv.toString()
-        }
+        // }
-        let slvneed=HeroInfo[this.h_uuid].slvexp*smc.heros[this.h_uuid].slv
+        let lvneed=(getUpChipByLv(smc.heros[this.h_uuid].lv)-HeroInfo[this.h_uuid].lvexp)*smc.heros[this.h_uuid].lv
-        let slvnum=smc.heros[this.h_uuid].num
+        let lvnum=smc.heros[this.h_uuid].num
-        this.node.getChildByName("up").active=slvnum>=slvneed
+        this.node.getChildByName("up").active=lvnum>=lvneed
-        switch(HeroInfo[this.h_uuid].quality){
+        this.node.getChildByName("need").getComponent(Label).string =  lvneed.toString()
-            case 1:
+        this.node.getChildByName("num").getComponent(Label).string =  lvnum.toString()
-                this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["BLUE"]);
+        this.node.getChildByName("bar").getComponent(ProgressBar).progress = lvnum/lvneed
-                break;
+        // switch(HeroInfo[this.h_uuid].quality){
-            case 2:
+        //     case 1:
-                this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["YELLOW"]);
+        //         this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["BLUE"]);
-                break;
+        //         break;
-            case 3:
+        //     case 2:
-                this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["RED"]);
+        //         this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["YELLOW"]);
-                break;
+        //         break;
-        }   
+        //     case 3:
+        //         this.node.getChildByName("bg").getComponent(Sprite).color= new Color().fromHEX(ColorSet["RED"]);
+        //         break;
+        // }   
     }
     /** 全局消息逻辑处理 */
     // private onHandler(event: string, args: any) {

assets/script/game/hero/Mon.ts

@@ -41,7 +41,7 @@ export class Monster extends ecs.Entity {
     }
 
     /** 加载角色 */
-    load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001,is_boss:boolean=false) {
+    load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001,is_boss:boolean=false,is_call:boolean=false,lv:number=1) {
         scale=-1
         let box_group=BoxSet.MONSTER
         console.log("mon load",uuid)
@@ -53,11 +53,11 @@ export class Monster extends ecs.Entity {
         node.parent = scene.entityLayer!.node!
 
         node.setPosition(pos)
-        this.hero_init(uuid,node,scale,box_group,is_boss)
+        this.hero_init(uuid,node,scale,box_group,is_boss,is_call,lv)
         oops.message.dispatchEvent("monster_load",this)
     }
     
-    hero_init(uuid:number=1001,node:Node,scale:number=1,box_group=BoxSet.HERO,is_boss:boolean=false) {
+    hero_init(uuid:number=1001,node:Node,scale:number=1,box_group=BoxSet.HERO,is_boss:boolean=false,is_call:boolean=false,lv:number=1) {
         var hv = node.getComponent(HeroViewComp)!;
         // console.log("hero_init",buff)
         let hero= HeroInfo[uuid]  // 共用英雄数据
@@ -78,28 +78,26 @@ export class Monster extends ecs.Entity {
         hv.cpw=hero.cpw;
         hv.dpw=hero.dpw;
         hv.dopw=hero.dopw;
-        hv.lv = 1;
+        hv.lv = lv;
-        let slv=0
+        let slv= Math.floor(( hv.lv) / 5);
-        if (hero.slv >= 5) slv=1       
+        let sklv=slv
-        if (hero.slv >= 10) slv=2
+        if(sklv >= 5) sklv=5;
-        if (hero.slv >= 15) slv=3
+
-        if (hero.slv >= 20) slv=4
-        if (hero.slv >= 25) slv=5
         hv.type = hero.type;
-        hv.sk1 = hero.sk1[slv]; 
+        hv.sk1 = hero.sk1[sklv]; 
-        hv.sk2 = hero.sk2[slv];      
+        hv.sk2 = hero.sk2[sklv];      
-        hv.sk3 = hero.sk3[slv];      
+        hv.sk3 = hero.sk3[sklv];      
-        hv.akc = hero.akc[slv]; 
+        hv.akc = hero.akc[sklv]; 
-        hv.uac = hero.uac[slv];
+        hv.uac = hero.uac[sklv];
-        hv.crc = hero.crc[slv];
+        hv.crc = hero.crc[sklv];
-        hv.dgc = hero.dgc[slv];
+        hv.dgc = hero.dgc[sklv];
-        hv.akr = hero.akr[slv]; 
+        hv.akr = hero.akr[sklv]; 
-        hv.uar = hero.uar[slv];
+        hv.uar = hero.uar[sklv];
-        hv.crr = hero.crr[slv];
+        hv.crr = hero.crr[sklv];
-        hv.dgr = hero.dgr[slv];
+        hv.dgr = hero.dgr[sklv];
-        hv.hp= hv.hp_max =hero.hp+hero.hp_up*hv.lv ;
+        hv.rhp_max=hv.hp= hv.hp_max =(hero.hp+hero.hp_up*hv.lv)*(1+hero.shp_up/100*slv);
-        hv.ap = hero.ap+hero.ap_up*hv.lv ;
+        hv.ap = (hero.ap+hero.ap_up*hv.lv) *(1+hero.sap_up/100*slv);
-        hv.def= hero.def+hero.def_up*hv.lv;
+        hv.def= (hero.def+hero.def_up*hv.lv)*(1+hero.sdef_up/100*slv);
         hv.cd = hero.a_cd
         hv.crit = hero.crit; //暴击率
         hv.crit_add = hero.crit_add;//暴击伤害加成

assets/script/game/map/HeroHomeComp.ts

@@ -8,7 +8,7 @@ import { UIID } from "../common/config/GameUIConfig";
 import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
 import { Items } from "../common/config/Items";
 import { SkillSet } from "../common/config/SkillSet";
-import { LvUp, SlvUp, UpGold } from "../common/config/RoleSet";
+import { getUpChipByLv, getUpGoldByRange, LvUp, SlvUp, UpGold } from "../common/config/RoleSet";
 import { HChipComp } from "../hero/HChipComp";
 const { ccclass, property } = _decorator;
 
@@ -19,6 +19,9 @@ export class HeroHomeComp extends CCComp {
     h_uuid:number=0
     role:any=null
     hero:any=null
+    gold_need:number=9999
+    chip_need:number=9999
+    slv:number=0
     protected onLoad(): void {
 
     }
@@ -57,14 +60,15 @@ export class HeroHomeComp extends CCComp {
     hero_show(uuid:number) {
         this.node.getChildByName("show").active=true
         this.h_uuid=uuid
-        this.role=smc.heros[uuid]
         this.hero=HeroInfo[uuid]
+        this.gold_need=(getUpGoldByRange(smc.heros[uuid].lv)*smc.heros[uuid].lv)
+        this.chip_need=(getUpChipByLv(smc.heros[uuid].lv)-this.hero.lvexp)*smc.heros[uuid].lv
         console.log("hero_show",uuid)
         let skill1 = SkillSet[this.hero.sk1[0]]
         let skill2 = SkillSet[this.hero.sk2[0]]
         var sk_path = "game/skills/skill_icon"
         // var icon_path = "game/heros/herois"
-        
+        this.slv = Math.floor((smc.heros[uuid].lv) / 5);
         this.node.getChildByName("show").getChildByName("name").getChildByName("value").getComponent(Label).string=this.hero.name
         this.node.getChildByName("show").getChildByName("name").getChildByName("g1").active=HeroInfo[uuid].quality==1
         this.node.getChildByName("show").getChildByName("name").getChildByName("g2").active=HeroInfo[uuid].quality==2
@@ -96,13 +100,14 @@ export class HeroHomeComp extends CCComp {
         this.update_data()
     }
     update_data(){
-        let slv_node=this.node.getChildByName("show").getChildByName("name").getChildByName("slv");
+        this.slv = Math.floor((smc.heros[this.h_uuid].lv) / 5);
+        // let slv_node=this.node.getChildByName("show").getChildByName("name").getChildByName("slv");
         let lvup=this.node.getChildByName("show").getChildByName("lvup");
-        let slvup=this.node.getChildByName("show").getChildByName("slvup");
+        // let slvup=this.node.getChildByName("show").getChildByName("slvup");
         let attr = this.node.getChildByName("show").getChildByName("attr");
         let attr2 = this.node.getChildByName("show").getChildByName("attr2").getChildByName("other");
-        this.node.getChildByName("show").getChildByName("name").getChildByName("lv").getComponent(Label).string = this.role.lv.toString()+"级";
+        this.node.getChildByName("show").getChildByName("name").getChildByName("lv").getComponent(Label).string = smc.heros[this.h_uuid].lv.toString()+"级";
-        slv_node.getChildByName("slv").getComponent(Label).string = this.role.slv.toString();
+        // slv_node.getChildByName("slv").getComponent(Label).string = smc.heros[uuid].slv.toString();
 
         this.node.getChildByName("show").getChildByName("name").getChildByName("quality").getChildByName("q1").active = this.hero.quality == 1;
         this.node.getChildByName("show").getChildByName("name").getChildByName("quality").getChildByName("q2").active = this.hero.quality == 2;
@@ -112,57 +117,61 @@ export class HeroHomeComp extends CCComp {
         this.node.getChildByName("show").getChildByName("name").getChildByName("quality").getChildByName("k2").active = this.hero.kind == 2;
         this.node.getChildByName("show").getChildByName("name").getChildByName("quality").getChildByName("k3").active = this.hero.kind == 3;
         
-        let lvneed=(this.hero.lvexp*this.role.lv)
-        // lvup.getChildByName("gold").getChildByName("need").getComponent(Label).string = (UpGold.LvUp*this.role.lv).toString()
-        lvup.getChildByName("item").getChildByName("btn").getChildByName("need").getComponent(Label).string = lvneed.toString()
-        lvup.getChildByName("item").getChildByName("btn").getChildByName("num").getComponent(Label).string = smc.vmdata.exp.num.toString()
-        if( smc.vmdata.exp.num>=lvneed) {
-            lvup.getChildByName("item").getChildByName("btn").getChildByName("num").getComponent(Label).color = color(0,255,0);
-        }else{
-            lvup.getChildByName("item").getChildByName("btn").getChildByName("num").getComponent(Label).color = color(255,0,0);
-        }
-        lvup.getChildByName("up").active=smc.vmdata.exp.num>=lvneed
-        // lvup.getChildByName("item").getChildByName("btn").getChildByName("bar").getComponent(ProgressBar).progress = smc.vmdata.exp.num/lvneed
-        lvup.getChildByName("info").getChildByName("ap").getComponent(Label).string = "+"+this.hero.ap_up
-        lvup.getChildByName("info").getChildByName("def").getComponent(Label).string = "+"+this.hero.def_up
-        lvup.getChildByName("info").getChildByName("hp").getComponent(Label).string = "+"+this.hero.hp_up
-        // lvup.getChildByName("item").getChildByName("btn").getChildByName("bar").getComponent(ProgressBar).progress = smc.vmdata.exp.num/((LvUp[0]+this.hero.lvexp)*this.role.lv)
-        // slvup.getChildByName("gold").getChildByName("btn").getChildByName("need").getComponent(Label).string = (UpGold.SlvUp*(this.role.slv+1)).toString()
-        let slvneed=HeroInfo[this.h_uuid].slvexp
-        let slvnum=smc.heros[this.h_uuid].num
-        slvup.getChildByName("up").active=slvnum>=slvneed
-        if( slvnum>=slvneed) {
-            slvup.getChildByName("cost").getChildByName("btn").getChildByName("num").getComponent(Label).color = color(0,255,0);
-        }else{
-            slvup.getChildByName("cost").getChildByName("btn").getChildByName("num").getComponent(Label).color = color(255,0,0);
-        }
-        slvup.getChildByName("cost").getChildByName("btn").getChildByName("need").getComponent(Label).string =  slvneed.toString()
-        slvup.getChildByName("cost").getChildByName("btn").getChildByName("num").getComponent(Label).string =  slvnum.toString()
-        // slvup.getChildByName("cost").getChildByName("btn").getChildByName("bar").getComponent(ProgressBar).progress = smc.heros[this.h_uuid].num/((SlvUp[this.role.slv]-HeroInfo[this.h_uuid].slvexp)*(1+this.role.slv))
-        let hchipcomp= slvup.getChildByName("cost").getChildByName("btn").getChildByName("hchip").getComponent(HChipComp)
-        hchipcomp.update_data(this.h_uuid,0)
 
-        slvup.getChildByName("info").getChildByName("ap").getComponent(Label).string = "+"+this.hero.sap_up+"%"
+        let lvnum=smc.heros[this.h_uuid].num
-        slvup.getChildByName("info").getChildByName("def").getComponent(Label).string = "+"+this.hero.sdef_up+"%"
+        // lvup.getChildByName("gold").getChildByName("need").getComponent(Label).string = (UpGold.LvUp*smc.heros[uuid].lv).toString()
-        slvup.getChildByName("info").getChildByName("hp").getComponent(Label).string = "+"+this.hero.shp_up+"%"
+        lvup.getChildByName("item").getChildByName("chip").getChildByName("need").getComponent(Label).string = this.chip_need.toString()
-        // if( this.role.slv==5) {
+        lvup.getChildByName("item").getChildByName("btn").getChildByName("gold").getChildByName("need").getComponent(Label).string = this.gold_need.toString()
+        lvup.getChildByName("item").getChildByName("chip").getChildByName("num").getComponent(Label).string = lvnum.toString()
+        if( lvnum >=this.chip_need) {
+            lvup.getChildByName("item").getChildByName("chip").getChildByName("num").getComponent(Label).color = color(0,255,0);
+        }else{
+            lvup.getChildByName("item").getChildByName("chip").getChildByName("num").getComponent(Label).color = color(255,0,0);
+        }
+        lvup.getChildByName("up").active=lvnum >= this.chip_need
+        lvup.getChildByName("item").getChildByName("chip").getChildByName("bar").getComponent(ProgressBar).progress = lvnum/this.chip_need
+        // lvup.getChildByName("info").getChildByName("ap").getComponent(Label).string = "+"+this.hero.ap_up
+        // lvup.getChildByName("info").getChildByName("def").getComponent(Label).string = "+"+this.hero.def_up
+        // lvup.getChildByName("info").getChildByName("hp").getComponent(Label).string = "+"+this.hero.hp_up
+        
+        // lvup.getChildByName("info2").getChildByName("ap").getComponent(Label).string = "+"+this.hero.sap_up+"%"
+        // lvup.getChildByName("info2").getChildByName("def").getComponent(Label).string = "+"+this.hero.sdef_up+"%"
+        // lvup.getChildByName("info2").getChildByName("hp").getComponent(Label).string = "+"+this.hero.shp_up+"%"
+
+        // lvup.getChildByName("item").getChildByName("btn").getChildByName("bar").getComponent(ProgressBar).progress = smc.vmdata.exp.num/((LvUp[0]+this.hero.lvexp)*smc.heros[uuid].lv)
+        // slvup.getChildByName("gold").getChildByName("btn").getChildByName("need").getComponent(Label).string = (UpGold.SlvUp*(smc.heros[uuid].slv+1)).toString()
+        // let sthis.chip_need=HeroInfo[this.h_uuid].slvexp
+        // let slvnum=smc.heros[this.h_uuid].num
+        // slvup.getChildByName("up").active=slvnum>=sthis.chip_need
+        // if( slvnum>=sthis.chip_need) {
+        //     slvup.getChildByName("cost").getChildByName("btn").getChildByName("num").getComponent(Label).color = color(0,255,0);
+        // }else{
+        //     slvup.getChildByName("cost").getChildByName("btn").getChildByName("num").getComponent(Label).color = color(255,0,0);
+        // }
+        // slvup.getChildByName("cost").getChildByName("btn").getChildByName("need").getComponent(Label).string =  sthis.chip_need.toString()
+        // slvup.getChildByName("cost").getChildByName("btn").getChildByName("num").getComponent(Label).string =  slvnum.toString()
+        // slvup.getChildByName("cost").getChildByName("btn").getChildByName("bar").getComponent(ProgressBar).progress = slvnum/sthis.chip_need
+        // let hchipcomp= slvup.getChildByName("cost").getChildByName("btn").getChildByName("hchip").getComponent(HChipComp)
+        // hchipcomp.update_data(this.h_uuid,0)
+
+        // if( smc.heros[uuid].slv==5) {
         //     slvup.getChildByName("btned").active=true
         // }else{
         //     slvup.getChildByName("btned").active=false
         // };
-        // if( this.role.slv==0) {
+        // if( smc.heros[uuid].slv==0) {
-        //     this.node.getChildByName("show").getChildByName("call").getChildByName("Node").getChildByName("cost").getChildByName("need").getComponent(Label).string =  ((SlvUp[this.role.slv]-HeroInfo[this.h_uuid].slvexp)*(1+this.role.slv)).toString()
+        //     this.node.getChildByName("show").getChildByName("call").getChildByName("Node").getChildByName("cost").getChildByName("need").getComponent(Label).string =  ((SlvUp[smc.heros[uuid].slv]-HeroInfo[this.h_uuid].slvexp)*(1+smc.heros[uuid].slv)).toString()
         //     this.node.getChildByName("show").getChildByName("call").getChildByName("Node").getChildByName("cost").getChildByName("num").getComponent(Label).string =  smc.heros[this.h_uuid].num.toString()
-        //     this.node.getChildByName("show").getChildByName("call").getChildByName("Node").getChildByName("cost").getChildByName("bar").getComponent(ProgressBar).progress = smc.heros[this.h_uuid].num/((SlvUp[this.role.slv]-HeroInfo[this.h_uuid].slvexp)*(1+this.role.slv))
+        //     this.node.getChildByName("show").getChildByName("call").getChildByName("Node").getChildByName("cost").getChildByName("bar").getComponent(ProgressBar).progress = smc.heros[this.h_uuid].num/((SlvUp[smc.heros[uuid].slv]-HeroInfo[this.h_uuid].slvexp)*(1+smc.heros[uuid].slv))
         //     let hchipcomp= this.node.getChildByName("show").getChildByName("call").getChildByName("Node").getChildByName("cost").getChildByName("hchip").getComponent(HChipComp)
         //     hchipcomp.update_data(this.h_uuid,0)
         //     this.node.getChildByName("show").getChildByName("call").active=true
         // }else{
         //     this.node.getChildByName("show").getChildByName("call").active=false
         // };
-        attr.getChildByName("ap").getChildByName("val").getComponent(Label).string = ((this.hero.ap+this.hero.ap_up* this.role.lv)*(1+this.hero.sap_up/100*(this.role.slv-1))).toFixed(0).toString()
+        attr.getChildByName("ap").getChildByName("val").getComponent(Label).string = ((this.hero.ap+this.hero.ap_up* smc.heros[this.h_uuid].lv)*(1+this.hero.sap_up/100*this.slv)).toFixed(0).toString()
-        attr.getChildByName("hp").getChildByName("val").getComponent(Label).string = ((this.hero.hp+this.hero.hp_up* this.role.lv)*(1+this.hero.shp_up/100*(this.role.slv))).toFixed(0).toString()
+        attr.getChildByName("hp").getChildByName("val").getComponent(Label).string = ((this.hero.hp+this.hero.hp_up* smc.heros[this.h_uuid].lv)*(1+this.hero.shp_up/100*this.slv)).toFixed(0).toString()
-        attr.getChildByName("def").getChildByName("val").getComponent(Label).string = ((this.hero.ap+this.hero.def_up* this.role.lv)*(1+this.hero.sdef_up/100*(this.role.slv-1))).toFixed(0).toString()
+        attr.getChildByName("def").getChildByName("val").getComponent(Label).string = ((this.hero.ap+this.hero.def_up* smc.heros[this.h_uuid].lv)*(1+this.hero.sdef_up/100*this.slv)).toFixed(0).toString()
         attr.getChildByName("acd").getChildByName("val").getComponent(Label).string = this.hero.a_cd
         attr.getChildByName("speed").getChildByName("val").getComponent(Label).string = this.hero.speed
         attr.getChildByName("dis").getChildByName("val").getComponent(Label).string = this.hero.dis
@@ -236,26 +245,31 @@ export class HeroHomeComp extends CCComp {
         this.h_uuid=HeroList[hi+1]
         this.hero_show(this.h_uuid)
     }
+    // lv_up(){
+    //     if(smc.vmdata.exp.num < ((this.hero.lvexp)*smc.heros[uuid].lv)){
+    //         oops.gui.toast("资源不足，升级失败");
+    //         return
+    //     } 
+    //     smc.vmdata.exp.num -= ((this.hero.lvexp)*smc.heros[uuid].lv)
+    //     smc.heros[uuid].lv++
+    //     this.update_data()
+    // }
     lv_up(){
-        if(smc.vmdata.exp.num < ((this.hero.lvexp)*this.role.lv)){
+        // if(smc.heros[uuid].slv>=5){
-            oops.gui.toast("资源不足，升级失败");
-            return
-        } 
-        smc.vmdata.exp.num -= ((this.hero.lvexp)*this.role.lv)
-        this.role.lv++
-        this.update_data()
-    }
-    slv_up(){
-        // if(this.role.slv>=5){
         //     oops.gui.toast("已经满星，升阶失败");
         //     return
         // }
-        if(smc.heros[this.h_uuid].num < HeroInfo[this.h_uuid].slvexp){
+        if(smc.heros[this.h_uuid].num < this.chip_need){
-            oops.gui.toast("资源不足，升阶失败");
+            oops.gui.toast("碎片不足，升级失败");
             return
         } 
-        smc.heros[this.h_uuid].num -=  HeroInfo[this.h_uuid].slvexp
+        if(smc.vmdata.gold.num < this.gold_need){
-        this.role.slv++
+            oops.gui.toast("金币不足，升级失败");
+            return
+        } 
+        smc.heros[this.h_uuid].num -= this.chip_need
+        smc.vmdata.gold.num -= (this.gold_need)
+        smc.heros[this.h_uuid].lv++
         this.update_data() 
     }
     item_show(e:any,val:any){

assets/script/game/map/LuckHomeComp.ts

@@ -131,10 +131,12 @@ export class LuckHomeCompComp extends CCComp {
             case 3:
                 this.show_hero_chip(uuid,num)
                 smc.heros[uuid].num += num
+                oops.message.dispatchEvent("hero_card_update_info")
                 break;
             case 2:
                 this.show_hero_chip(uuid,num)
                 smc.heros[uuid].num += num
+                oops.message.dispatchEvent("hero_card_update_info")
                 // this.show_skill_chip(uuid,num)
                 // smc.skills[uuid].num += num
                 break;