diff --git a/assets/resources/game/gui/card.prefab b/assets/resources/game/gui/card.prefab
index 53421db9..98c89d65 100644
--- a/assets/resources/game/gui/card.prefab
+++ b/assets/resources/game/gui/card.prefab
@@ -25,23 +25,23 @@
         "__id__": 16
       },
       {
-        "__id__": 218
+        "__id__": 224
       },
       {
-        "__id__": 236
+        "__id__": 242
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 279
+        "__id__": 285
       },
       {
-        "__id__": 281
+        "__id__": 287
       }
     ],
     "_prefab": {
-      "__id__": 283
+      "__id__": 289
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -409,44 +409,44 @@
         "__id__": 41
       },
       {
-        "__id__": 65
-      },
-      {
-        "__id__": 73
+        "__id__": 71
       },
       {
         "__id__": 79
       },
       {
-        "__id__": 87
+        "__id__": 85
       },
       {
-        "__id__": 107
+        "__id__": 93
       },
       {
-        "__id__": 139
+        "__id__": 113
       },
       {
-        "__id__": 171
+        "__id__": 145
       },
       {
-        "__id__": 187
+        "__id__": 177
       },
       {
-        "__id__": 191
+        "__id__": 193
+      },
+      {
+        "__id__": 197
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 213
+        "__id__": 219
       },
       {
-        "__id__": 215
+        "__id__": 221
       }
     ],
     "_prefab": {
-      "__id__": 217
+      "__id__": 223
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1016,30 +1016,33 @@
       },
       {
         "__id__": 50
+      },
+      {
+        "__id__": 56
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 56
-      },
-      {
-        "__id__": 58
-      },
-      {
-        "__id__": 60
-      },
       {
         "__id__": 62
+      },
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 70
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 33,
+      "y": 18,
       "z": 0
     },
     "_lrot": {
@@ -1074,7 +1077,7 @@
       "__id__": 41
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 43
@@ -1092,7 +1095,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 14.201,
+      "y": 1.318,
       "z": 0
     },
     "_lrot": {
@@ -1133,7 +1136,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 147,
-      "height": 138.239
+      "height": 138.23899999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1207,8 +1210,8 @@
     "_target": null,
     "_left": -5,
     "_right": -5,
-    "_top": -15.320499999999994,
-    "_bottom": 13.081499999999998,
+    "_top": -9.799499999999998,
+    "_bottom": 7.560500000000001,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1264,7 +1267,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 1.992,
+      "y": 11.194,
       "z": 0
     },
     "_lrot": {
@@ -1376,6 +1379,142 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Button_Circle122",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 41
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 59
+      }
+    ],
+    "_prefab": {
+      "__id__": 61
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -90.972,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 56
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 58
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 122
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d1ESWf8VNANrEQYKoXxr/F"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 56
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 60
+    },
+    "_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@8fbdd",
+      "__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": "44Y+N50nNFZJyjEY/D/57f"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4dzq6L1X5LO54Z88q7AgB4",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1386,12 +1525,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 137,
-      "height": 136
+      "height": 166
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1414,7 +1553,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1459,14 +1598,14 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 67
     },
     "_alignFlags": 45,
     "_target": null,
     "_left": 14,
     "_right": 14,
     "_top": 14,
-    "_bottom": 80,
+    "_bottom": 50,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1495,7 +1634,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 69
     },
     "_type": 3,
     "_inverted": false,
