diff --git a/assets/resources/common/prefab/window.prefab b/assets/resources/common/prefab/window.prefab
index 4184bb68..a4e8f77e 100644
--- a/assets/resources/common/prefab/window.prefab
+++ b/assets/resources/common/prefab/window.prefab
@@ -22,35 +22,35 @@
         "__id__": 2
       },
       {
-        "__id__": 19
+        "__id__": 10
       },
       {
-        "__id__": 27
+        "__id__": 18
       },
       {
-        "__id__": 35
+        "__id__": 26
       },
       {
-        "__id__": 43
+        "__id__": 34
       },
       {
-        "__id__": 49
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 127
+        "__id__": 118
       },
       {
-        "__id__": 129
+        "__id__": 120
       },
       {
-        "__id__": 131
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 233
+      "__id__": 224
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -81,223 +81,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "50T0YGiGBH7qZZFeATiEP+",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "44voxihyxL963RmaCndtMl",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      },
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 18
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "popup"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "50T0YGiGBH7qZZFeATiEP+"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 600,
-      "height": 450
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "50XxsJbrFCN4H9VEVO1jhI"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 600,
-      "height": 450
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "89vNfbOw5OYLiuCSle5Cni"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 15
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 1200,
-      "height": 900
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "3dNz0H16xGpJqDZ5588nMV"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 17
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 1168,
-      "height": 868
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "dbPtEc0lVC6b6/8Lozo2Vm"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
   {
     "__type__": "cc.Node",
     "_name": "Popup01_Basic_Single",
@@ -310,17 +93,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 3
       },
       {
-        "__id__": 22
+        "__id__": 5
       },
       {
-        "__id__": 24
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 9
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -357,11 +140,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 4
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -385,24 +168,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 6
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 53,
+      "g": 69,
+      "b": 99,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@40431",
+      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fa1a2",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -417,7 +200,10 @@
     "_fillRange": 0,
     "_isTrimmedMode": true,
     "_useGrayscale": false,
-    "_atlas": null,
+    "_atlas": {
+      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+      "__expectedType__": "cc.SpriteAtlas"
+    },
     "_id": ""
   },
   {
@@ -430,11 +216,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 8
     },
     "_alignFlags": 45,
     "_target": null,
@@ -473,6 +259,181 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Popup01_Basic_White_Light",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 211,
+      "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__": 10
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 592,
+      "height": 24
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2bSl5MVoJErbWJ6u/sWqCM"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@0a012",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_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": "6cpE0Dv8tA1IFPimNzV3KO"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_alignFlags": 41,
+    "_target": null,
+    "_left": 4,
+    "_right": 4,
+    "_top": 2,
+    "_bottom": 319.5,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 50,
+    "_originalHeight": 24,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c9qYMzJdxM+IdipBuBiV04"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "e4Ca3fwTxFCbFJi+ysH+sp",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.Node",
     "_name": "lab_title",
@@ -485,17 +446,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 19
       },
       {
-        "__id__": 30
+        "__id__": 21
       },
       {
-        "__id__": 32
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -532,11 +493,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 18
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 20
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -560,11 +521,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 18
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 22
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -628,11 +589,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 18
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 33
+      "__id__": 24
     },
     "_params": [],
     "_dataID": "",
@@ -667,17 +628,17 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 27
       },
       {
-        "__id__": 38
+        "__id__": 29
       },
       {
-        "__id__": 40
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -714,11 +675,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -742,11 +703,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -810,11 +771,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 26
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 41
+      "__id__": 32
     },
     "_params": [],
     "_dataID": "",
@@ -849,14 +810,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 35
       },
       {
-        "__id__": 46
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -893,11 +854,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -921,11 +882,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 38
     },
     "_lineHeight": 21,
     "_string": "<color=#00ff00>Rich</color><color=#0fffff>Text</color>",
@@ -976,23 +937,23 @@
     },
     "_children": [
       {
-        "__id__": 50
+        "__id__": 41
       },
       {
-        "__id__": 89
+        "__id__": 80
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 122
+        "__id__": 113
       },
       {
-        "__id__": 124
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 126
+      "__id__": 117
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1029,30 +990,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 40
     },
     "_children": [
       {
-        "__id__": 51
+        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 70
       },
       {
-        "__id__": 81
+        "__id__": 72
       },
       {
-        "__id__": 83
+        "__id__": 74
       },
       {
-        "__id__": 86
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 79
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1087,17 +1048,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 50
+      "__id__": 41
     },
     "_prefab": {
-      "__id__": 52
+      "__id__": 43
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 51
+      "__id__": 42
     },
     "asset": {
       "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -1105,7 +1066,7 @@
     },
     "fileId": "60RuUkpjBAGoLk3z4xlHcF",
     "instance": {
-      "__id__": 53
+      "__id__": 44
     },
     "targetOverrides": null
   },
@@ -1118,50 +1079,50 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 45
+      },
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 48
+      },
+      {
+        "__id__": 49
+      },
+      {
+        "__id__": 50
+      },
+      {
+        "__id__": 52
+      },
       {
         "__id__": 54
       },
       {
         "__id__": 56
       },
