局内技能 ui + 局内英雄卡片

2024-12-10 00:44:46 +08:00
parent 0b42d41862
commit 6d25c04628
23 changed files with 24206 additions and 22594 deletions
--- a/assets/resources/game/skills/shielded.prefab
+++ b/assets/resources/game/skills/shielded.prefab
@@ -163,8 +163,8 @@
      "__type__": "cc.Color",
      "r": 255,
      "g": 255,
-      "b": 129,
-      "a": 223
+      "b": 255,
+      "a": 206
    },
    "_spriteFrame": {
      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91c2a",
--- a/assets/resources/game/skills/tooltip.prefab
+++ b/assets/resources/game/skills/tooltip.prefab
@@ -190,8 +190,8 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 48.4921875,
-      "height": 54.4
+      "width": 35.369140625,
+      "height": 39.8
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -221,25 +221,25 @@
    "_dstBlendFactor": 4,
    "_color": {
      "__type__": "cc.Color",
-      "r": 231,
-      "g": 22,
-      "b": 22,
+      "r": 121,
+      "g": 121,
+      "b": 121,
      "a": 255
    },
    "_string": "10",
    "_horizontalAlign": 1,
    "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
    "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 30,
    "_overflow": 0,
    "_enableWrapText": true,
    "_font": null,
    "_isSystemFontUsed": true,
    "_spacingX": 0,
    "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
    "_isUnderline": false,
    "_underlineHeight": 2,
    "_cacheMode": 0,
@@ -251,7 +251,7 @@
      "b": 255,
      "a": 255
    },
-    "_outlineWidth": 2,
+    "_outlineWidth": 1,
    "_enableShadow": false,
    "_shadowColor": {
      "__type__": "cc.Color",
@@ -1139,37 +1139,37 @@
    "_dstBlendFactor": 4,
    "_color": {
      "__type__": "cc.Color",
-      "r": 231,
-      "g": 22,
-      "b": 22,
+      "r": 255,
+      "g": 0,
+      "b": 0,
      "a": 255
    },
-    "_string": "10",
+    "_string": "-10",
    "_horizontalAlign": 0,
    "_verticalAlign": 1,
-    "_actualFontSize": 56,
-    "_fontSize": 55,
+    "_actualFontSize": 41,
+    "_fontSize": 40,
    "_fontFamily": "Arial",
-    "_lineHeight": 55,
+    "_lineHeight": 40,
    "_overflow": 2,
    "_enableWrapText": true,
    "_font": null,
    "_isSystemFontUsed": true,
    "_spacingX": 0,
    "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
    "_isUnderline": false,
    "_underlineHeight": 2,
    "_cacheMode": 0,
    "_enableOutline": true,
    "_outlineColor": {
      "__type__": "cc.Color",
-      "r": 250,
+      "r": 255,
      "g": 255,
-      "b": 128,
+      "b": 255,
      "a": 255
    },
-    "_outlineWidth": 5,
+    "_outlineWidth": 2,
    "_enableShadow": false,
    "_shadowColor": {
      "__type__": "cc.Color",
@@ -1399,8 +1399,6 @@
      "__id__": 0
    },
    "fileId": "20vKhpGcBEoKbUIhLvPmd1",
-    "instance": null,
-    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
  },
  {
--- a/assets/resources/gui/anim.meta
+++ b/assets/resources/gui/anim.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "d5729444-7c0c-4885-91df-57d0bbe7c0b3",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/assets/resources/gui/anim/flash.anim
+++ b/assets/resources/gui/anim/flash.anim
@@ -0,0 +1,457 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "flash",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 60,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 0.2,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 22
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2000000476837158,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2000000476837158,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.ColorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 12
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      }
+    ]
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 13
+      },
+      "color"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.Sprite"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 15
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 17
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 19
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 21
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.18333333333333332,
+      0.2
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 255,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]
--- a/assets/resources/gui/anim/flash.anim.meta
+++ b/assets/resources/gui/anim/flash.anim.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "af68aca0-fe3e-45de-8cc4-728d67b3a7ff",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "flash"
+  }
+}
--- a/assets/resources/gui/anim/skanim.anim
+++ b/assets/resources/gui/anim/skanim.anim
@@ -0,0 +1,258 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "skanim",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 12,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 0.8333333333333334,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "scale"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.4166666666666667,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.4166666666666667,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1.2,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.4166666666666667,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 1,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]
--- a/assets/resources/gui/anim/skanim.anim.meta
+++ b/assets/resources/gui/anim/skanim.anim.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "265fe344-46f7-400c-b5cf-0ca64b6ab4aa",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "skanim"
+  }
+}
--- a/assets/resources/gui/anim/star.anim
+++ b/assets/resources/gui/anim/star.anim
--- a/assets/resources/gui/anim/star.anim.meta
+++ b/assets/resources/gui/anim/star.anim.meta
--- a/assets/resources/gui/element/hcard.prefab
+++ b/assets/resources/gui/element/hcard.prefab
@@ -43,35 +43,35 @@
        "__id__": 44
      },
      {
-        "__id__": 56
+        "__id__": 50
      },
      {
-        "__id__": 68
+        "__id__": 62
      },
      {
-        "__id__": 80
+        "__id__": 74
      },
      {
-        "__id__": 94
+        "__id__": 88
      },
      {
-        "__id__": 108
+        "__id__": 102
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 114
+        "__id__": 108
      },
      {
-        "__id__": 116
+        "__id__": 110
      },
      {
-        "__id__": 118
+        "__id__": 112
      }
    ],
    "_prefab": {
-      "__id__": 120
+      "__id__": 114
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1079,33 +1079,29 @@
  },
  {
    "__type__": "cc.Node",
-    "_name": "lv_icon",
+    "_name": "lv",
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
      "__id__": 1
    },