@@ -1516,8 +1655,6 @@
       "__id__": 0
     },
     "fileId": "62I1V46AZEiIpycKsjmCgB",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1532,17 +1669,17 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 72
       },
       {
-        "__id__": 68
+        "__id__": 74
       },
       {
-        "__id__": 70
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1579,11 +1716,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 73
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1607,11 +1744,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 75
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1652,11 +1789,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 77
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1704,22 +1841,22 @@
       "__id__": 16
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 80
       },
       {
-        "__id__": 76
+        "__id__": 82
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 84
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 83.708,
+      "y": -34.996,
       "z": 0
     },
     "_lrot": {
@@ -1751,11 +1888,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 81
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1779,11 +1916,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 83
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1827,8 +1964,6 @@
       "__id__": 0
     },
     "fileId": "cdiYA0wzRBJKMunDoze42n",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1843,22 +1978,22 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 86
       },
       {
-        "__id__": 82
+        "__id__": 88
       },
       {
-        "__id__": 84
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 92
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 85.30700000000002,
+      "y": -47.19999999999999,
       "z": 0
     },
     "_lrot": {
@@ -1890,11 +2025,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 85
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1918,11 +2053,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 85
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 89
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1986,17 +2121,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 85
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 91
     },
     "_alignFlags": 17,
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 19.69299999999999,
+    "_top": 152.2,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -2039,23 +2174,23 @@
     },
     "_children": [
       {
-        "__id__": 88
+        "__id__": 94
       },
       {
-        "__id__": 96
+        "__id__": 102
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 108
       },
       {
-        "__id__": 104
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2092,23 +2227,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 87
+      "__id__": 93
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 95
       },
       {
-        "__id__": 91
+        "__id__": 97
       },
       {
-        "__id__": 93
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 101
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2145,11 +2280,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 88
+      "__id__": 94
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 96
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2173,11 +2308,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 88
+      "__id__": 94
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 98
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2218,11 +2353,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 88
+      "__id__": 94
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 100
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2267,20 +2402,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 87
+      "__id__": 93
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 103
       },
       {
-        "__id__": 99
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 107
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2317,11 +2452,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 104
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2345,11 +2480,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 102
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 106
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2426,11 +2561,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 87
+      "__id__": 93
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 109
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2454,11 +2589,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 87
+      "__id__": 93
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 111
     },
     "_alignFlags": 4,
     "_target": null,
@@ -2507,29 +2642,29 @@
     },
     "_children": [
       {
-        "__id__": 108
-      },
-      {
-        "__id__": 116
+        "__id__": 114
       },
       {
         "__id__": 122
       },
       {
         "__id__": 128
+      },
+      {
+        "__id__": 134
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 134
+        "__id__": 140
       },
       {
-        "__id__": 136
+        "__id__": 142
       }
     ],
     "_prefab": {
-      "__id__": 138
+      "__id__": 144
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2566,23 +2701,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 107
+      "__id__": 113
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 109
+        "__id__": 115
       },
       {
-        "__id__": 111
+        "__id__": 117
       },
       {
-        "__id__": 113
+        "__id__": 119
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 121
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2619,11 +2754,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 114
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 110
+      "__id__": 116
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2647,11 +2782,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 114
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 112
+      "__id__": 118
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2692,11 +2827,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 108
+      "__id__": 114
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 114
+      "__id__": 120
     },
     "_alignFlags": 40,
     "_target": null,
@@ -2741,143 +2876,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 107
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 117
-      },
-      {
-        "__id__": 119
-      }
-    ],
-    "_prefab": {
-      "__id__": 121
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 116
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 118
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 40,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "e5CG7mUQpH4bczoJV7a2F9"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 116
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 120
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 241,
-      "g": 82,
-      "b": 82,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22643",
-      "__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": "b8C2Dz5RBLFIctk6kxpjN5"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "c2Q3eC4vpPg6ePedWNK32F",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "num",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 107
+      "__id__": 113
     },
     "_children": [],
     "_active": true,
@@ -2933,6 +2932,142 @@
     "__prefab": {
       "__id__": 124
     },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e5CG7mUQpH4bczoJV7a2F9"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 122
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 126
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 241,
+      "g": 82,
+      "b": 82,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22643",
+      "__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": "b8C2Dz5RBLFIctk6kxpjN5"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c2Q3eC4vpPg6ePedWNK32F",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "num",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 113
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 129
+      },
+      {
+        "__id__": 131
+      }
+    ],
+    "_prefab": {
+      "__id__": 133
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 128
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 130
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 60,
@@ -2955,11 +3090,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 122
+      "__id__": 128
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 126
+      "__id__": 132
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3036,20 +3171,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 107
+      "__id__": 113
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 129
+        "__id__": 135
       },
       {
-        "__id__": 131
+        "__id__": 137
       }
     ],
     "_prefab": {
-      "__id__": 133
+      "__id__": 139
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3086,11 +3221,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 128
+      "__id__": 134
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 130
+      "__id__": 136
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3114,11 +3249,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 128
+      "__id__": 134
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 132
+      "__id__": 138
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3195,11 +3330,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 113
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 135
+      "__id__": 141
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3223,11 +3358,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 113
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 137
+      "__id__": 143
     },
     "_alignFlags": 12,
     "_target": null,