-      {
-        "__id__": 57
-      },
       {
         "__id__": 58
       },
       {
-        "__id__": 59
+        "__id__": 60
       },
       {
         "__id__": 61
       },
       {
-        "__id__": 63
+        "__id__": 62
       },
       {
-        "__id__": 65
+        "__id__": 64
       },
       {
-        "__id__": 67
+        "__id__": 66
       },
       {
-        "__id__": 69
-      },
-      {
-        "__id__": 70
-      },
-      {
-        "__id__": 71
-      },
-      {
-        "__id__": 73
-      },
-      {
-        "__id__": 75
-      },
-      {
-        "__id__": 77
+        "__id__": 68
       }
     ],
     "removedComponents": []
@@ -1169,7 +1130,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 55
+      "__id__": 46
     },
     "propertyPath": [
       "_name"
@@ -1185,7 +1146,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 55
+      "__id__": 46
     },
     "propertyPath": [
       "_lpos"
@@ -1200,7 +1161,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 55
+      "__id__": 46
     },
     "propertyPath": [
       "_lrot"
@@ -1216,7 +1177,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 55
+      "__id__": 46
     },
     "propertyPath": [
       "_euler"
@@ -1231,7 +1192,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 60
+      "__id__": 51
     },
     "propertyPath": [
       "_active"
@@ -1247,7 +1208,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 62
+      "__id__": 53
     },
     "propertyPath": [
       "_lpos"
@@ -1268,7 +1229,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 64
+      "__id__": 55
     },
     "propertyPath": [
       "_lpos"
@@ -1289,7 +1250,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 66
+      "__id__": 57
     },
     "propertyPath": [
       "_contentSize"
@@ -1309,7 +1270,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 68
+      "__id__": 59
     },
     "propertyPath": [
       "_top"
@@ -1325,7 +1286,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 68
+      "__id__": 59
     },
     "propertyPath": [
       "_bottom"
@@ -1335,7 +1296,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 64
+      "__id__": 55
     },
     "propertyPath": [
       "_active"
@@ -1345,7 +1306,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 72
+      "__id__": 63
     },
     "propertyPath": [
       "_color"
@@ -1367,7 +1328,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 74
+      "__id__": 65
     },
     "propertyPath": [
       "_color"
@@ -1389,7 +1350,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 67
     },
     "propertyPath": [
       "_string"
@@ -1405,7 +1366,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 78
+      "__id__": 69
     },
     "propertyPath": [
       "_contentSize"
@@ -1428,11 +1389,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1456,11 +1417,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1498,15 +1459,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 75
     },
     "clickEvents": [
       {
-        "__id__": 85
+        "__id__": 76
       }
     ],
     "_interactable": true,
@@ -1546,7 +1507,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
-      "__id__": 50
+      "__id__": 41
     },
     "_id": ""
   },
@@ -1570,11 +1531,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 41
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 87
+      "__id__": 78
     },
     "_alignFlags": 12,
     "_target": null,
@@ -1619,30 +1580,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 40
     },
     "_children": [
       {
-        "__id__": 90
+        "__id__": 81
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 103
       },
       {
-        "__id__": 114
+        "__id__": 105
       },
       {
-        "__id__": 116
+        "__id__": 107
       },
       {
-        "__id__": 119
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 121
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1677,17 +1638,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 89
+      "__id__": 80
     },
     "_prefab": {
-      "__id__": 91
+      "__id__": 82
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 90
+      "__id__": 81
     },
     "asset": {
       "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -1695,7 +1656,7 @@
     },
     "fileId": "60RuUkpjBAGoLk3z4xlHcF",
     "instance": {
-      "__id__": 92
+      "__id__": 83
     },
     "targetOverrides": null
   },
@@ -1708,15 +1669,30 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
+      {
+        "__id__": 84
+      },
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 87
+      },
+      {
+        "__id__": 88
+      },
+      {
+        "__id__": 89
+      },
+      {
+        "__id__": 91
+      },
       {
         "__id__": 93
       },
       {
         "__id__": 95
       },
-      {
-        "__id__": 96
-      },
       {
         "__id__": 97
       },
@@ -1727,22 +1703,7 @@
         "__id__": 100
       },
       {
-        "__id__": 102
-      },
-      {
-        "__id__": 104
-      },
-      {
-        "__id__": 106
-      },
-      {
-        "__id__": 107
-      },
-      {
-        "__id__": 109
-      },
-      {
-        "__id__": 110
+        "__id__": 101
       }
     ],
     "removedComponents": []