-    "_children": [
-      {
-        "__id__": 45
-      }
-    ],
-    "_active": true,
+    "_children": [],
+    "_active": false,
    "_components": [
      {
-        "__id__": 51
+        "__id__": 45
      },
      {
-        "__id__": 53
+        "__id__": 47
      }
    ],
    "_prefab": {
-      "__id__": 55
+      "__id__": 49
    },
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": -51.219,
-      "y": 97.412,
+      "x": 21.17579999999998,
+      "y": 97.41200000000003,
      "z": 0
    },
    "_lrot": {
@@ -1131,72 +1127,22 @@
    },
    "_id": ""
  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lv",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 44
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 46
-      },
-      {
-        "__id__": 48
-      }
-    ],
-    "_prefab": {
-      "__id__": 50
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
  {
    "__type__": "cc.UITransform",
    "_name": "",
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 45
+      "__id__": 44
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 47
+      "__id__": 46
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 80,
-      "height": 54.4
+      "width": 120,
+      "height": 30
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -1215,11 +1161,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 45
+      "__id__": 44
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 49
+      "__id__": 48
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -1231,11 +1177,11 @@
      "b": 255,
      "a": 255
    },
-    "_string": "1",
-    "_horizontalAlign": 1,
+    "_string": "1级",
+    "_horizontalAlign": 2,
    "_verticalAlign": 1,
-    "_actualFontSize": 31,
-    "_fontSize": 30,
+    "_actualFontSize": 25,
+    "_fontSize": 25,
    "_fontFamily": "Arial",
    "_lineHeight": 30,
    "_overflow": 2,
@@ -1290,92 +1236,6 @@
    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 44
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 52
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 60,
-      "height": 60
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "7aA4ZvlQpNear6ycFqd468"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 44
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 54
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 204,
-      "b": 0,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@228f2",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b7uI2M3YdGj6VIy7UY4akz"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "e8i10bRRRABphjmj2v+NEC",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
  {
    "__type__": "cc.Node",
    "_name": "ap",
@@ -1386,20 +1246,20 @@
    },
    "_children": [
      {
-        "__id__": 57
+        "__id__": 51
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 63
+        "__id__": 57
      },
      {
-        "__id__": 65
+        "__id__": 59
      }
    ],
    "_prefab": {
-      "__id__": 67
+      "__id__": 61
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1436,20 +1296,20 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 56
+      "__id__": 50
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 58
+        "__id__": 52
      },
      {
-        "__id__": 60
+        "__id__": 54
      }
    ],
    "_prefab": {
-      "__id__": 62
+      "__id__": 56
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1486,11 +1346,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 57
+      "__id__": 51
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 59
+      "__id__": 53
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1514,11 +1374,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 57
+      "__id__": 51
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 61
+      "__id__": 55
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -1595,11 +1455,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 56
+      "__id__": 50
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 64
+      "__id__": 58
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1623,11 +1483,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 56
+      "__id__": 50
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 66
+      "__id__": 60
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -1685,20 +1545,20 @@
    },
    "_children": [
      {
-        "__id__": 69
+        "__id__": 63
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 75
+        "__id__": 69
      },
      {
-        "__id__": 77
+        "__id__": 71
      }
    ],
    "_prefab": {
-      "__id__": 79
+      "__id__": 73
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1735,20 +1595,20 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 68
+      "__id__": 62
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 70
+        "__id__": 64
      },
      {
-        "__id__": 72
+        "__id__": 66
      }
    ],
    "_prefab": {
-      "__id__": 74
+      "__id__": 68
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1785,11 +1645,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 69
+      "__id__": 63
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 71
+      "__id__": 65
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1813,11 +1673,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 69
+      "__id__": 63
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 73
+      "__id__": 67
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -1894,11 +1754,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 68
+      "__id__": 62
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 76
+      "__id__": 70
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1922,11 +1782,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 68
+      "__id__": 62
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 78
+      "__id__": 72
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -1984,23 +1844,23 @@
    },
    "_children": [
      {
-        "__id__": 81
+        "__id__": 75
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 87
+        "__id__": 81
      },
      {
-        "__id__": 89
+        "__id__": 83
      },
      {
-        "__id__": 91
+        "__id__": 85
      }
    ],
    "_prefab": {
-      "__id__": 93
+      "__id__": 87
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2037,20 +1897,20 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 80
+      "__id__": 74
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 82
+        "__id__": 76
      },
      {
-        "__id__": 84
+        "__id__": 78
      }
    ],
    "_prefab": {
-      "__id__": 86
+      "__id__": 80
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2087,11 +1947,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 81
+      "__id__": 75
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 83
+      "__id__": 77
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2115,11 +1975,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 81
+      "__id__": 75
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 85
+      "__id__": 79
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2173,11 +2033,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 74
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 88
+      "__id__": 82
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2201,11 +2061,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 74
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 90
+      "__id__": 84
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2246,14 +2106,14 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 74
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 92
+      "__id__": 86
    },
    "_barSprite": {
-      "__id__": 84
+      "__id__": 78
    },
    "_mode": 0,
    "_totalLength": 130,