@@ -3276,29 +3411,29 @@
     },
     "_children": [
       {
-        "__id__": 140
-      },
-      {
-        "__id__": 148
+        "__id__": 146
       },
       {
         "__id__": 154
       },
       {
         "__id__": 160
+      },
+      {
+        "__id__": 166
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 166
+        "__id__": 172
       },
       {
-        "__id__": 168
+        "__id__": 174
       }
     ],
     "_prefab": {
-      "__id__": 170
+      "__id__": 176
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3335,23 +3470,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 139
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 141
+        "__id__": 147
       },
       {
-        "__id__": 143
+        "__id__": 149
       },
       {
-        "__id__": 145
+        "__id__": 151
       }
     ],
     "_prefab": {
-      "__id__": 147
+      "__id__": 153
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3388,11 +3523,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 140
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 142
+      "__id__": 148
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3416,11 +3551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 140
+      "__id__": 146
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 144
+      "__id__": 150
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3461,11 +3596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 140
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 146
+      "__id__": 152
     },
     "_alignFlags": 40,
     "_target": null,
@@ -3510,143 +3645,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 139
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 149
-      },
-      {
-        "__id__": 151
-      }
-    ],
-    "_prefab": {
-      "__id__": 153
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 148
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 150
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 40,
-      "height": 40
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "86+gtOZuZDhY6Q/RpJFEgU"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 148
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 152
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 91,
-      "g": 194,
-      "b": 235,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22643",
-      "__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": "05v6DJUcdErYOqgV84NetO"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "d8/zNdkZhDR6eGiMIElULn",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "num",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 139
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
@@ -3702,6 +3701,142 @@
     "__prefab": {
       "__id__": 156
     },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "86+gtOZuZDhY6Q/RpJFEgU"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 154
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 158
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 91,
+      "g": 194,
+      "b": 235,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@22643",
+      "__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": "05v6DJUcdErYOqgV84NetO"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d8/zNdkZhDR6eGiMIElULn",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "num",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 145
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 161
+      },
+      {
+        "__id__": 163
+      }
+    ],
+    "_prefab": {
+      "__id__": 165
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 160
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 162
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 60,
@@ -3724,11 +3859,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 154
+      "__id__": 160
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 158
+      "__id__": 164
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3805,20 +3940,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 139
+      "__id__": 145
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 161
+        "__id__": 167
       },
       {
-        "__id__": 163
+        "__id__": 169
       }
     ],
     "_prefab": {
-      "__id__": 165
+      "__id__": 171
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3855,11 +3990,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 160
+      "__id__": 166
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 162
+      "__id__": 168
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3883,11 +4018,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 160
+      "__id__": 166
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 164
+      "__id__": 170
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3964,11 +4099,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 139
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 167
+      "__id__": 173
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3992,11 +4127,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 139
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 169
+      "__id__": 175
     },
     "_alignFlags": 36,
     "_target": null,