@@ -1750,7 +1711,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 94
+      "__id__": 85
     },
     "propertyPath": [
       "_name"
@@ -1766,7 +1727,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 94
+      "__id__": 85
     },
     "propertyPath": [
       "_lpos"
@@ -1781,7 +1742,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 94
+      "__id__": 85
     },
     "propertyPath": [
       "_lrot"
@@ -1797,7 +1758,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 94
+      "__id__": 85
     },
     "propertyPath": [
       "_euler"
@@ -1812,7 +1773,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 99
+      "__id__": 90
     },
     "propertyPath": [
       "_active"
@@ -1828,7 +1789,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 101
+      "__id__": 92
     },
     "propertyPath": [
       "_lpos"
@@ -1849,7 +1810,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 103
+      "__id__": 94
     },
     "propertyPath": [
       "_contentSize"
@@ -1869,7 +1830,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 105
+      "__id__": 96
     },
     "propertyPath": [
       "_active"
@@ -1885,7 +1846,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 99
+      "__id__": 90
     },
     "propertyPath": [
       "_lpos"
@@ -1900,7 +1861,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 108
+      "__id__": 99
     },
     "propertyPath": [
       "_top"
@@ -1916,7 +1877,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 108
+      "__id__": 99
     },
     "propertyPath": [
       "_bottom"
@@ -1926,7 +1887,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 111
+      "__id__": 102
     },
     "propertyPath": [
       "_string"
@@ -1945,11 +1906,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 80
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 113
+      "__id__": 104
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1973,11 +1934,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 80
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 115
+      "__id__": 106
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2015,15 +1976,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 80
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
+      "__id__": 108
     },
     "clickEvents": [
       {
-        "__id__": 118
+        "__id__": 109
       }
     ],
     "_interactable": true,
@@ -2063,7 +2024,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
-      "__id__": 89
+      "__id__": 80
     },
     "_id": ""
   },
@@ -2087,11 +2048,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 80
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 120
+      "__id__": 111
     },
     "_alignFlags": 36,
     "_target": null,
@@ -2136,11 +2097,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 123
+      "__id__": 114
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2164,11 +2125,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 125
+      "__id__": 116
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2219,7 +2180,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 128
+      "__id__": 119
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2247,7 +2208,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 130
+      "__id__": 121
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2289,25 +2250,25 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 132
+      "__id__": 123
     },
     "lab_title": {
-      "__id__": 30
+      "__id__": 21
     },
     "lab_content": {
-      "__id__": 46
+      "__id__": 37
     },
     "lab_ok": {
-      "__id__": 133
+      "__id__": 124
     },
     "lab_cancel": {
-      "__id__": 183
+      "__id__": 174
     },
     "btn_ok": {
-      "__id__": 50
+      "__id__": 41
     },
     "btn_cancel": {
-      "__id__": 89
+      "__id__": 80
     },
     "_id": ""
   },