@@ -2288,23 +2148,23 @@
    },
    "_children": [
      {
-        "__id__": 95
+        "__id__": 89
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 101
+        "__id__": 95
      },
      {
-        "__id__": 103
+        "__id__": 97
      },
      {
-        "__id__": 105
+        "__id__": 99
      }
    ],
    "_prefab": {
-      "__id__": 107
+      "__id__": 101
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2341,20 +2201,20 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 94
+      "__id__": 88
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 96
+        "__id__": 90
      },
      {
-        "__id__": 98
+        "__id__": 92
      }
    ],
    "_prefab": {
-      "__id__": 100
+      "__id__": 94
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2391,11 +2251,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 95
+      "__id__": 89
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 97
+      "__id__": 91
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2419,11 +2279,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 95
+      "__id__": 89
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 99
+      "__id__": 93
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2477,11 +2337,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 94
+      "__id__": 88
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 102
+      "__id__": 96
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2505,11 +2365,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 94
+      "__id__": 88
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 104
+      "__id__": 98
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2547,14 +2407,14 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 94
+      "__id__": 88
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 106
+      "__id__": 100
    },
    "_barSprite": {
-      "__id__": 98
+      "__id__": 92
    },
    "_mode": 0,
    "_totalLength": 130,
@@ -2591,14 +2451,14 @@
    "_active": false,
    "_components": [
      {
-        "__id__": 109
+        "__id__": 103
      },
      {
-        "__id__": 111
+        "__id__": 105
      }
    ],
    "_prefab": {
-      "__id__": 113
+      "__id__": 107
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2635,11 +2495,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 108
+      "__id__": 102
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 110
+      "__id__": 104
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2663,11 +2523,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 108
+      "__id__": 102
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 112
+      "__id__": 106
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2725,7 +2585,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 115
+      "__id__": 109
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2753,7 +2613,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 117
+      "__id__": 111
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -2795,7 +2655,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 119
+      "__id__": 113
    },
    "_id": ""
  },