@@ -4045,20 +4180,20 @@
     },
     "_children": [
       {
-        "__id__": 172
+        "__id__": 178
       },
       {
-        "__id__": 178
+        "__id__": 184
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 184
+        "__id__": 190
       }
     ],
     "_prefab": {
-      "__id__": 186
+      "__id__": 192
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4095,20 +4230,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 171
+      "__id__": 177
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 173
+        "__id__": 179
       },
       {
-        "__id__": 175
+        "__id__": 181
       }
     ],
     "_prefab": {
-      "__id__": 177
+      "__id__": 183
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4145,11 +4280,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 172
+      "__id__": 178
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 174
+      "__id__": 180
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4173,11 +4308,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 172
+      "__id__": 178
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 176
+      "__id__": 182
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4231,20 +4366,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 171
+      "__id__": 177
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 179
+        "__id__": 185
       },
       {
-        "__id__": 181
+        "__id__": 187
       }
     ],
     "_prefab": {
-      "__id__": 183
+      "__id__": 189
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4281,11 +4416,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 178
+      "__id__": 184
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 180
+      "__id__": 186
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4309,11 +4444,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 178
+      "__id__": 184
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 182
+      "__id__": 188
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4390,11 +4525,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 171
+      "__id__": 177
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 185
+      "__id__": 191
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4437,11 +4572,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 188
+        "__id__": 194
       }
     ],
     "_prefab": {
-      "__id__": 190
+      "__id__": 196
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4478,11 +4613,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 187
+      "__id__": 193
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 189
+      "__id__": 195
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4509,8 +4644,6 @@
       "__id__": 0
     },
     "fileId": "d8VT9ZsVdBXIJYnBcpdVMc",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -4522,24 +4655,24 @@
       "__id__": 16
     },
     "_children": [
-      {
-        "__id__": 192
-      },
       {
         "__id__": 198
       },
       {
         "__id__": 204
+      },
+      {
+        "__id__": 210
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 210
+        "__id__": 216
       }
     ],
     "_prefab": {
-      "__id__": 212
+      "__id__": 218
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4576,144 +4709,8 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 191
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 193
-      },
-      {
-        "__id__": 195
-      }
-    ],
-    "_prefab": {
       "__id__": 197
     },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 192
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 194
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 33,
-      "height": 36
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "29lM8ylZdNuprRQx9FSOH6"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 192
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 196
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 82,
-      "g": 255,
-      "b": 0,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@398ce",
-      "__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": "d3VjZMe5ZNI4qkmCRpGSL3"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "90KCBZ4GlPjoz+X/kqLT5Q",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "war",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 191
-    },
     "_children": [],
     "_active": false,
     "_components": [
@@ -4770,8 +4767,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36,
-      "height": 39
+      "width": 33,
+      "height": 36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4782,7 +4779,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b3vD6WKqNHULnCCoQ1U6Xm"
+    "fileId": "29lM8ylZdNuprRQx9FSOH6"
   },
   {
     "__type__": "cc.Sprite",
@@ -4801,13 +4798,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 0,
+      "r": 82,
+      "g": 255,
       "b": 0,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69993",
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@398ce",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -4827,7 +4824,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7cpkrTB0tPsZfGQiYs3IV+"
+    "fileId": "d3VjZMe5ZNI4qkmCRpGSL3"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4837,18 +4834,18 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "33ek4Y5wZG9ozQE54RESKf",
+    "fileId": "90KCBZ4GlPjoz+X/kqLT5Q",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "mag",
+    "_name": "war",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 191
+      "__id__": 197
     },
     "_children": [],
     "_active": false,
@@ -4904,6 +4901,142 @@
     "__prefab": {
       "__id__": 206
     },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 36,
+      "height": 39
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b3vD6WKqNHULnCCoQ1U6Xm"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 204
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 208
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69993",
+      "__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": "7cpkrTB0tPsZfGQiYs3IV+"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "33ek4Y5wZG9ozQE54RESKf",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "mag",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 197
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 211
+      },
+      {
+        "__id__": 213
+      }
+    ],
+    "_prefab": {
+      "__id__": 215
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 1073741824,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 210
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 212
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 39,
@@ -4926,11 +5059,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 204
+      "__id__": 210
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 208
+      "__id__": 214
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4984,11 +5117,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 191
+      "__id__": 197
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 211
+      "__id__": 217
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5029,7 +5162,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 214
+      "__id__": 220
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5057,7 +5190,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 216
+      "__id__": 222
     },
     "_alignFlags": 45,
     "_target": null,
@@ -5106,26 +5239,26 @@
     },
     "_children": [
       {
-        "__id__": 219
+        "__id__": 225
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 227
-      },
-      {
-        "__id__": 229
-      },
-      {
-        "__id__": 231
-      },
       {
         "__id__": 233
+      },
+      {
+        "__id__": 235
+      },
+      {
+        "__id__": 237
+      },
+      {
+        "__id__": 239
       }
     ],
     "_prefab": {
-      "__id__": 235
+      "__id__": 241
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5162,23 +5295,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 218
+      "__id__": 224
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 220
+        "__id__": 226
       },
       {
-        "__id__": 222
+        "__id__": 228
       },
       {
-        "__id__": 224
+        "__id__": 230
       }
     ],
     "_prefab": {
-      "__id__": 226
+      "__id__": 232
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5215,11 +5348,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 219
+      "__id__": 225
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 221
+      "__id__": 227
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5243,11 +5376,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 219
+      "__id__": 225
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 223
+      "__id__": 229
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5288,11 +5421,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 219
+      "__id__": 225
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 225
+      "__id__": 231
     },
     "playOnLoad": false,
     "_clips": [
@@ -5330,11 +5463,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 218
+      "__id__": 224
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 228
+      "__id__": 234
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5358,11 +5491,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 218
+      "__id__": 224
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 230
+      "__id__": 236
     },
     "_type": 0,
     "_inverted": false,
@@ -5380,11 +5513,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 218
+      "__id__": 224
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 232
+      "__id__": 238
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5426,11 +5559,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 218
+      "__id__": 224
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 234
+      "__id__": 240
     },
     "_alignFlags": 45,
     "_target": null,