@@ -2321,11 +2282,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 134
+      "__id__": 125
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 182
+      "__id__": 173
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2387,20 +2348,20 @@
       "mountedRoot": null
     },
     "_parent": {
-      "__id__": 135
+      "__id__": 126
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 179
+        "__id__": 170
       },
       {
-        "__id__": 133
+        "__id__": 124
       }
     ],
     "_prefab": {
-      "__id__": 181
+      "__id__": 172
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2437,33 +2398,33 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 51
+      "__id__": 42
     },
     "_children": [
       {
-        "__id__": 134
+        "__id__": 125
       },
       {
-        "__id__": 136
+        "__id__": 127
       },
       {
-        "__id__": 154
+        "__id__": 145
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 172
+        "__id__": 163
       },
       {
-        "__id__": 174
+        "__id__": 165
       },
       {
-        "__id__": 176
+        "__id__": 167
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 169
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2502,27 +2463,27 @@
       "mountedRoot": null
     },
     "_parent": {
-      "__id__": 135
+      "__id__": 126
     },
     "_children": [
       {
-        "__id__": 137
+        "__id__": 128
       },
       {
-        "__id__": 143
+        "__id__": 134
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 149
+        "__id__": 140
       },
       {
-        "__id__": 151
+        "__id__": 142
       }
     ],
     "_prefab": {
-      "__id__": 153
+      "__id__": 144
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2559,20 +2520,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 136
+      "__id__": 127
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 138
+        "__id__": 129
       },
       {
-        "__id__": 140
+        "__id__": 131
       }
     ],
     "_prefab": {
-      "__id__": 142
+      "__id__": 133
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2609,11 +2570,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 137
+      "__id__": 128
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 139
+      "__id__": 130
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2637,11 +2598,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 137
+      "__id__": 128
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 141
+      "__id__": 132
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2695,20 +2656,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 136
+      "__id__": 127
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 144
+        "__id__": 135
       },
       {
-        "__id__": 146
+        "__id__": 137
       }
     ],
     "_prefab": {
-      "__id__": 148
+      "__id__": 139
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2745,11 +2706,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 134
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 145
+      "__id__": 136
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2773,11 +2734,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 143
+      "__id__": 134
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 147
+      "__id__": 138
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2854,11 +2815,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 136
+      "__id__": 127
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 150
+      "__id__": 141
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2882,11 +2843,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 136
+      "__id__": 127
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 152
+      "__id__": 143
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2935,27 +2896,27 @@
       "mountedRoot": null
     },
     "_parent": {
-      "__id__": 135
+      "__id__": 126
     },
     "_children": [
       {
-        "__id__": 155
+        "__id__": 146
       },
       {
-        "__id__": 161
+        "__id__": 152
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 167
+        "__id__": 158
       },
       {
-        "__id__": 169
+        "__id__": 160
       }
     ],
     "_prefab": {
-      "__id__": 171
+      "__id__": 162
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2992,20 +2953,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 154
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 156
+        "__id__": 147
       },
       {
-        "__id__": 158
+        "__id__": 149
       }
     ],
     "_prefab": {
-      "__id__": 160
+      "__id__": 151
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3042,11 +3003,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 155
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 157
+      "__id__": 148
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3070,11 +3031,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 155
+      "__id__": 146
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 159
+      "__id__": 150
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3131,20 +3092,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 154
+      "__id__": 145
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 162
+        "__id__": 153
       },
       {
-        "__id__": 164
+        "__id__": 155
       }
     ],
     "_prefab": {
-      "__id__": 166
+      "__id__": 157
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3181,11 +3142,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 161
+      "__id__": 152
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 163
+      "__id__": 154
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3209,11 +3170,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 161
+      "__id__": 152
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 165
+      "__id__": 156
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3290,11 +3251,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 154
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 168
+      "__id__": 159
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3318,11 +3279,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 154
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 170
+      "__id__": 161
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -3369,11 +3330,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 135
+      "__id__": 126
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 173
+      "__id__": 164
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3397,11 +3358,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 135
+      "__id__": 126
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 175
+      "__id__": 166
     },
     "_alignFlags": 45,
     "_target": null,
@@ -3433,11 +3394,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 135
+      "__id__": 126
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 177
+      "__id__": 168
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -3484,11 +3445,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 134
+      "__id__": 125
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 180
+      "__id__": 171
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3529,11 +3490,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 184
+      "__id__": 175
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 232
+      "__id__": 223
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3595,20 +3556,20 @@
       "mountedRoot": null
     },
     "_parent": {
-      "__id__": 185
+      "__id__": 176
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 229
+        "__id__": 220
       },
       {
-        "__id__": 183
+        "__id__": 174
       }
     ],
     "_prefab": {
-      "__id__": 231
+      "__id__": 222
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3645,33 +3606,33 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 90
+      "__id__": 81
     },
     "_children": [
       {
-        "__id__": 184
+        "__id__": 175
       },
       {
-        "__id__": 186
+        "__id__": 177
       },
       {
-        "__id__": 204
+        "__id__": 195
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 222
+        "__id__": 213
       },
       {
-        "__id__": 224
+        "__id__": 215
       },
       {
-        "__id__": 226
+        "__id__": 217
       }
     ],
     "_prefab": {
-      "__id__": 228
+      "__id__": 219
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3710,27 +3671,27 @@
       "mountedRoot": null
     },
     "_parent": {
-      "__id__": 185
+      "__id__": 176
     },
     "_children": [
       {
-        "__id__": 187
+        "__id__": 178
       },
       {
-        "__id__": 193
+        "__id__": 184
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 199
+        "__id__": 190
       },
       {
-        "__id__": 201
+        "__id__": 192
       }
     ],
     "_prefab": {
-      "__id__": 203
+      "__id__": 194
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3767,20 +3728,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 186
+      "__id__": 177
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 188
+        "__id__": 179
       },
       {
-        "__id__": 190
+        "__id__": 181
       }
     ],
     "_prefab": {
-      "__id__": 192
+      "__id__": 183
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3817,11 +3778,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 187
+      "__id__": 178
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 189
+      "__id__": 180
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3845,11 +3806,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 187
+      "__id__": 178
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 191
+      "__id__": 182
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3903,20 +3864,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 186
+      "__id__": 177
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 194
+        "__id__": 185
       },
       {
-        "__id__": 196
+        "__id__": 187
       }
     ],
     "_prefab": {
-      "__id__": 198
+      "__id__": 189
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3953,11 +3914,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 193
+      "__id__": 184
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 195
+      "__id__": 186
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3981,11 +3942,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 193
+      "__id__": 184
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 197
+      "__id__": 188
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4062,11 +4023,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 177
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 200
+      "__id__": 191
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4090,11 +4051,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 177
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 202
+      "__id__": 193
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -4143,27 +4104,27 @@
       "mountedRoot": null
     },
     "_parent": {
-      "__id__": 185
+      "__id__": 176
     },
     "_children": [
       {
-        "__id__": 205
+        "__id__": 196
       },
       {
-        "__id__": 211
+        "__id__": 202
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 217
+        "__id__": 208
       },
       {
-        "__id__": 219
+        "__id__": 210
       }
     ],
     "_prefab": {
-      "__id__": 221
+      "__id__": 212
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4200,20 +4161,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 204
+      "__id__": 195
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 206
+        "__id__": 197
       },
       {
-        "__id__": 208
+        "__id__": 199
       }
     ],
     "_prefab": {
-      "__id__": 210
+      "__id__": 201
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4250,11 +4211,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 205
+      "__id__": 196
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 207
+      "__id__": 198
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4278,11 +4239,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 205
+      "__id__": 196
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 209
+      "__id__": 200
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4339,20 +4300,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 204
+      "__id__": 195
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 212
+        "__id__": 203
       },
       {
-        "__id__": 214
+        "__id__": 205
       }
     ],
     "_prefab": {
-      "__id__": 216
+      "__id__": 207
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4389,11 +4350,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 211
+      "__id__": 202
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 213
+      "__id__": 204
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4417,11 +4378,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 211
+      "__id__": 202
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 215
+      "__id__": 206
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4498,11 +4459,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 204
+      "__id__": 195
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 218
+      "__id__": 209
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4526,11 +4487,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 204
+      "__id__": 195
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 220
+      "__id__": 211
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -4577,11 +4538,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 185
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 223
+      "__id__": 214
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4605,11 +4566,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 185
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 225
+      "__id__": 216
     },
     "_alignFlags": 45,
     "_target": null,