--- a/assets/resources/gui/gui.plist
+++ b/assets/resources/gui/gui.plist
--- a/assets/resources/gui/gui.plist.meta
+++ b/assets/resources/gui/gui.plist.meta
--- a/assets/resources/gui/gui.png
+++ b/assets/resources/gui/gui.png
--- a/assets/resources/gui/gui2.plist
+++ b/assets/resources/gui/gui2.plist
--- a/assets/resources/gui/gui2.plist.meta
+++ b/assets/resources/gui/gui2.plist.meta
--- a/assets/resources/gui/gui2.png
+++ b/assets/resources/gui/gui2.png
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -11,6 +11,7 @@ import { GameMap } from "../map/GameMap";
 import { BoxSet } from "./config/BoxSet";
 import { v3 } from "cc";
 import { Skill } from "../skills/Skill";
+import { dead } from "../skills/oncend";

 // import { Role } from "../role/Role";
 // import { data } from "../data/data";
@@ -78,13 +79,20 @@ export class SingletonModuleComp extends ecs.Comp {
            exp_max:100,
            m_exp:0,
            m_exp_max:100,       
-
+            msk:1001,
+            mmsk:1001,
            hp:0,
            ap:0,
            def:0,
+            crit:0,
+            dodge:0,
+            dead:0,
            mhp:0,
            map:0,
            mdef:0,
+            mcrit:0,
+            mdodge:0,
+            mdead:0,

            hp_up:0,
            ap_up:0,
@@ -94,13 +102,6 @@ export class SingletonModuleComp extends ecs.Comp {
            map_up:0,
            mdef_up:0,

-            hp_exp:0,
-            ap_exp:0,
-            def_exp:0,
-
-            mhp_exp:0,
-            map_exp:0,
-            mdef_exp:0,

            reward_num:0, //怪物死亡数
            reward_gold:0,
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -28,40 +28,40 @@ run:number = 0; // 0有目标 带方向，1贝塞尔曲线 2 不动 ,3 直线

 */
 export const SkillSet={
-     1001:{uuid: 1001,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人",
+     1001:{uuid: 1001,path: "1001",type: 1,tg:3,angle:true,exp:30,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人",
          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:3,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
-     1002:{uuid: 1002,path: "1002",type: 1,tg:3,angle:true,level: 3,name: "寒冰箭",sp_name:"ice",info:"释放一个寒冰箭攻击敌人",
+     1002:{uuid: 1002,path: "1002",type: 1,tg:3,angle:true,exp:30,level: 3,name: "寒冰箭",sp_name:"ice",info:"释放一个寒冰箭攻击敌人",
          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },   
-     1003:{uuid: 1003,path: "1003",type: 1,tg:3,angle:true,level: 3,name: "强效射击",sp_name:"b_arrow",info:"释放一个火球术攻击敌人",
+     1003:{uuid: 1003,path: "1003",type: 1,tg:3,angle:true,exp:30,level: 3,name: "强效射击",sp_name:"b_arrow",info:"释放一个火球术攻击敌人",
          dis:1,count:1,in:0,run:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
-     1004:{uuid: 1004,path: "1004",type: 1,tg:3,angle:true,level: 3,name: "奥术冲击",sp_name:"bm_ball",info:"释放一个寒冰箭攻击敌人",
+     1004:{uuid: 1004,path: "1004",type: 1,tg:3,angle:true,exp:30,level: 3,name: "奥术冲击",sp_name:"bm_ball",info:"释放一个寒冰箭攻击敌人",
          dis:1,count:1,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },

-     2001:{uuid: 2001,path: "2001",type: 91,tg:1,angle:false,level: 1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
+     2001:{uuid: 2001,path: "2001",type: 91,tg:1,angle:false,exp:30,level: 1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
          dis:1,count:1,in:0,run:1,ap:0,hp:3,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
-     2002:{uuid: 2002,path: "2002",type: 91,tg:0,angle:false,level: 1,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人",
+     2002:{uuid: 2002,path: "2002",type: 91,tg:0,angle:false,exp:30,level: 1,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人",
          dis:1,count:1,in:0.2,run:2,ap:0,hp:0,shield:1,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
-     2003:{uuid: 2003,path: "2003",type: 91,tg:0,angle:false,level: 1,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人",
+     2003:{uuid: 2003,path: "2003",type: 91,tg:0,angle:false,exp:30,level: 1,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人",
          dis:1,count:1,in:0.2,run:2,ap:1,hp:0,shield:0,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },


-     3001:{uuid: 3001,path: "3001",type: 1,tg:3,angle:true,level: 1,name: "三连击",sp_name:"patk",info:"释放一个魔法球攻击敌人",
+     3001:{uuid: 3001,path: "3001",type: 1,tg:3,angle:true,exp:30,level: 1,name: "三连击",sp_name:"patk",info:"释放一个魔法球攻击敌人",
          dis:1,count:3,in:0.3,run:2,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,}, 

-     4011:{uuid: 4011,path: "1011",type: 11,tg:3,angle:true,level: 3,name: "火焰风暴",sp_name:"fire",info:"释放多个个火球术攻击敌人",
+     4011:{uuid: 4011,path: "1011",type: 11,tg:3,angle:true,exp:30,level: 3,name: "火焰风暴",sp_name:"fire",info:"释放多个个火球术攻击敌人",
          dis:1,count:5,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
-     4012:{uuid: 4012,path: "1012",type: 11,tg:3,angle:true,level: 3,name: "冰晶风暴",sp_name:"ice",info:"释放多个个寒冰箭攻击敌人",
+     4012:{uuid: 4012,path: "1012",type: 11,tg:3,angle:true,exp:30,level: 3,name: "冰晶风暴",sp_name:"ice",info:"释放多个个寒冰箭攻击敌人",
          dis:1,count:5,in:0,run:0,ap:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },

-     9001:{uuid: 9001,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "普攻",sp_name:"patk",info:"释放一个魔法球攻击敌人",
+     9001:{uuid: 9001,path: "1001",type: 1,tg:3,angle:true,exp:30,level: 1,name: "普攻",sp_name:"patk",info:"释放一个魔法球攻击敌人",
          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:1000,},
-     9002:{uuid: 9002,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "魔法小球",sp_name:"mball",info:"释放一个魔法球攻击敌人",
+     9002:{uuid: 9002,path: "1001",type: 1,tg:3,angle:true,exp:30,level: 1,name: "魔法小球",sp_name:"mball",info:"释放一个魔法球攻击敌人",
          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,},
-     9003:{uuid: 9003,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "射击",sp_name:"arrow",info:"释放一个魔法球攻击敌人",
+     9003:{uuid: 9003,path: "1001",type: 1,tg:3,angle:true,exp:30,level: 1,name: "射击",sp_name:"arrow",info:"释放一个魔法球攻击敌人",
          dis:1,count:1,in:0,run:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,},

          
-     8001:{uuid: 8001,path: "8001",type: 1,tg:3,angle:true,level: 1,name: "飞刀",sp_name:"sword1",info:"释放一个魔法球攻击敌人",
+     8001:{uuid: 8001,path: "8001",type: 1,tg:3,angle:true,exp:30,level: 1,name: "飞刀",sp_name:"sword1",info:"释放一个魔法球攻击敌人",
          dis:1,count:1,in:0,run:0,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:8001,sk_count:0,speed:600,},

 }
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -52,14 +52,14 @@ export const HeroInfo = {
      tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
   },
   9002: {
-      uuid:9001,name: "狂暴骑士",path:"k2",type:1,hp: 100, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9002,name: "狂暴骑士",path:"k2",type:1,hp: 100, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
      akr:[10,20,30,40,50],akc:[1,1,1,1,1],uar:[10,20,30,40,50],uac:[1,1,1,1,1],dgr:[10,20,30,40,50],dgc:[1,1,1,1,1],crr:[10,20,30,40,50],crc:[1,1,1,1,1], 
      abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
      tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
   },
   9003: {
-      uuid:9001,name: "防御骑士",path:"k3",type:1,hp: 100, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+      uuid:9003,name: "防御骑士",path:"k3",type:1,hp: 100, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
      lvexp:0,slvexp:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[9001,9001,9001,9001,9001],sk2:[2002,2002,2002,2002,2002],sk3:[2002,2002,2002,2002,2002],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
      akr:[10,20,30,40,50],akc:[1,1,1,1,1],uar:[10,20,30,40,50],uac:[1,1,1,1,1],dgr:[10,20,30,40,50],dgc:[1,1,1,1,1],crr:[10,20,30,40,50],crc:[1,1,1,1,1], 
      abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -252,8 +252,12 @@ export class HeroViewComp extends CCComp {
        let pos =v3(-999,this.node.position.y)
        if(this.box_group == BoxSet.MONSTER){
            pos =v3(999,this.node.position.y)
+            smc.vmdata.mission.mdead +=1
+        }else{
+            smc.vmdata.mission.dead +=1
        }
        this.node.setPosition(pos)
+        
    }
    //是否在墓地
    in_grave(){
@@ -359,7 +363,11 @@ export class HeroViewComp extends CCComp {
    //暴击判断
    check_crit(){
        let i = RandomManager.instance.getRandomInt(0,100,3)
-        if(i < this.crit){
+        let crit=this.crit+smc.vmdata.mission.crit
+        if(this.box_group == BoxSet.MONSTER){
+            crit = this.crit+smc.vmdata.mission.mcrit
+        }
+        if(i < crit){
            this.tooltip(5,"*会心一击*");
            this.crit_count += 1
            this.exp_add(this.cexp) // 暴击经验
@@ -372,8 +380,12 @@ export class HeroViewComp extends CCComp {
    //闪避判断
    check_dodge(){
        let i = RandomManager.instance.getRandomInt(0,100,3)
-        if(i < this.dodge){
-            console.log("闪避触发： i="+i+":dodge="+this.dodge);
+        let dodge=this.dodge+smc.vmdata.mission.dodge;
+        if(this.box_group == BoxSet.MONSTER){
+            dodge = this.dodge+smc.vmdata.mission.mdodge;
+        }
+        if(i < dodge){
+            // console.log("闪避触发： i="+i+":dodge="+dodge);
            this.tooltip(5,"闪避");
            this.exp_add(this.doexp) // 闪避经验
            this.power_add(this.dopw)
--- a/assets/script/game/map/HCardComp.ts
+++ b/assets/script/game/map/HCardComp.ts
@@ -34,6 +34,7 @@ export class HCardComp extends CCComp {
        this.life=this.node.getChildByName("life").getComponent(ProgressBar)!        
        this.pw=this.node.getChildByName("pow").getComponent(ProgressBar)!
        this.hc_name.string= this.heros[this.hi].HeroView.hero_name
+        // this.node.getChildByName("lv").getComponent(Label).string=this.heros[this.hi].HeroView.lv.toString()+"级";
        console.log("hcard start")
    }
    protected update(dt: number): void {
--- a/assets/script/game/map/MIssionController.ts
+++ b/assets/script/game/map/MIssionController.ts
@@ -1,4 +1,4 @@
-import { _decorator,Button,EventHandler,EventTouch,Label,NodeEventType,resources,Sprite,SpriteAtlas,tween,UITransform,v3, Vec3 } from "cc";
+import { _decorator,Button,EventHandler,EventTouch,Label,NodeEventType,resources,Sprite,SpriteAtlas,tween,UITransform,v3, Vec3,Animation } 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 { smc } from "../common/SingletonModuleComp";
@@ -43,18 +43,8 @@ export class MissionComp extends CCComp {
    mission_buff_type:number = 1 // 1 攻击 2 防御 3 HP
    m_mission_buff_type:number = 1 // 1 攻击 2 防御 3 HP
    mission_buff_up_exp:number = 99999999
-    msk:any={
-        on :false,
-        uuid:1001,
-        type:1,
-        lv: 1
-    }
-    mmsk:any={
-        on :false,
-        uuid:1001,
-        type:1,
-        lv: 1
-    }
+    msk:any=null
+    mmsk:any=null
    onLoad(){

    }
@@ -94,34 +84,20 @@ export class MissionComp extends CCComp {
        smc.vmdata.mission.ap=0
        smc.vmdata.mission.hp=0
        smc.vmdata.mission.def=0
+        smc.vmdata.mission.crit=0
+        smc.vmdata.mission.dodge=0
+        smc.vmdata.mission.dead=0
        smc.vmdata.mission.map=0
        smc.vmdata.mission.mhp=0
        smc.vmdata.mission.mdef=0
-        this.msk={ on :false, uuid:1001,type:1,lv: 1}
-        this.mmsk={ on :false, uuid:1001,type:1,lv: 1}
+        smc.vmdata.mission.mcrit=0
+        smc.vmdata.mission.mdead=0
+        smc.vmdata.mission.mdodge=0
        
-        switch(smc.vmdata.mission.mbt){
-            case 1:
-                smc.vmdata.mission.exp_max=MBSet.ap_exp-smc.vmdata.mission.ap_exp;
-                break;
-            case 2:
-                smc.vmdata.mission.exp_max=MBSet.def_exp-smc.vmdata.mission.def_exp;
-                break;
-            case 3:
-                smc.vmdata.mission.exp_max=MBSet.hp_exp-smc.vmdata.mission.hp_exp;
-                break;
-        }
-        switch(smc.vmdata.mission.mmbt){
-            case 1:
-                smc.vmdata.mission.m_exp_max=MBSet.ap_exp+smc.vmdata.mission.map_exp;
-                break;
-            case 2:
-                smc.vmdata.mission.m_exp_max=MBSet.def_exp+smc.vmdata.mission.mdef_exp;
-                break;
-            case 3:
-                smc.vmdata.mission.m_exp_max=MBSet.hp_exp+smc.vmdata.mission.mhp_exp;
-                break;
-        }
+        this.msk=SkillSet[smc.vmdata.mission.msk] 
+        this.mmsk=SkillSet[smc.vmdata.mission.mmsk] 
+        smc.vmdata.mission.exp_max=this.msk.exp;
+        smc.vmdata.mission.m_exp_max=this.mmsk.exp;

        this.mon_refresh()
        this.heros_call()
@@ -165,48 +141,16 @@ export class MissionComp extends CCComp {
    check_buff(){
        if(smc.vmdata.mission.exp >= smc.vmdata.mission.exp_max){
            smc.vmdata.mission.exp-=smc.vmdata.mission.exp_max
-            switch(smc.vmdata.mission.mbt){
-                case 1:
-                    smc.vmdata.mission.ap+=smc.vmdata.mission.ap_up+MBSet.ap_add
-                    console.log("mission ap",smc.vmdata.mission.ap)
-                    this.node.getChildByName("exp").getChildByName("ap").getChildByName("data").setScale(1.3,1.3)
-                    this.scheduleOnce(function(){
-                        this.node.getChildByName("exp").getChildByName("ap").getChildByName("data").setScale(1,1)
-                    },0.2)
-                    break;
-                case 2:
-                    smc.vmdata.mission.def+=smc.vmdata.mission.def_up+MBSet.def_add
-                    this.node.getChildByName("exp").getChildByName("def").getChildByName("data").setScale(1.3,1.3)
-                    this.scheduleOnce(function(){
-                        this.node.getChildByName("exp").getChildByName("def").getChildByName("data").setScale(1,1)
-                    },0.2)
-                    break;    
-                case 3:
-                    smc.vmdata.mission.hp+=smc.vmdata.mission.hp_up+MBSet.hp_add
-                    this.node.getChildByName("exp").getChildByName("hp").getChildByName("data").setScale(1.3,1.3)
-                    this.scheduleOnce(function(){
-                        this.node.getChildByName("exp").getChildByName("hp").getChildByName("data").setScale(1,1)
-                    },0.2)
-                    break;  
-            }
+            this.node.getChildByName("msk").getChildByName("flash").getComponent(Animation).play()
+            console.log("tudo 局内技能")
        }
        if(smc.vmdata.mission.m_exp >= smc.vmdata.mission.m_exp_max){
            smc.vmdata.mission.m_exp-=smc.vmdata.mission.m_exp_max
-            switch(smc.vmdata.mission.mmbt){
-                case 1:
-                    smc.vmdata.mission.map+=smc.vmdata.mission.map_up+MBSet.ap_add
-                    break;
-                case 2:
-                    smc.vmdata.mission.mdef+=smc.vmdata.mission.mdef_up+MBSet.def_add
-                    break;    
-                case 3:
-                    smc.vmdata.mission.mhp+=smc.vmdata.mission.mhp_up+MBSet.hp_add
-                    break;  
+            this.node.getChildByName("mmsk").getChildByName("flash").getComponent(Animation).play()
+            console.log("tudo 敌方局内技能")
        } 
    }
    
-    }
-    
    check_mon_num(){
        let mons:any = this.get_mons()
        let heros:any= this.get_heros()