@@ -5479,29 +5612,29 @@
     },
     "_children": [
       {
-        "__id__": 237
-      },
-      {
-        "__id__": 245
+        "__id__": 243
       },
       {
         "__id__": 251
+      },
+      {
+        "__id__": 257
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 271
+        "__id__": 277
       },
       {
-        "__id__": 273
+        "__id__": 279
       },
       {
-        "__id__": 275
+        "__id__": 281
       }
     ],
     "_prefab": {
-      "__id__": 278
+      "__id__": 284
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5538,23 +5671,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 236
+      "__id__": 242
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 238
+        "__id__": 244
       },
       {
-        "__id__": 240
+        "__id__": 246
       },
       {
-        "__id__": 242
+        "__id__": 248
       }
     ],
     "_prefab": {
-      "__id__": 244
+      "__id__": 250
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5591,11 +5724,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 237
+      "__id__": 243
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 239
+      "__id__": 245
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5619,11 +5752,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 237
+      "__id__": 243
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 241
+      "__id__": 247
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5664,11 +5797,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 237
+      "__id__": 243
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 243
+      "__id__": 249
     },
     "_alignFlags": 45,
     "_target": null,
@@ -5713,20 +5846,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 236
+      "__id__": 242
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 246
+        "__id__": 252
       },
       {
-        "__id__": 248
+        "__id__": 254
       }
     ],
     "_prefab": {
-      "__id__": 250
+      "__id__": 256
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5763,11 +5896,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 245
+      "__id__": 251
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 247
+      "__id__": 253
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5791,11 +5924,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 245
+      "__id__": 251
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 249
+      "__id__": 255
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5872,27 +6005,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 236
+      "__id__": 242
     },
     "_children": [
       {
-        "__id__": 252
+        "__id__": 258
       },
       {
-        "__id__": 258
+        "__id__": 264
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 266
+        "__id__": 272
       },
       {
-        "__id__": 268
+        "__id__": 274
       }
     ],
     "_prefab": {
-      "__id__": 270
+      "__id__": 276
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5929,20 +6062,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 251
+      "__id__": 257
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 253
+        "__id__": 259
       },
       {
-        "__id__": 255
+        "__id__": 261
       }
     ],
     "_prefab": {
-      "__id__": 257
+      "__id__": 263
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5979,11 +6112,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 252
+      "__id__": 258
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 254
+      "__id__": 260
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6007,11 +6140,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 252
+      "__id__": 258
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 256
+      "__id__": 262
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6065,23 +6198,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 251
+      "__id__": 257
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 259
+        "__id__": 265
       },
       {
-        "__id__": 261
+        "__id__": 267
       },
       {
-        "__id__": 263
+        "__id__": 269
       }
     ],
     "_prefab": {
-      "__id__": 265
+      "__id__": 271
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6118,11 +6251,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 258
+      "__id__": 264
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 260
+      "__id__": 266
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6146,11 +6279,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 258
+      "__id__": 264
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 262
+      "__id__": 268
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6214,11 +6347,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 258
+      "__id__": 264
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 264
+      "__id__": 270
     },
     "templateMode": false,
     "watchPath": "data.mission_data.call_gold",
@@ -6249,11 +6382,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 251
+      "__id__": 257
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 267
+      "__id__": 273
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6277,11 +6410,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 251
+      "__id__": 257
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 269
+      "__id__": 275
     },
     "_alignFlags": 44,
     "_target": null,
@@ -6326,11 +6459,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 236
+      "__id__": 242
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 272
+      "__id__": 278
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6354,11 +6487,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 236
+      "__id__": 242
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 274
+      "__id__": 280
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6396,15 +6529,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 236
+      "__id__": 242
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 276
+      "__id__": 282
     },
     "clickEvents": [
       {
-        "__id__": 277
+        "__id__": 283
       }
     ],
     "_interactable": true,
@@ -6444,7 +6577,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 236
+      "__id__": 242
     },
     "_id": ""
   },
@@ -6485,7 +6618,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 280
+      "__id__": 286
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6513,7 +6646,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 282
+      "__id__": 288
     },
     "_id": ""
   },
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index dbeb4a36..60c1a6c6 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -507,7 +507,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 968.7629999999999,
       "y": 749.128,
       "z": 0
     },