@@ -4641,11 +4602,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 185
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 227
+      "__id__": 218
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -4692,11 +4653,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 184
+      "__id__": 175
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 230
+      "__id__": 221
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4743,27 +4704,24 @@
     "instance": null,
     "targetOverrides": [
       {
-        "__id__": 234
+        "__id__": 225
       },
       {
-        "__id__": 236
+        "__id__": 227
       },
       {
-        "__id__": 238
+        "__id__": 229
       },
       {
-        "__id__": 240
+        "__id__": 231
       }
     ],
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 90
+        "__id__": 81
       },
       {
-        "__id__": 51
-      },
-      {
-        "__id__": 2
+        "__id__": 42
       }
     ]
   },
@@ -4775,10 +4733,10 @@
       "lab_ok"
     ],
     "target": {
-      "__id__": 51
+      "__id__": 42
     },
     "targetInfo": {
-      "__id__": 235
+      "__id__": 226
     }
   },
   {
@@ -4795,10 +4753,10 @@
       "lab_cancel"
     ],
     "target": {
-      "__id__": 90
+      "__id__": 81
     },
     "targetInfo": {
-      "__id__": 237
+      "__id__": 228
     }
   },
   {
@@ -4810,17 +4768,17 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 131
+      "__id__": 122
     },
     "sourceInfo": null,
     "propertyPath": [
       "lab_ok"
     ],
     "target": {
-      "__id__": 51
+      "__id__": 42
     },
     "targetInfo": {
-      "__id__": 239
+      "__id__": 230
     }
   },
   {
@@ -4832,17 +4790,17 @@
   {
     "__type__": "cc.TargetOverrideInfo",
     "source": {
-      "__id__": 131
+      "__id__": 122
     },
     "sourceInfo": null,
     "propertyPath": [
       "lab_cancel"
     ],
     "target": {
-      "__id__": 90
+      "__id__": 81
     },
     "targetInfo": {
-      "__id__": 241
+      "__id__": 232
     }
   },
   {
diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta
index fc1865be..963ae0f4 100644
--- a/assets/resources/gui/ui3.plist.meta
+++ b/assets/resources/gui/ui3.plist.meta
@@ -5958,10 +5958,10 @@
         "height": 61,
         "rawWidth": 54,
         "rawHeight": 61,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "borderTop": 28,
+        "borderBottom": 33,
+        "borderLeft": 27,
+        "borderRight": 27,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -6006,8 +6006,8 @@
         "rawHeight": 24,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "borderLeft": 25,
+        "borderRight": 25,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
diff --git a/assets/script/game/common/config/HeroSkillDesc.ts b/assets/script/game/common/config/HeroSkillDesc.ts
index a67a1244..ad824fce 100644
--- a/assets/script/game/common/config/HeroSkillDesc.ts
+++ b/assets/script/game/common/config/HeroSkillDesc.ts
@@ -1,33 +1,33 @@
-/**
- * @file HeroSkillDesc.ts
- * @description 英雄技能/能力描述的【唯一文字表达标准层】
- *
- * 设计目标：
- *   heroSet / SkillSet 中的 info / infos 仅作"基础备注"，不再承担面板展示。
- *   所有功能性描述（触发技能、驻场光环、复活、等级额外属性加成）统一由本模块
- *   依据结构化配置动态拼出，数值永远来自 mergeSkillParams 合并后的实时配置，
- *   杜绝"改数值忘改文案"的漂移。
- *
- * 输出（双格式，供 UI 按需取用）：
- *   - buildSkillDesc(source)     → 纯文本（Label 用），数值无颜色
- *   - buildSkillDescRich(source) → 富文本（RichText 用，BBCode），技能名蓝色、数值绿色高亮
- *   两者共用同一套结构化行构建逻辑，仅渲染阶段区分，保证纯/富文本内容严格一致。
- *
- * 通用性（纯配置驱动）：
- *     1. 触发框架：按触发类型遍历（SkillSet + overrides，不动）
- *     2. 效果文案：查 SkillDescSet 结构化模板渲染
- *     3. 目标/属性名：由本模块统一语义化（target/hit_count、ATTR_NAME）
- *
- * 数据源（入参抽象 ISkillDescSource）：
- *   heroInfo（静态 1 级配置）与 HeroAttrsComp（运行时应用 evolve 后的当前等级配置）
- *   字段结构一致，天然都满足。HeroBoxComp 传 model 显示当前等级；卡池/商店传 heroInfo 显示 1 级。
- *
- * 依赖：
- *   - heroSet     :SkillTriggerName、SkillTriggerType、TriggerGrouped/LvFieldEntry/LvReviveEntry/LvBonusEntry 及 resolver
- *   - SkillSet    :SkillSet、mergeSkillParams、SkillOverrides、SkillKind、TGroup
- *   - SkillDescSet:结构化描述模板
- *   - FieldSkillSet（驻场技能）、BuffList（计时 buff 默认值兜底）、Attrs（属性枚举）
- */
+/**
+* @file HeroSkillDesc.ts
+* @description 英雄技能/能力描述的【唯一文字表达标准层】
+*
+* 设计目标：
+*   heroSet / SkillSet 中的 info / infos 仅作"基础备注"，不再承担面板展示。
+*   所有功能性描述（触发技能、驻场光环、复活、等级额外属性加成）统一由本模块
+*   依据结构化配置动态拼出，数值永远来自 mergeSkillParams 合并后的实时配置，
+*   杜绝"改数值忘改文案"的漂移。
+*
+* 输出（双格式，供 UI 按需取用）：
+*   - buildSkillDesc(source)     → 纯文本（Label 用），数值无颜色
+*   - buildSkillDescRich(source) → 富文本（RichText 用，BBCode），技能名蓝色、数值绿色高亮
+*   两者共用同一套结构化行构建逻辑，仅渲染阶段区分，保证纯/富文本内容严格一致。
+*
+* 通用性（纯配置驱动）：
+*     1. 触发框架：按触发类型遍历（SkillSet + overrides，不动）
+*     2. 效果文案：查 SkillDescSet 结构化模板渲染
+*     3. 目标/属性名：由本模块统一语义化（target/hit_count、ATTR_NAME）
+*
+* 数据源（入参抽象 ISkillDescSource）：
+*   heroInfo（静态 1 级配置）与 HeroAttrsComp（运行时应用 evolve 后的当前等级配置）
+*   字段结构一致，天然都满足。HeroBoxComp 传 model 显示当前等级；卡池/商店传 heroInfo 显示 1 级。
+*
+* 依赖：
+*   - heroSet     :SkillTriggerName、SkillTriggerType、TriggerGrouped/LvFieldEntry/LvReviveEntry/LvBonusEntry 及 resolver
+*   - SkillSet    :SkillSet、mergeSkillParams、SkillOverrides、SkillKind、TGroup
+*   - SkillDescSet:结构化描述模板
+*   - FieldSkillSet（驻场技能）、BuffList（计时 buff 默认值兜底）、Attrs（属性枚举）
+*/
 import { SkillTriggerName, SkillTriggerType, TriggerGrouped, LvTriggerEntry, LvFieldEntry, LvReviveEntry, LvBonusEntry, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv, getTriggerSkillName, HGrowType, calcGrowBonus } from "./heroSet";
 import { FieldSkillSet, mergeSkillParams, SkillConfig, SkillKind, SkillOverrides, SkillSet, TGroup } from "./SkillSet";
 import { FieldDescSet, FieldValueFmt, SkillDescSet } from "./SkillDescSet";
@@ -99,6 +99,18 @@ const ATTR_NAME: Partial<Record<Attrs, string>> = {
 /** 富文本数值高亮色（鲜亮绿色，深色面板上高亮醒目） */
 const RICH_VALUE_COLOR = "#3CE66E";
 
+/** 数值描边色（深绿，衬托亮绿填充，与技能名橙填充+深褐描边同一设计思路） */
+const RICH_VALUE_OUTLINE = "#145A32";
+
+/**
+ * 数值富文本片段：亮绿填充 + 深绿描边。
+ * 高亮数值明度高，深色描边增强边缘对比、提升深色面板上的锐度。
+ * @param text 数值文本（含单位，如 "15%"、"4次"）
+ */
+function valueRich(text: string | number): string {
+    return `<outline color=${RICH_VALUE_OUTLINE} width=1><color=${RICH_VALUE_COLOR}>${text}</color></outline>`;
+}
+
 /** 富文本技能名高亮色（蜜桃橙，暖色系，与面板绿/蓝/红/黄/紫均不冲突） */
 const RICH_NAME_COLOR = "#F8C471";
 
@@ -498,14 +510,14 @@ export function buildSingleSkillRich(skillUuid: number, overrides?: SkillOverrid
     const skill = mergeSkillParams(base, overrides);
     // SkillConfig 未定义 cd 字段，冷却时间由外部运行时数据传入；计时模式展示持续时间
     const dur = skill.buff_duration ?? (skill.timed_buff_id !== undefined ? BuffList[skill.timed_buff_id]?.duration : undefined) ?? 0;
-    const cdTag = dur > 0 ? `<color=${RICH_VALUE_COLOR}>持续:${dur}s</color>` : "";
+    const cdTag = dur > 0 ? valueRich(`持续:${dur}s`) : "";
     const nameTag = `${skillNameRich(skill.name)} Lv.${lv}`;
 
     // 复用结构化效果行，head 为空避免重复触发类型前缀
     const line = buildEffectLine("", skill);
     const prefix = line.prefix.replace(SKILL_NAME_PATTERN, (m, g1) => skillNameRich(g1));
     const effect = line.value
-        ? `${prefix}<color=${RICH_VALUE_COLOR}>${line.value}</color>${line.suffix}`
+        ? `${prefix}${valueRich(line.value)}${line.suffix}`
         : `${prefix}${line.suffix}`;
 
     return cdTag ? `${nameTag} ${cdTag}\n${effect}` : `${nameTag}\n${effect}`;
@@ -525,7 +537,7 @@ export function buildEquipRich(fieldUuids: number[], showName: boolean = false):
         if (!line) continue;
         const prefix = line.prefix.replace(SKILL_NAME_PATTERN, (m, g1) => skillNameRich(g1));
         const text = line.value
-            ? `${prefix}<color=${RICH_VALUE_COLOR}>${line.value}</color>${line.suffix}`
+            ? `${prefix}${valueRich(line.value)}${line.suffix}`
             : `${prefix}${line.suffix}`;
         lines.push(text);
     }
@@ -553,7 +565,7 @@ export function buildSkillDescMoreRich(source: ISkillDescSource): string {
     const effectRich = (line: ISkillLine): string => {
         const prefix = line.prefix.replace(SKILL_NAME_PATTERN, (m, g1) => skillNameRich(g1));
         const text = line.value
-            ? `${prefix}<color=${RICH_VALUE_COLOR}>${line.value}</color>${line.suffix}`
+            ? `${prefix}${valueRich(line.value)}${line.suffix}`
             : `${prefix}${line.suffix}`;
         return highlightDuration(text);
     };
@@ -584,7 +596,7 @@ export function buildSkillDescMoreRich(source: ISkillDescSource): string {
             const curSLv = cur.s_lv ?? (curIdx + 1);
             // 触发次数直接写为富文本（数字绿色高亮），如 "受伤3次"
             const curTrig = needCount
-                ? `${trigName}<color=${RICH_VALUE_COLOR}>${cur.t_num}</color>次`
+                ? `${trigName}${valueRich(cur.t_num)}次`
                 : trigName;
             // 技能名 + 档位数字后缀（如 "不屈壁垒1"），与光环命名口径一致
             const curHead = `「${skillName}${curSLv}」: ${curTrig}, `;
@@ -608,7 +620,7 @@ export function buildSkillDescMoreRich(source: ISkillDescSource): string {
     const revive = resolveReviveByLv(source[SkillTriggerType.Revive] as LvReviveEntry[] | undefined, lv);
     if (revive) {
         const reviveName = getTriggerSkillName(SkillTriggerType.Revive, revive.s_uuid);
-        lines.push(`${skillNameRich(reviveName)}: 每回合拥有<color=${RICH_VALUE_COLOR}>${revive.r_num}</color>次重生机会, 死亡后以<color=${RICH_VALUE_COLOR}>${Math.round(revive.upr * 100)}%</color>血量原地重生`);
+        lines.push(`${skillNameRich(reviveName)}: 每回合拥有${valueRich(revive.r_num)}次重生机会, 死亡后以${valueRich(`${Math.round(revive.upr * 100)}%`)}血量原地重生`);
     }
 
     return lines.join("\n");
@@ -620,7 +632,7 @@ export function buildSkillDescMoreRich(source: ISkillDescSource): string {
  *      持续时间对药水/计时 buff 同样关键，这里补充高亮，保证视觉一致。
  */
 function highlightDuration(text: string): string {
-    return text.replace(DURATION_PATTERN, `持续<color=${RICH_VALUE_COLOR}>$1</color>秒`);
+    return text.replace(DURATION_PATTERN, `持续${valueRich("$1")}秒`);
 }
 
 /**
@@ -634,7 +646,7 @@ function renderLineRich(line: ISkillLine): string {
     // 未来档数值灰色追加在当前高亮数值后（"15%/20%/30%"），suffix 仍位于整段数值之后
     const next = line.nextValues?.length ? `<color=${RICH_LOCKED_COLOR}>/${line.nextValues.join("/")}</color>` : "";
     return line.value
-        ? `${prefix}<color=${RICH_VALUE_COLOR}>${line.value}</color>${next}${line.suffix}`
+        ? `${prefix}${valueRich(line.value)}${next}${line.suffix}`
         : `${prefix}${next}${line.suffix}`;
 }
 
@@ -646,7 +658,7 @@ function renderLineRich(line: ISkillLine): string {
 function buildChanceSuffix(skill: SkillConfig): string {
     const items: string[] = [];
     const push = (val: number | undefined, label: string) => {
-        if (val && val > 0) items.push(`附加<color=${RICH_VALUE_COLOR}>${val}</color>%${label}`);
+        if (val && val > 0) items.push(`附加${valueRich(val)}%${label}`);
     };
     push(skill.crt, "暴击");
     push(skill.frz, "冰冻");
@@ -699,8 +711,8 @@ export function buildCardDescRich(card: CardConfig): string {
             return rich;
         }
 
-        const rhythm = `每<color=${RICH_VALUE_COLOR}>${tInv}</color>秒召唤<color=${RICH_VALUE_COLOR}>${(card.overrides?.num ?? 0) + 1}</color>个${skillNameRich(skill.name)}攻击敌人`;
-        const times = `, 共<color=${RICH_VALUE_COLOR}>${tTimes}</color>次`;
+        const rhythm = `每${valueRich(tInv)}秒召唤${valueRich((card.overrides?.num ?? 0) + 1)}个${skillNameRich(skill.name)}攻击敌人`;
+        const times = `, 共${valueRich(tTimes)}次`;
         return `${rhythm}, ${rich}${times}`;
     }
 
diff --git a/assets/script/game/map/HeroBoxComp.ts b/assets/script/game/map/HeroBoxComp.ts
index 0f55145d..824623d7 100644
--- a/assets/script/game/map/HeroBoxComp.ts
+++ b/assets/script/game/map/HeroBoxComp.ts
@@ -557,13 +557,19 @@ export class HeroBoxComp extends CCComp {
         }
 
         // ---- AP / HP ----
+        // plus（附加值）= 最终值 - 当前等级基础值；基础值 = 1 级原始 base + 等级成长 + ap/hp_bonus 一次性奖励。
+        // Why: base_ap/base_hp 是不含任何等级增长的原始值，直接用 final-base 会把升级带来的
+        //      属性增长也计入增量。这里补齐等级增长作为基准，使 plus 仅反映 buff/光环等临时增益。
+        const lv = Math.max(1, Math.floor(this.model.lv ?? 1));
+        const grow = hero ? calcGrowBonus(hero, lv) : { ap: 0, hp: 0 };
+
         const finalAp = Math.max(0, Math.floor(this.model.getFinalAp()));
-        const baseAp = Math.max(0, Math.floor(this.model.base_ap ?? 0));
-        this.setStatRow(this.ap_all_label, this.ap_plus_label, finalAp, finalAp - baseAp);
+        const lvBaseAp = Math.max(0, Math.floor((this.model.base_ap ?? 0) + grow.ap + HeroBoxComp.sumBonus(hero?.ap_bonus, lv)));
+        this.setStatRow(this.ap_all_label, this.ap_plus_label, finalAp, finalAp - lvBaseAp);
 
         const finalHp = Math.max(0, Math.floor(this.model.getFinalHpMax()));
-        const baseHp = Math.max(0, Math.floor(this.model.base_hp ?? 0));
-        this.setStatRow(this.hp_all_label, this.hp_plus_label, finalHp, finalHp - baseHp);
+        const lvBaseHp = Math.max(0, Math.floor((this.model.base_hp ?? 0) + grow.hp + HeroBoxComp.sumBonus(hero?.hp_bonus, lv)));
+        this.setStatRow(this.hp_all_label, this.hp_plus_label, finalHp, finalHp - lvBaseHp);
 
         // ---- 图标（UUID 变化时重新加载首帧动画） ----
         if (hero && heroUuid !== this.iconHeroUuid) {