@@ -616,7 +616,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -262.5,
+      "x": -262.49999999999994,
       "y": 0,
       "z": 0
     }
@@ -757,7 +757,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -87.5,
+      "x": -87.49999999999994,
       "y": 0,
       "z": 0
     }
@@ -882,7 +882,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 87.5,
+      "x": 87.50000000000006,
       "y": 0,
       "z": 0
     }
@@ -1007,7 +1007,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 262.5,
+      "x": 262.50000000000006,
       "y": 0,
       "z": 0
     }
@@ -1080,8 +1080,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 15,
-      "y": -142.689,
+      "x": 15.000000000000057,
+      "y": -145,
       "z": 0
     },
     "_lrot": {
@@ -1440,7 +1440,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 1117.8839999999998,
-    "_bottom": -57.68899999999999,
+    "_bottom": -60,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1486,7 +1486,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 719.9999999999999,
       "height": 230
     },
     "_anchorPoint": {
@@ -1590,8 +1590,8 @@
     },
     "_alignFlags": 44,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
+    "_left": 968.763,
+    "_right": -968.763,
     "_top": 15,
     "_bottom": 634.128,
     "_horizontalCenter": 0,
@@ -1613,7 +1613,7 @@
     "fileId": "9aCFKx/N9E+6ZXbNILVsdG"
   },
   {
-    "__type__": "62b36d9gpxMz5F8hFgkLiVf",
+    "__type__": "3d183Ezxg1EwJM/pim+pDMx",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1628,7 +1628,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "bedhHO1z1PmoSjxrFpIT2A"
+    "fileId": "50k4XLMJFH1qoYFgIga66D"
   },
   {
     "__type__": "cc.PrefabInfo",
diff --git a/assets/script/game/common/config/GameEvent.ts b/assets/script/game/common/config/GameEvent.ts
index 88f7270a..40c7eacf 100644
--- a/assets/script/game/common/config/GameEvent.ts
+++ b/assets/script/game/common/config/GameEvent.ts
@@ -14,6 +14,7 @@ export enum GameEvent {
     MSSelected = "MSSelected",
     CastSkill = "CastSkill",
     CardRefresh = "CardRefresh",
+    CardRefreshEnd = "CardRefreshEnd",
     UseCard = "UseCard",
     UseHeroCard = "UseHeroCard",
     UseSkillCard = "UseSkillCard",
@@ -23,6 +24,10 @@ export enum GameEvent {
     MissionWin = "MissionWin",
     MissionStart = "MissionStart",
     FightReady = "FightReady",
+    HeroSkillSelect = "HeroSkillSelect",
+    HeroSkillSelectEnd = "HeroSkillSelectEnd",
+    HeroSelect = "HeroSelect",
+    HeroSelectEnd = "HeroSelectEnd",
     FightStart = "FightStart",
     FightPause = "FightPause",
     FightResume = "FightResume",
diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts
index cf58273e..f3089832 100644
--- a/assets/script/game/map/CardComp.ts
+++ b/assets/script/game/map/CardComp.ts
@@ -20,40 +20,26 @@ export class CardComp extends CCComp {
     is_used:boolean=false;
     
     onLoad(){
-       this.on(GameEvent.CardRefresh,this.onHandler,this)
-       this.on(GameEvent.MissionStart,this.onHandler,this)
-       this.on(GameEvent.MissionEnd,this.onHandler,this)
-    }
-    /** 全局消息逻辑处理 */
-    private onHandler(event: string, args: any) {
-        switch (event) {
-            case GameEvent.CardRefresh:
-                this.onCardRefresh(event,args)
-                break;
-            case GameEvent.MissionStart:
-                this.mission_start(event,args)
-                break;
-            case GameEvent.MissionEnd:
-                this.mission_end(event,args)
-                break;
-        }
+        this.on(GameEvent.HeroSelect,this.onCardRefresh,this)
+        this.on(GameEvent.HeroSkillSelect,this.onCardRefresh,this)
+        this.on(GameEvent.CardRefresh,this.onCardRefresh,this)
     }
+
     start() {
-        this.init_card()
+        
     }
+    
     init_card(){
-        this.is_used=true
         this.node.getChildByName("Button").active=false
         this.node.getChildByName("show").active=false
     }
-    mission_start(event: string, args: any){
-
+    onHeroSelect(event: string, args: any){
+       
     }
-    mission_end(event: string, args: any){
-
+    onHeroSkillSelect(event: string, args: any){
+       
     }
     onCardRefresh(event: string, args: any){
-        this.is_used=false
         let hero_list =HeroList
         let x=RandomManager.instance.getRandomInt(0,hero_list.length,1)
         this.c_uuid=hero_list[x]
@@ -93,11 +79,9 @@ export class CardComp extends CCComp {
         //         return "替换"
         //     }
         //  }
-         return "召唤"
+         return "选择"
     }
     use_card(){
-        
-        if(this.is_used) return
         switch(this.c_type){
             case 0:
                 if(smc.vmdata.mission_data.gold< smc.vmdata.mission_data.call_gold){
@@ -114,9 +98,6 @@ export class CardComp extends CCComp {
                 oops.message.dispatchEvent(GameEvent.UseCard,{uuid:this.c_uuid})
                 break
         }
-        this.node.getChildByName("show").active=false
-        this.is_used=true
-        this.node.getChildByName("Button").active=false
     }
     reset() {
         this.node.destroy();
diff --git a/assets/script/game/map/CardsComp.ts b/assets/script/game/map/CardsComp.ts
index 98bfe82d..c6016eb5 100644
--- a/assets/script/game/map/CardsComp.ts
+++ b/assets/script/game/map/CardsComp.ts
@@ -1,4 +1,4 @@
-import { _decorator } from "cc";
+import { _decorator, v3 } 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 { GameEvent } from "../common/config/GameEvent";
@@ -12,19 +12,25 @@ export class CardsCompComp extends CCComp {
     /** 视图层逻辑代码分离演示 */
     start() {
         // var entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
-        this.on(GameEvent.FightReady, this.onHandler, this);
+        this.on(GameEvent.HeroSkillSelect, this.show, this);
+        this.on(GameEvent.HeroSkillSelectEnd, this.hide, this);
+        this.on(GameEvent.HeroSelect, this.show, this);
+        this.on(GameEvent.HeroSelectEnd, this.hide, this);
+        this.on(GameEvent.CardRefresh, this.show, this);
+        this.on(GameEvent.CardRefreshEnd, this.hide, this);
     }
 
-    /** 全局消息逻辑处理 */
-    private onHandler(event: string, args: any) {
-        switch (event) {
-            case GameEvent.FightReady:
-                break;
-        }
+    show(){
+        this.node.setPosition(v3(0,640,0))
+    }
+
+    hide(){
+        this.node.setPosition(v3(0,-1000,0))
     }
 
     /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */
     reset() {
         this.node.destroy();
     }
+
 }
\ No newline at end of file
diff --git a/assets/script/game/map/CardsComp.ts.meta b/assets/script/game/map/CardsComp.ts.meta
index 7c3872da..4613180d 100644
--- a/assets/script/game/map/CardsComp.ts.meta
+++ b/assets/script/game/map/CardsComp.ts.meta
@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "62b3677d-829c-4ccf-917c-8458242e255f",
+  "uuid": "3d183133-c60d-44c0-933f-a629bea43331",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts
index becc736e..b5deb76b 100644
--- a/assets/script/game/map/MissionComp.ts
+++ b/assets/script/game/map/MissionComp.ts
@@ -12,6 +12,7 @@ import { HeroViewComp } from "../hero/HeroViewComp";
 import { Hero } from "../hero/Hero";
 import { HartModelComp } from "../hero/HartModelComp";
 import { TimerManager } from "db://oops-framework/core/common/timer/TimerManager";
+import { HeroList } from "../common/config/heroSet";
 const { ccclass, property } = _decorator;
 
 /** 视图层对象 */
@@ -52,17 +53,33 @@ export class MissionComp extends CCComp {
 
     }
     
-    to_end_fight(){
-        oops.message.dispatchEvent(GameEvent.FightEnd)
-    }
+    
 
     mission_start(){
         /* todo   关卡设定完善*/
         console.log("战斗开始 关卡怪物:",Missions[smc.mission.lv])
         this.node.active=true
         this.data_init()
-        this.hero_init()
+        this.hart_hero_load()
+        this.to_hero_skill_select()
     }
+
+    to_hero_skill_select(){
+        oops.message.dispatchEvent(GameEvent.HeroSkillSelect)
+    }
+
+    to_hero_select(){
+        oops.message.dispatchEvent(GameEvent.HeroSelect)
+    }
+
+    to_fight(){
+        oops.message.dispatchEvent(GameEvent.FightStart)
+    }
+
+    to_end_fight(){
+        oops.message.dispatchEvent(GameEvent.FightEnd)
+    }
+
     fight_end(){
         console.log("任务结束")
         // 延迟0.5秒后执行任务结束逻辑
@@ -86,16 +103,15 @@ export class MissionComp extends CCComp {
     }
 
     //角色初始化
-    hero_init(){
+    hart_hero_load(){
         let hero = ecs.getEntity<Hero>(Hero);
         hero.hart_load()
-        this.scheduleOnce(() => {
-            this.card_init()
-        }, 0.3)
     }
+
     card_init(){
         oops.message.dispatchEvent(GameEvent.CardRefresh)
     }
+
     card_refresh(){
         if(smc.vmdata.mission_data.gold< smc.vmdata.mission_data.refresh_gold){
             oops.gui.toast("金币不足", false);
@@ -106,12 +122,12 @@ export class MissionComp extends CCComp {
         
     }
 
+
+
     private cleanComponents() {
         ecs.query(ecs.allOf(HeroViewComp)).forEach(entity => {entity.remove(HeroViewComp);entity.destroy()});
     }
 
-
-    
     /** 视图层逻辑代码分离演示 */
 
     /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */
diff --git a/assets/script/game/map/MissionHeroComp.ts b/assets/script/game/map/MissionHeroComp.ts
index 81acab04..eea41078 100644
--- a/assets/script/game/map/MissionHeroComp.ts
+++ b/assets/script/game/map/MissionHeroComp.ts
@@ -28,7 +28,7 @@ export class MissionHeroCompComp extends CCComp {
     }
     current_hero_uuid:number=0
     onLoad(){
-        this.on(GameEvent.UseHeroCard,this.show_heros_pos,this)
+        this.on(GameEvent.UseHeroCard,this.call_hero,this)
     }
     start() {
         // this.test_call()
@@ -86,26 +86,28 @@ export class MissionHeroCompComp extends CCComp {
         }
     }
     call_hero(event: string, args: any){
-        this.node.getChildByName("location").active=false
-        console.log("call_hero",args)
-        let fight_pos=args
-        this.timer.reset()
-        let hero_list =HeroList
-        let x=RandomManager.instance.getRandomInt(0,hero_list.length,1)
-        // let uuid=args.uuid
-        // console.log("call_hero",uuid)
-        this.addHero(this.current_hero_uuid,fight_pos)
+        // this.node.getChildByName("location").active=false
+        // console.log("call_hero",args)
+        // let fight_pos=args
+        // this.timer.reset()
+        // let hero_list =HeroList
+        // let x=RandomManager.instance.getRandomInt(0,hero_list.length,1)
+        // // let uuid=args.uuid
+        // // console.log("call_hero",uuid)
+        this.addHero(args.uuid)
     }
    
-       /** 添加玩家 */
+       /** 添加英雄 */
     private addHero(uuid:number=1001,fight_pos:number=0) {
         console.log("call_hero addHero",uuid)
         let info:any=this.get_info_and_remove(fight_pos,uuid)
+        // let info:any={ap:0,hp:0,lv:0}
         let hero = ecs.getEntity<Hero>(Hero);
         let scale = 1
         let pos:Vec3 = this.start_pos[fight_pos].pos;
         console.log("hero load0",pos,this.start_pos)
         hero.load(pos,scale,uuid,info,fight_pos);
+        oops.message.dispatchEvent(GameEvent.HeroSelectEnd)
         this.current_hero_uuid=0
     }
 
@@ -125,20 +127,16 @@ export class MissionHeroCompComp extends CCComp {
                 // let s_hp_up = (HeroUpInfo[uuid] || {}).hp_up || 0 //替换 升级的英雄额外替换血量增长值
                 // info.ap=Math.floor(hv.ap*(AP_UP_RATE+o_ap_rate+s_ap_rate)/100+o_ap+s_ap)
                 // info.hp=Math.floor(o_hp_up+s_hp_up)
-                if(hv.hero_uuid === uuid){
-                    info.ap=hv.ap
-                    info.hp=hv.hp_max
-                    info.lv=hv.lv
-                }else{
-                    this.do_hero_change()
-                }
-                
+                info.ap=hv.ap
+                info.hp=hv.hp_max
+                info.lv=hv.lv
                 hero.destroy()
                 return info
            }
         }
         return info
     }
+
     do_hero_change(){
         //金币加1
         smc.vmdata.mission_data.gold+=1