diff --git a/assets/Scripts/chat18x/manager/NavigationManager.ts b/assets/Scripts/chat18x/manager/NavigationManager.ts
index 503c3e18..46fec887 100644
--- a/assets/Scripts/chat18x/manager/NavigationManager.ts
+++ b/assets/Scripts/chat18x/manager/NavigationManager.ts
@@ -118,7 +118,7 @@ export class NavigationManager {
    * 统一的面板切换方法
    * @param panelType 目标面板类型
    */
-  public switchToPanel(panelType: PanelType, force: boolean = false): void {
+  public switchToPanel(panelType: PanelType, force: boolean = false): Node {
     if (this.currentActivePanelType === panelType && !force) {
       if (panelType === PanelType.THEME) {
         this.girlListPanel?.hide();
diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
index abcd5093..10eb39fe 100644
--- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
@@ -101,6 +101,7 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
     } else {
       console.log("ChatPanel: 成功获取 SceneBgVideoLayer 实例");
     }
+    this.popUpImage.node.active = false;
   }
 
   register() {
diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
index c8dc2e3a..bffe5581 100644
--- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
@@ -295,7 +295,7 @@ export class ThemePanel extends li_BaseView {
   }
 
   enterShop() {
-    ViewManager.I.openBundlesView("PurchasePanel");
+    NavigationManager.Instance.switchToPanel(PanelType.PERSONAL);
   }
 
   chatWithRec() {
diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab
index e411dfa4..7f84c188 100644
--- a/assets/bundles/Chat18x/ChatPanel.prefab
+++ b/assets/bundles/Chat18x/ChatPanel.prefab
@@ -1820,7 +1820,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -380,
-      "y": -416.69299999999987,
+      "y": -43.837999999999965,
       "z": 0
     },
     "_lrot": {
@@ -2392,7 +2392,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 37,
-      "y": 45.2,
+      "y": 145.2,
       "z": 0
     },
     "_lrot": {
@@ -2432,8 +2432,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
-      "height": 50.4
+      "width": 650,
+      "height": 250.39999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2468,14 +2468,14 @@
       "b": 227,
       "a": 255
     },
-    "_string": "慵",
+    "_string": "morningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorningmorning",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_actualFontSize": 40,
     "_fontSize": 40,
     "_fontFamily": "NotoSans-Regular",
     "_lineHeight": 40,
-    "_overflow": 0,
+    "_overflow": 3,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2704,7 +2704,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 380,
-      "y": -420.418,
+      "y": 402.971,
       "z": 0
     },
     "_lrot": {
@@ -2760,8 +2760,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -244.296,
-      "y": 119.1195,
+      "x": -365,
+      "y": 143.9215,
       "z": 0
     },
     "_lrot": {
@@ -2820,8 +2820,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 306.596,
-      "y": 74.1195,
+      "x": 427.3,
+      "y": 98.92150000000001,
       "z": 0
     },
     "_lrot": {
@@ -3141,8 +3141,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 488.592,
-      "height": 238.239
+      "width": 730,
+      "height": 287.843
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3184,7 +3184,7 @@
     "_originalWidth": 500,
     "_originalHeight": 153.8,
     "_alignMode": 1,
-    "_lockFlags": 13,
+    "_lockFlags": 45,
     "_id": ""
   },
   {
@@ -3316,7 +3316,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 680.3430000000001,
+      "width": 650,
       "height": 250.39999999999998
     },
     "_anchorPoint": {
@@ -3443,8 +3443,6 @@
       "__id__": 0
     },
     "fileId": "56pm4u3xtLBbHP/ntKqnNZ",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -5330,7 +5328,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "4ff901ef-3f6d-4856-89f1-896ec11c8df8@f9941",
+      "__uuid__": "656d9da9-1a0a-4bd9-949a-8562056efdc9@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -5399,22 +5397,10 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "4ff901ef-3f6d-4856-89f1-896ec11c8df8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_hoverSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_pressedSprite": {
-      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_disabledSprite": {
-      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
@@ -5733,7 +5719,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -167.72699999999998,
+      "y": -486.20799999999997,
       "z": 0
     },
     "_lrot": {
diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab
index c6d8666f..7db84874 100644
--- a/assets/bundles/Chat18x/GirlDetailPanel.prefab
+++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab
@@ -687,7 +687,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -453.9,
+      "y": -462.05,
       "z": 0
     },
     "_lrot": {
@@ -741,7 +741,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -506.1,
+      "y": -497.95,
       "z": 0
     },
     "_lrot": {
@@ -791,7 +791,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 93.90000000000009,
+      "y": 208,
       "z": 0
     },
     "_lrot": {
@@ -832,7 +832,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2107.8
+      "height": 1879.6
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -862,7 +862,7 @@
     "_left": 0,
     "_right": 0,
     "_top": -187.8,
-    "_bottom": 0,
+    "_bottom": 228.2,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -874,7 +874,7 @@
     "_originalWidth": 850,
     "_originalHeight": 1080,
     "_alignMode": 2,
-    "_lockFlags": 36,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
@@ -986,7 +986,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 907.8
+      "height": 924.1
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1139,7 +1139,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -1134.3,
+      "y": -1161.5,
       "z": 0
     },
     "_lrot": {
@@ -1446,8 +1446,8 @@
     "_string": "Name",
     "_horizontalAlign": 0,
     "_verticalAlign": 2,
-    "_actualFontSize": 71,
-    "_fontSize": 70,
+    "_actualFontSize": 61,
+    "_fontSize": 60,
     "_fontFamily": "NotoSans-Regular",
     "_lineHeight": 89.2,
     "_overflow": 2,
@@ -2569,7 +2569,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f95869cc-08b8-4470-a426-027233cd7328@f9941",
+      "__uuid__": "231a4bd0-d031-459a-bc94-d25a5d2a478f@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -2798,8 +2798,6 @@
       "__id__": 0
     },
     "fileId": "06jLQq9y1EiYCkIXl0LrXt",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -3481,7 +3479,7 @@
     "_target": null,
     "_left": 25.5,
     "_right": 25.5,
-    "_top": 909.8,
+    "_top": 937,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -3548,7 +3546,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -1527.3,
+      "y": -1565.4,
       "z": 0
     },
     "_lrot": {
@@ -3641,7 +3639,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1029,
+      "width": 1030,
       "height": 333
     },
     "_anchorPoint": {
@@ -3816,7 +3814,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 969,
+      "width": 970,
       "height": 273
     },
     "_anchorPoint": {
@@ -3964,7 +3962,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1029,
+      "width": 1030,
       "height": 333
     },
     "_anchorPoint": {
@@ -4037,9 +4035,9 @@
     },
     "_alignFlags": 41,
     "_target": null,
-    "_left": 25.5,
-    "_right": 25.5,
-    "_top": 1360.8,
+    "_left": 25,
+    "_right": 25,
+    "_top": 1398.9,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -4106,7 +4104,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -1758.45,
+      "y": -1807.45,
       "z": 0
     },
     "_lrot": {
@@ -4285,8 +4283,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.2,
-      "y": 0.2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -4313,8 +4311,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 2531.6,
-      "height": 42
+      "width": 463,
+      "height": 5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4344,13 +4342,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 55,
-      "g": 48,
-      "b": 60,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "19f6ec0b-0bca-43f5-92db-b15d08050f80@f9941",
+      "__uuid__": "e40904ac-0cdb-45a5-9c51-bf2092c8a776@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -4561,8 +4559,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.2,
-      "y": 0.2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -4589,8 +4587,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 2531.6,
-      "height": 42
+      "width": 463,
+      "height": 5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4620,13 +4618,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 222,
-      "g": 91,
+      "r": 255,
+      "g": 255,
       "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "19f6ec0b-0bca-43f5-92db-b15d08050f80@f9941",
+      "__uuid__": "1876a540-2606-4dee-ab76-5db661e5f559@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -5057,8 +5055,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.2,
-      "y": 0.2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -5085,8 +5083,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 2531.6,
-      "height": 42
+      "width": 463,
+      "height": 5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5116,13 +5114,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 55,
-      "g": 48,
-      "b": 60,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "19f6ec0b-0bca-43f5-92db-b15d08050f80@f9941",
+      "__uuid__": "e40904ac-0cdb-45a5-9c51-bf2092c8a776@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -5333,8 +5331,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.2,
-      "y": 0.2,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_mobility": 0,
@@ -5361,8 +5359,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 2531.6,
-      "height": 42
+      "width": 463,
+      "height": 5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5392,13 +5390,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 222,
-      "g": 91,
+      "r": 255,
+      "g": 255,
       "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "19f6ec0b-0bca-43f5-92db-b15d08050f80@f9941",
+      "__uuid__": "1876a540-2606-4dee-ab76-5db661e5f559@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 1,
@@ -5798,7 +5796,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -1823.1000000000001,
+      "y": -1883.0000000000002,
       "z": 0
     },
     "_lrot": {
@@ -5954,7 +5952,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1823.1
+      "height": 1882.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6028,7 +6026,7 @@
     "_paddingTop": 0,
     "_paddingBottom": 0,
     "_spacingX": 0,
-    "_spacingY": 2,
+    "_spacingY": 12.9,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,
@@ -6527,7 +6525,10 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_type": 1,
     "_fillType": 0,
     "_sizeMode": 0,
@@ -7496,8 +7497,8 @@
     "_string": "9999",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 59,
-    "_fontSize": 58,
+    "_actualFontSize": 43,
+    "_fontSize": 42,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
@@ -7658,7 +7659,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab
index 136be574..11ea6f20 100644
--- a/assets/bundles/Chat18x/GirlListPanel.prefab
+++ b/assets/bundles/Chat18x/GirlListPanel.prefab
@@ -24,6 +24,9 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 252
+      },
       {
         "__id__": 254
       },
@@ -32,13 +35,10 @@
       },
       {
         "__id__": 258
-      },
-      {
-        "__id__": 260
       }
     ],
     "_prefab": {
-      "__id__": 262
+      "__id__": 260
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -82,23 +82,23 @@
         "__id__": 3
       },
       {
-        "__id__": 214
+        "__id__": 212
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 245
+      },
       {
         "__id__": 247
       },
       {
         "__id__": 249
-      },
-      {
-        "__id__": 251
       }
     ],
     "_prefab": {
-      "__id__": 253
+      "__id__": 251
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -144,6 +144,9 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 203
+      },
       {
         "__id__": 205
       },
@@ -152,13 +155,10 @@
       },
       {
         "__id__": 209
-      },
-      {
-        "__id__": 211
       }
     ],
     "_prefab": {
-      "__id__": 213
+      "__id__": 211
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -200,10 +200,16 @@
     "_children": [
       {
         "__id__": 5
+      },
+      {
+        "__id__": 176
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 194
+      },
       {
         "__id__": 196
       },
@@ -212,81 +218,15 @@
       },
       {
         "__id__": 200
-      },
-      {
-        "__id__": 202
       }
     ],
     "_prefab": {
-      "__id__": 204
+      "__id__": 202
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -12.049999999999955,
-      "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.Node",
-    "_name": "view",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 4
-    },
-    "_children": [
-      {
-        "__id__": 6
-      },
-      {
-        "__id__": 179
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 187
-      },
-      {
-        "__id__": 189
-      },
-      {
-        "__id__": 191
-      },
-      {
-        "__id__": 193
-      }
-    ],
-    "_prefab": {
-      "__id__": 195
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
+      "y": 103.70000000000005,
       "z": 0
     },
     "_lrot": {
@@ -318,56 +258,38 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 4
     },
     "_children": [
       {
-        "__id__": 7
+        "__id__": 6
       },
       {
-        "__id__": 15
-      },
-      {
-        "__id__": 55
-      },
-      {
-        "__id__": 69
-      },
-      {
-        "__id__": 75
-      },
-      {
-        "__id__": 149
+        "__id__": 158
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 165
+        "__id__": 166
       },
       {
-        "__id__": 167
+        "__id__": 168
       },
       {
-        "__id__": 169
+        "__id__": 170
       },
       {
-        "__id__": 171
-      },
-      {
-        "__id__": 173
-      },
-      {
-        "__id__": 175
+        "__id__": 172
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 175
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 798.829,
+      "y": 718.1759999999999,
       "z": 0
     },
     "_lrot": {
@@ -398,6 +320,78 @@
     "_name": "bg",
     "_objFlags": 0,
     "__editorExtras__": {},
+    "_parent": {
+      "__id__": 5
+    },
+    "_children": [
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 55
+      },
+      {
+        "__id__": 69
+      },
+      {
+        "__id__": 75
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 149
+      },
+      {
+        "__id__": 151
+      },
+      {
+        "__id__": 153
+      },
+      {
+        "__id__": 155
+      }
+    ],
+    "_prefab": {
+      "__id__": 157
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bg-001",
+    "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 6
     },
@@ -472,7 +466,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "feLFboacxO6qpoQIuovuDW"
+    "fileId": "0eP1v9DONBuYNxqJ0PTIZP"
   },
   {
     "__type__": "cc.Sprite",
@@ -517,7 +511,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "27k721NS5GlKsftffq/C/X"
+    "fileId": "7aukc0VUpIF5q2ZDMH2Elw"
   },
   {
     "__type__": "cc.Widget",
@@ -553,7 +547,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "eaI0swOr9H1ahOWjkBThcn"
+    "fileId": "24u6E6qdZJRI0Y17K+Fch8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -563,7 +557,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "48mDgoEoZDD7cffiELOaDw",
+    "fileId": "0fAPKv9+hBvoyDSTXYAHFj",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -604,8 +598,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -333,
-      "y": -2.2737367544323206e-13,
+      "x": -286.101,
+      "y": 9.245000000000118,
       "z": 0
     },
     "_lrot": {
@@ -667,8 +661,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.8,
+      "y": 0.8,
       "z": 1
     },
     "_mobility": 0,
@@ -695,8 +689,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
-      "height": 300
+      "width": 491,
+      "height": 350
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -732,7 +726,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@f9941",
+      "__uuid__": "29b99357-dc16-43d8-8f03-b418669a25a0@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -836,7 +830,7 @@
       "__id__": 22
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 24
@@ -1184,8 +1178,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
-      "height": 300
+      "width": 583.8,
+      "height": 330
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1212,10 +1206,10 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": -95.5,
+    "_right": -95.5,
+    "_top": -25,
+    "_bottom": -25,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1282,8 +1276,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
-      "height": 300
+      "width": 392.8,
+      "height": 280
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1304,7 +1298,7 @@
     "node": {
       "__id__": 15
     },
-    "_enabled": true,
+    "_enabled": false,
     "__prefab": {
       "__id__": 49
     },
@@ -1326,7 +1320,7 @@
     "node": {
       "__id__": 15
     },
-    "_enabled": true,
+    "_enabled": false,
     "__prefab": {
       "__id__": 51
     },
@@ -1378,10 +1372,10 @@
     },
     "_alignFlags": 13,
     "_target": null,
-    "_left": 0,
+    "_left": 0.4989999999999952,
     "_right": 0,
-    "_top": 2.2737367544323206e-13,
-    "_bottom": -2.2737367544323206e-13,
+    "_top": 0.7549999999998818,
+    "_bottom": 19.24500000000012,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1576,7 +1570,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1792,8 +1786,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 158,
-      "height": 157
+      "width": 128,
+      "height": 128
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1834,7 +1828,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1903,7 +1897,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -159.159,
+      "x": -69.118,
       "y": 0,
       "z": 0
     },
@@ -1957,7 +1951,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 58.51800000000003,
+      "y": 60.30799999999999,
       "z": 0
     },
     "_lrot": {
@@ -1998,7 +1992,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 426.609375,
-      "height": 74.718
+      "height": 69.518
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2036,8 +2030,8 @@
     "_string": "Anaya",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 59,
+    "_actualFontSize": 47,
+    "_fontSize": 46,
     "_fontFamily": "NotoSans-Regular",
     "_lineHeight": 29.4,
     "_overflow": 2,
@@ -2158,7 +2152,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -3.102000000000089,
+      "y": 3.060999999999922,
       "z": 0
     },
     "_lrot": {
@@ -2198,7 +2192,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 426.796094,
+      "width": 360.496094,
       "height": 49.72800000000001
     },
     "_anchorPoint": {
@@ -2237,8 +2231,8 @@
     "_string": "Tag1````|Tag2---",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 27,
-    "_fontSize": 26,
+    "_actualFontSize": 37,
+    "_fontSize": 36,
     "_fontFamily": "NotoSans-Regular",
     "_lineHeight": 0,
     "_overflow": 2,
@@ -2296,8 +2290,8 @@
     "_target": null,
     "_left": 0,
     "_right": -138.69309400000003,
-    "_top": 128.23800000000008,
-    "_bottom": 122.0339999999999,
+    "_top": 122.07500000000007,
+    "_bottom": 128.19699999999992,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -2372,7 +2366,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -79.43299999999999,
+      "y": -84.76499999999987,
       "z": 0
     },
     "_lrot": {
@@ -2421,7 +2415,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 36,
+      "x": 31,
       "y": 1.1368683772161603e-13,
       "z": 0
     },
@@ -2462,8 +2456,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
-      "height": 61
+      "width": 62,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2557,7 +2551,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 114.6,
+      "x": 97.1,
       "y": 1.1368683772161603e-13,
       "z": 0
     },
@@ -2598,8 +2592,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
-      "height": 61
+      "width": 62,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2693,7 +2687,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 193.2,
+      "x": 163.2,
       "y": 1.1368683772161603e-13,
       "z": 0
     },
@@ -2734,8 +2728,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
-      "height": 61
+      "width": 62,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2829,7 +2823,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 271.8,
+      "x": 229.29999999999998,
       "y": 0,
       "z": 0
     },
@@ -2870,8 +2864,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
-      "height": 61
+      "width": 62,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2965,7 +2959,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 350.40000000000003,
+      "x": 295.4,
       "y": 1.1368683772161603e-13,
       "z": 0
     },
@@ -3006,8 +3000,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
-      "height": 61
+      "width": 62,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3092,7 +3086,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 386.4,
+      "width": 326.4,
       "height": 65.3
     },
     "_anchorPoint": {
@@ -3123,7 +3117,7 @@
     "_left": 0,
     "_right": -16.41399999999993,
     "_top": 0,
-    "_bottom": 37.91700000000001,
+    "_bottom": 32.58500000000013,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -3166,7 +3160,7 @@
     "_paddingRight": 0,
     "_paddingTop": 0,
     "_paddingBottom": 0,
-    "_spacingX": 6.6,
+    "_spacingX": 4.1,
     "_spacingY": 0,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
@@ -3221,7 +3215,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 105.19,
-      "y": -75.72299999999996,
+      "y": -77.97299999999996,
       "z": 0
     },
     "_lrot": {
@@ -3249,7 +3243,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "price",
+    "_name": "priceIcon",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -3271,7 +3265,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -105.19,
-      "y": -2.9899999999995543,
+      "y": 1.3830000000000382,
       "z": 0
     },
     "_lrot": {
@@ -3311,8 +3305,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 102,
-      "height": 89
+      "width": 85,
+      "height": 70
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3509,7 +3503,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 430.6,
+      "width": 360.8,
       "height": 300
     },
     "_anchorPoint": {
@@ -3537,7 +3531,7 @@
     },
     "_alignFlags": 13,
     "_target": null,
-    "_left": 323.841,
+    "_left": 413.882,
     "_right": 368.823,
     "_top": 0,
     "_bottom": 0,
@@ -3611,90 +3605,177 @@
     "nestedPrefabInstanceRoots": null
   },
   {
-    "__type__": "cc.Node",
-    "_name": "purchase",
+    "__type__": "cc.UITransform",
+    "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
-    "_parent": {
+    "node": {
       "__id__": 6
     },
-    "_children": [
-      {
-        "__id__": 150
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 158
-      },
-      {
-        "__id__": 160
-      },
-      {
-        "__id__": 162
-      }
-    ],
-    "_prefab": {
-      "__id__": 164
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 150
     },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 483,
-      "y": 0,
-      "z": 0
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 966,
+      "height": 300
     },
-    "_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
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
     },
     "_id": ""
   },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "feLFboacxO6qpoQIuovuDW"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 152
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "960742be-94f4-4e30-aad4-d639d616eb3e@f9941",
+      "__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": "27k721NS5GlKsftffq/C/X"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 154
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1170,
+    "_originalHeight": 283.8,
+    "_alignMode": 2,
+    "_lockFlags": 45,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "eaI0swOr9H1ahOWjkBThcn"
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 156
+    },
+    "_type": 3,
+    "_inverted": false,
+    "_segments": 64,
+    "_alphaThreshold": 0.1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "01FQeParFEXLUpuMQX7/Tj"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "48mDgoEoZDD7cffiELOaDw",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.Node",
-    "_name": "Free",
+    "_name": "FreeTag",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 149
+      "__id__": 5
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 151
+        "__id__": 159
       },
       {
-        "__id__": 153
+        "__id__": 161
       },
       {
-        "__id__": 155
+        "__id__": 163
       }
     ],
     "_prefab": {
-      "__id__": 157
+      "__id__": 165
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -695.4449999999999,
-      "y": 115.46100000000001,
+      "x": -100.38499999999999,
+      "y": 140.07500000000005,
       "z": 0
     },
     "_lrot": {
@@ -3726,11 +3807,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 158
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 152
+      "__id__": 160
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3754,11 +3835,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 158
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 154
+      "__id__": 162
     },
     "_alignFlags": 18,
     "_target": null,
@@ -3790,11 +3871,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 150
+      "__id__": 158
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 156
+      "__id__": 164
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3848,133 +3929,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 149
+      "__id__": 5
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 159
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 242.5,
-      "height": 300
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 1,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "870LQEkKNPTZqFKlOjlmCD"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 149
-    },
-    "_enabled": false,
-    "__prefab": {
-      "__id__": 161
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__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": "eddDLU1QJGh4iu9KVZ26bG"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 149
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 163
-    },
-    "_alignFlags": 37,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 500,
-    "_originalHeight": 100,
-    "_alignMode": 2,
-    "_lockFlags": 8,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0bQdDL2ORM27PDSPHUhYED"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "13YHh3A+hEvLIFENwv6VCl",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 166
+      "__id__": 167
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3992,62 +3951,17 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "89UobBMQ5LgYSB35m0Ewp7"
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 168
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "960742be-94f4-4e30-aad4-d639d616eb3e@f9941",
-      "__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": "b9wpJfOY9Ijpeq3A0trO3W"
-  },
   {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 6
+      "__id__": 5
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 170
+      "__id__": 169
     },
     "_alignFlags": 16,
     "_target": null,
@@ -4079,11 +3993,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 6
+      "__id__": 5
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 172
+      "__id__": 171
     },
     "avatar": {
       "__id__": 19
@@ -4098,7 +4012,7 @@
       "__id__": 139
     },
     "freeNode": {
-      "__id__": 150
+      "__id__": 158
     },
     "unreleaseCover": {
       "__id__": 55
@@ -4118,43 +4032,21 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "ddpkJcPOZA+bWC89Xqt+x0"
   },
-  {
-    "__type__": "cc.Mask",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 174
-    },
-    "_type": 3,
-    "_inverted": false,
-    "_segments": 64,
-    "_alphaThreshold": 0.1,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "7a0vrQrwpAjoaYm+iKsanN"
-  },
   {
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 6
+      "__id__": 5
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 176
+      "__id__": 173
     },
     "clickEvents": [
       {
-        "__id__": 177
+        "__id__": 174
       }
     ],
     "_interactable": true,
@@ -4203,7 +4095,7 @@
   {
     "__type__": "cc.ClickEvent",
     "target": {
-      "__id__": 6
+      "__id__": 5
     },
     "component": "",
     "_componentId": "6d3e03kLy5EwLqOppF+UTV7",
@@ -4223,34 +4115,94 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "view",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 4
+    },
+    "_children": [
+      {
+        "__id__": 177
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 185
+      },
+      {
+        "__id__": 187
+      },
+      {
+        "__id__": 189
+      },
+      {
+        "__id__": 191
+      }
+    ],
+    "_prefab": {
+      "__id__": 193
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.Node",
     "_name": "content",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 5
+      "__id__": 176
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 178
+      },
       {
         "__id__": 180
       },
       {
         "__id__": 182
-      },
-      {
-        "__id__": 184
       }
     ],
     "_prefab": {
-      "__id__": 186
+      "__id__": 184
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 988.903,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -4282,11 +4234,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 179
+      "__id__": 177
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 181
+      "__id__": 179
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4310,11 +4262,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 179
+      "__id__": 177
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 183
+      "__id__": 181
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -4348,11 +4300,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 179
+      "__id__": 177
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 185
+      "__id__": 183
     },
     "_alignFlags": 40,
     "_target": null,
@@ -4397,16 +4349,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 5
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 188
+      "__id__": 186
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2065.9
+      "height": 1834.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4425,11 +4377,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 5
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 190
+      "__id__": 188
     },
     "_type": 0,
     "_inverted": false,
@@ -4447,11 +4399,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 5
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 192
+      "__id__": 190
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4493,11 +4445,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 5
+      "__id__": 176
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 194
+      "__id__": 192
     },
     "_alignFlags": 45,
     "_target": null,
@@ -4546,12 +4498,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 197
+      "__id__": 195
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 2065.9
+      "height": 1834.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4574,7 +4526,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 199
+      "__id__": 197
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4619,7 +4571,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 201
+      "__id__": 199
     },
     "bounceDuration": 0.23,
     "brake": 0.75,
@@ -4630,7 +4582,7 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 179
+      "__id__": 177
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": null,
@@ -4650,14 +4602,14 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 203
+      "__id__": 201
     },
     "_alignFlags": 45,
     "_target": null,
     "_left": 0,
     "_right": 0,
     "_top": 24.1,
-    "_bottom": 0,
+    "_bottom": 231.5,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -4699,7 +4651,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 206
+      "__id__": 204
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4727,7 +4679,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 208
+      "__id__": 206
     },
     "_alignFlags": 45,
     "_target": null,
@@ -4763,7 +4715,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 210
+      "__id__": 208
     },
     "_type": 0,
     "_inverted": false,
@@ -4785,7 +4737,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 212
+      "__id__": 210
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4844,26 +4796,26 @@
     },
     "_children": [
       {
-        "__id__": 215
+        "__id__": 213
       },
       {
-        "__id__": 230
+        "__id__": 228
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 238
+      },
       {
         "__id__": 240
       },
       {
         "__id__": 242
-      },
-      {
-        "__id__": 244
       }
     ],
     "_prefab": {
-      "__id__": 246
+      "__id__": 244
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4900,27 +4852,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 214
+      "__id__": 212
     },
     "_children": [
       {
-        "__id__": 216
+        "__id__": 214
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 220
+      },
       {
         "__id__": 222
       },
       {
-        "__id__": 224
-      },
-      {
-        "__id__": 227
+        "__id__": 225
       }
     ],
     "_prefab": {
-      "__id__": 229
+      "__id__": 227
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4957,20 +4909,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 215
+      "__id__": 213
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 217
+        "__id__": 215
       },
       {
-        "__id__": 219
+        "__id__": 217
       }
     ],
     "_prefab": {
-      "__id__": 221
+      "__id__": 219
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5007,11 +4959,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 216
+      "__id__": 214
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 218
+      "__id__": 216
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5035,11 +4987,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 216
+      "__id__": 214
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 220
+      "__id__": 218
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5093,11 +5045,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 215
+      "__id__": 213
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 223
+      "__id__": 221
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5121,15 +5073,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 215
+      "__id__": 213
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 225
+      "__id__": 223
     },
     "clickEvents": [
       {
-        "__id__": 226
+        "__id__": 224
       }
     ],
     "_interactable": true,
@@ -5169,7 +5121,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 215
+      "__id__": 213
     },
     "_id": ""
   },
@@ -5193,11 +5145,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 215
+      "__id__": 213
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 228
+      "__id__": 226
     },
     "_alignFlags": 10,
     "_target": null,
@@ -5242,11 +5194,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 214
+      "__id__": 212
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 229
+      },
       {
         "__id__": 231
       },
@@ -5255,13 +5210,10 @@
       },
       {
         "__id__": 235
-      },
-      {
-        "__id__": 237
       }
     ],
     "_prefab": {
-      "__id__": 239
+      "__id__": 237
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5298,11 +5250,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 230
+      "__id__": 228
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 232
+      "__id__": 230
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5326,11 +5278,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 230
+      "__id__": 228
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 234
+      "__id__": 232
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5397,11 +5349,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 230
+      "__id__": 228
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 236
+      "__id__": 234
     },
     "_alignFlags": 18,
     "_target": null,
@@ -5433,11 +5385,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 230
+      "__id__": 228
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 238
+      "__id__": 236
     },
     "languageKey": "girllistpanel.title",
     "defaultText": "",
@@ -5467,11 +5419,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 214
+      "__id__": 212
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 241
+      "__id__": 239
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5495,11 +5447,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 214
+      "__id__": 212
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 243
+      "__id__": 241
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5540,11 +5492,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 214
+      "__id__": 212
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 245
+      "__id__": 243
     },
     "_alignFlags": 41,
     "_target": null,
@@ -5593,7 +5545,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 248
+      "__id__": 246
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5621,7 +5573,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 250
+      "__id__": 248
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5666,7 +5618,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 252
+      "__id__": 250
     },
     "_alignFlags": 45,
     "_target": null,
@@ -5715,7 +5667,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 255
+      "__id__": 253
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5743,7 +5695,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 257
+      "__id__": 255
     },
     "_alignFlags": 45,
     "_target": null,
@@ -5779,7 +5731,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 259
+      "__id__": 257
     },
     "m_rootNode": null,
     "_id": ""
@@ -5798,7 +5750,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 261
+      "__id__": 259
     },
     "_id": ""
   },
diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab
index bb7c84b1..75944ae1 100644
--- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab
+++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab
@@ -28,20 +28,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 140
+        "__id__": 132
       },
       {
-        "__id__": 142
+        "__id__": 134
       },
       {
-        "__id__": 144
+        "__id__": 136
       },
       {
-        "__id__": 146
+        "__id__": 138
       }
     ],
     "_prefab": {
-      "__id__": 148
+      "__id__": 140
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -284,29 +284,26 @@
         "__id__": 27
       },
       {
-        "__id__": 35
+        "__id__": 33
       },
       {
-        "__id__": 41
-      },
-      {
-        "__id__": 123
+        "__id__": 115
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 133
+        "__id__": 125
       },
       {
-        "__id__": 135
+        "__id__": 127
       },
       {
-        "__id__": 137
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 139
+      "__id__": 131
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -642,7 +639,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "mask-001",
+    "_name": "mask",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -656,18 +653,15 @@
       },
       {
         "__id__": 30
-      },
-      {
-        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -488.63699999999994,
+      "y": -639.5,
       "z": 0
     },
     "_lrot": {
@@ -708,185 +702,13 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 865,
-      "height": 300
+      "height": 418
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b4beLpRmBJoZul7mbMZmoW"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 27
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 31
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 138,
-      "g": 117,
-      "b": 155,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__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": "a5jwiVnjFKb6MoTbVhfSFf"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 27
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 33
-    },
-    "_alignFlags": 40,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 2,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9dqKyPqUVC0KCMUd/XhYKJ"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "b5M32lygRAVYhjZDZ33VTf",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "mask",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 36
-      },
-      {
-        "__id__": 38
-      }
-    ],
-    "_prefab": {
-      "__id__": 40
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -347.212,
-      "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__": 35
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 37
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 865,
-      "height": 256
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
     "_id": ""
   },
   {
@@ -899,11 +721,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -960,6 +782,9 @@
       "__id__": 12
     },
     "_children": [
+      {
+        "__id__": 34
+      },
       {
         "__id__": 42
       },
@@ -967,26 +792,23 @@
         "__id__": 50
       },
       {
-        "__id__": 58
-      },
-      {
-        "__id__": 96
+        "__id__": 88
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 108
       },
       {
-        "__id__": 118
+        "__id__": 110
       },
       {
-        "__id__": 120
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 122
+      "__id__": 114
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1023,28 +845,28 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 35
       },
       {
-        "__id__": 45
+        "__id__": 37
       },
       {
-        "__id__": 47
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 41
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -282.803,
-      "y": 152.789,
+      "y": 110.03599999999994,
       "z": 0
     },
     "_lrot": {
@@ -1076,11 +898,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1104,11 +926,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1123,8 +945,8 @@
     "_string": "Anaya",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 61,
-    "_fontSize": 60,
+    "_actualFontSize": 79,
+    "_fontSize": 78,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
@@ -1175,17 +997,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 40
     },
     "_alignFlags": 9,
     "_target": null,
     "_left": 31.933523500000007,
     "_right": 0,
-    "_top": 12.111000000000022,
+    "_top": 54.86400000000006,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -1224,28 +1046,28 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 43
       },
       {
-        "__id__": 53
+        "__id__": 45
       },
       {
-        "__id__": 55
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 279.134,
-      "y": 125.30999999999995,
+      "x": 188.31899999999996,
+      "y": 108.42700000000002,
       "z": 0
     },
     "_lrot": {
@@ -1277,15 +1099,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 42
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 44
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 201.534375,
+      "width": 414.234375,
       "height": 83.6
     },
     "_anchorPoint": {
@@ -1305,11 +1127,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 42
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 46
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1324,8 +1146,8 @@
     "_string": "Tag1|Tag2",
     "_horizontalAlign": 2,
     "_verticalAlign": 0,
-    "_actualFontSize": 33,
-    "_fontSize": 32,
+    "_actualFontSize": 51,
+    "_fontSize": 50,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
@@ -1376,17 +1198,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 42
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 48
     },
-    "_alignFlags": 9,
+    "_alignFlags": 33,
     "_target": null,
-    "_left": 610.8668125,
-    "_right": 0,
-    "_top": 43.39000000000007,
+    "_left": 553.9668125000001,
+    "_right": 37.06381250000004,
+    "_top": 60.272999999999996,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -1415,8 +1237,6 @@
       "__id__": 0
     },
     "fileId": "0b9T5k+FhPU7yu97KcrYjE",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1425,39 +1245,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 59
+        "__id__": 51
       },
       {
-        "__id__": 65
+        "__id__": 57
       },
       {
-        "__id__": 71
+        "__id__": 63
       },
       {
-        "__id__": 77
+        "__id__": 69
       },
       {
-        "__id__": 83
+        "__id__": 75
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 81
       },
       {
-        "__id__": 91
+        "__id__": 83
       },
       {
-        "__id__": 93
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 87
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1494,20 +1314,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 52
       },
       {
-        "__id__": 62
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1544,11 +1364,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1572,11 +1392,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 55
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1630,20 +1450,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 58
       },
       {
-        "__id__": 68
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1680,11 +1500,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1708,11 +1528,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 61
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1766,20 +1586,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 64
       },
       {
-        "__id__": 74
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1816,11 +1636,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1844,11 +1664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 67
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1902,20 +1722,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 70
       },
       {
-        "__id__": 80
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1952,11 +1772,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1980,11 +1800,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2038,20 +1858,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 76
       },
       {
-        "__id__": 86
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2088,11 +1908,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 83
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 77
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2116,11 +1936,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 83
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 79
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2174,11 +1994,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 82
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2202,11 +2022,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 84
     },
     "_alignFlags": 8,
     "_target": null,
@@ -2238,11 +2058,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 50
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 94
+      "__id__": 86
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2289,24 +2109,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 41
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 97
+        "__id__": 89
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 111
+        "__id__": 103
       },
       {
-        "__id__": 113
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 107
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2343,24 +2163,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 96
+      "__id__": 88
     },
     "_children": [
       {
-        "__id__": 98
+        "__id__": 90
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 98
       },
       {
-        "__id__": 108
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2397,23 +2217,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 97
+      "__id__": 89
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 91
       },
       {
-        "__id__": 101
+        "__id__": 93
       },
       {
-        "__id__": 103
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 97
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2450,11 +2270,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 98
+      "__id__": 90
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2478,11 +2298,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 98
+      "__id__": 90
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 94
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2500,7 +2320,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2523,11 +2343,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 98
+      "__id__": 90
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 104
+      "__id__": 96
     },
     "_alignFlags": 8,
     "_target": null,
@@ -2572,11 +2392,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 97
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 99
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2600,11 +2420,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 97
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 101
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2684,11 +2504,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 112
+      "__id__": 104
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2712,11 +2532,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 96
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 114
+      "__id__": 106
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2770,11 +2590,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
+      "__id__": 109
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2798,11 +2618,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 119
+      "__id__": 111
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2843,11 +2663,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 121
+      "__id__": 113
     },
     "_alignFlags": 4,
     "_target": null,
@@ -2898,25 +2718,25 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 124
+        "__id__": 116
       },
       {
-        "__id__": 126
+        "__id__": 118
       },
       {
-        "__id__": 128
+        "__id__": 120
       },
       {
-        "__id__": 130
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 132
+      "__id__": 124
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 364.5,
-      "y": 571.5,
+      "x": 342.19899999999996,
+      "y": 551.768,
       "z": 0
     },
     "_lrot": {
@@ -2948,11 +2768,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 123
+      "__id__": 115
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 125
+      "__id__": 117
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2976,11 +2796,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 123
+      "__id__": 115
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 127
+      "__id__": 119
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3021,11 +2841,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 123
+      "__id__": 115
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 129
+      "__id__": 121
     },
     "clickEvents": [],
     "_interactable": true,
@@ -3077,7 +2897,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 123
+      "__id__": 115
     },
     "_id": ""
   },
@@ -3091,17 +2911,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 123
+      "__id__": 115
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 131
+      "__id__": 123
     },
     "_alignFlags": 33,
     "_target": null,
     "_left": 0,
-    "_right": 40,
-    "_top": 40,
+    "_right": 62.301000000000045,
+    "_top": 59.73199999999997,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -3144,7 +2964,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 134
+      "__id__": 126
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3172,7 +2992,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 136
+      "__id__": 128
     },
     "_type": 3,
     "_inverted": false,
@@ -3194,7 +3014,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 138
+      "__id__": 130
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3252,7 +3072,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 141
+      "__id__": 133
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3280,7 +3100,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 143
+      "__id__": 135
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3325,7 +3145,7 @@
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 145
+      "__id__": 137
     },
     "_type": 3,
     "_inverted": false,
@@ -3347,7 +3167,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 147
+      "__id__": 139
     },
     "m_rootNode": null,
     "_id": ""
diff --git a/assets/bundles/Chat18x/PersonalPanel.prefab b/assets/bundles/Chat18x/PersonalPanel.prefab
index 768210a7..33603970 100644
--- a/assets/bundles/Chat18x/PersonalPanel.prefab
+++ b/assets/bundles/Chat18x/PersonalPanel.prefab
@@ -107,8 +107,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 397.01800000000003,
-      "y": 979.382,
+      "x": 419.24300000000005,
+      "y": 982.9560000000001,
       "z": 0
     },
     "_lrot": {
@@ -3888,7 +3888,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -28.063000000000102,
-      "y": 2.3390000000000555,
+      "y": -4.808999999999742,
       "z": 0
     },
     "_lrot": {
@@ -3928,7 +3928,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 246.05859375,
+      "width": 232.13671875,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -3973,8 +3973,11 @@
     "_lineHeight": 40,
     "_overflow": 0,
     "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
+    "_font": {
+      "__uuid__": "52af39e6-df78-413a-88bb-72dfdca7ec84",
+      "__expectedType__": "cc.TTFFont"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
     "_isBold": true,
@@ -4133,7 +4136,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -190.598,
-      "y": 0.0009999999999763531,
+      "y": -10.721000000000004,
       "z": 0
     },
     "_lrot": {
@@ -5393,7 +5396,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 110.265625,
+      "width": 128,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -5429,7 +5432,7 @@
       "b": 177,
       "a": 255
     },
-    "_string": "Gift box",
+    "_string": "敬请期待",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 32,
@@ -5604,7 +5607,7 @@
         "__id__": 239
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 245
@@ -6196,7 +6199,7 @@
         "__id__": 263
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 269
@@ -6788,7 +6791,7 @@
         "__id__": 287
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 293
@@ -7380,7 +7383,7 @@
         "__id__": 311
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 317
@@ -7394,8 +7397,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -358.6,
-      "y": -135.75000000000003,
+      "x": -121.80000000000001,
+      "y": 113.14999999999999,
       "z": 0
     },
     "_lrot": {
@@ -7972,7 +7975,7 @@
         "__id__": 335
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 341
@@ -7986,8 +7989,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -121.80000000000001,
-      "y": -135.75000000000003,
+      "x": 115,
+      "y": 113.14999999999999,
       "z": 0
     },
     "_lrot": {
@@ -8855,13 +8858,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 46,
-      "g": 28,
-      "b": 57,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__uuid__": "c70aaaff-69dc-4c52-a6dd-d22f641cef80@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
diff --git a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab
index c59f6b5d..cbff7fbd 100644
--- a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab
+++ b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab
@@ -626,7 +626,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1134,7 +1134,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab
index 0835a9cf..17e8d26e 100644
--- a/assets/bundles/Chat18x/ThemePanel.prefab
+++ b/assets/bundles/Chat18x/ThemePanel.prefab
@@ -1971,8 +1971,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 29.928999999999974,
-      "y": -302.37300000000005,
+      "x": -120.06799999999998,
+      "y": -319.047,
       "z": 0
     },
     "_lrot": {
@@ -2012,7 +2012,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 340.171,
+      "width": 578.871,
       "height": 66.501
     },
     "_anchorPoint": {
diff --git a/assets/bundles/Chat18x/Web3PopPanel.prefab b/assets/bundles/Chat18x/Web3PopPanel.prefab
index d90d6e9a..a3b48ffc 100644
--- a/assets/bundles/Chat18x/Web3PopPanel.prefab
+++ b/assets/bundles/Chat18x/Web3PopPanel.prefab
@@ -5494,6 +5494,7 @@
       "__id__": 0
     },
     "fileId": "e6pU+M6i9MErSV0E0QWx3B",
+    "instance": null,
     "targetOverrides": null
   }
 ]
\ No newline at end of file
diff --git a/assets/resources/test/10002_9.png b/assets/resources/test/10002_9.png
new file mode 100644
index 00000000..f1c302ed
Binary files /dev/null and b/assets/resources/test/10002_9.png differ
diff --git a/assets/resources/test/10002_9.png.meta b/assets/resources/test/10002_9.png.meta
new file mode 100644
index 00000000..a09945bd
--- /dev/null
+++ b/assets/resources/test/10002_9.png.meta
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6@6c48a",
+      "displayName": "10002_9",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6@f9941",
+      "displayName": "10002_9",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 865,
+        "height": 1116,
+        "rawWidth": 865,
+        "rawHeight": 1116,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -432.5,
+            -558,
+            0,
+            432.5,
+            -558,
+            0,
+            -432.5,
+            558,
+            0,
+            432.5,
+            558,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1116,
+            865,
+            1116,
+            0,
+            0,
+            865,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -432.5,
+            -558,
+            0
+          ],
+          "maxPos": [
+            432.5,
+            558,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "beb68f5d-4d62-43d9-90dc-58a84f71a2c6@6c48a"
+  }
+}
diff --git a/assets/resources/test/组 1 拷贝.png b/assets/resources/test/组 1 拷贝.png
new file mode 100644
index 00000000..5a4b30fc
Binary files /dev/null and b/assets/resources/test/组 1 拷贝.png differ
diff --git a/assets/resources/test/组 1 拷贝.png.meta b/assets/resources/test/组 1 拷贝.png.meta
new file mode 100644
index 00000000..d480674c
--- /dev/null
+++ b/assets/resources/test/组 1 拷贝.png.meta	
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "29b99357-dc16-43d8-8f03-b418669a25a0",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "29b99357-dc16-43d8-8f03-b418669a25a0@6c48a",
+      "displayName": "组 1 拷贝",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "29b99357-dc16-43d8-8f03-b418669a25a0",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "29b99357-dc16-43d8-8f03-b418669a25a0@f9941",
+      "displayName": "组 1 拷贝",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 491,
+        "height": 350,
+        "rawWidth": 491,
+        "rawHeight": 350,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -245.5,
+            -175,
+            0,
+            245.5,
+            -175,
+            0,
+            -245.5,
+            175,
+            0,
+            245.5,
+            175,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            350,
+            491,
+            350,
+            0,
+            0,
+            491,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -245.5,
+            -175,
+            0
+          ],
+          "maxPos": [
+            245.5,
+            175,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "29b99357-dc16-43d8-8f03-b418669a25a0@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "29b99357-dc16-43d8-8f03-b418669a25a0@6c48a"
+  }
+}
diff --git a/assets/resources/ui/chat/多边形 1 拷贝 2.png b/assets/resources/ui/chat/多边形 1 拷贝 2.png
index 5a1b05e6..4e783979 100644
Binary files a/assets/resources/ui/chat/多边形 1 拷贝 2.png and b/assets/resources/ui/chat/多边形 1 拷贝 2.png differ
diff --git a/assets/resources/ui/chat/多边形 1 拷贝 2.png.meta b/assets/resources/ui/chat/多边形 1 拷贝 2.png.meta
index 6f80f6a3..62eb719a 100644
--- a/assets/resources/ui/chat/多边形 1 拷贝 2.png.meta	
+++ b/assets/resources/ui/chat/多边形 1 拷贝 2.png.meta	
@@ -47,13 +47,13 @@
         "trimX": 0,
         "trimY": 0,
         "width": 751,
-        "height": 123,
+        "height": 153,
         "rawWidth": 751,
-        "rawHeight": 123,
+        "rawHeight": 153,
         "borderTop": 66,
-        "borderBottom": 27,
-        "borderLeft": 23,
-        "borderRight": 46,
+        "borderBottom": 50,
+        "borderLeft": 55,
+        "borderRight": 55,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -375.5,
-            -61.5,
+            -76.5,
             0,
             375.5,
-            -61.5,
+            -76.5,
             0,
             -375.5,
-            61.5,
+            76.5,
             0,
             375.5,
-            61.5,
+            76.5,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            123,
+            153,
             751,
-            123,
+            153,
             0,
             0,
             751,
@@ -104,12 +104,12 @@
           ],
           "minPos": [
             -375.5,
-            -61.5,
+            -76.5,
             0
           ],
           "maxPos": [
             375.5,
-            61.5,
+            76.5,
             0
           ]
         },
diff --git a/assets/resources/ui/chat/多边形 1 拷贝 3.png b/assets/resources/ui/chat/多边形 1 拷贝 3.png
index 2afc37f0..df3bc5c7 100644
Binary files a/assets/resources/ui/chat/多边形 1 拷贝 3.png and b/assets/resources/ui/chat/多边形 1 拷贝 3.png differ
diff --git a/assets/resources/ui/chat/多边形 1 拷贝 3.png.meta b/assets/resources/ui/chat/多边形 1 拷贝 3.png.meta
index f18e6520..99e10311 100644
--- a/assets/resources/ui/chat/多边形 1 拷贝 3.png.meta	
+++ b/assets/resources/ui/chat/多边形 1 拷贝 3.png.meta	
@@ -47,13 +47,13 @@
         "trimX": 0,
         "trimY": 0,
         "width": 751,
-        "height": 123,
+        "height": 157,
         "rawWidth": 751,
-        "rawHeight": 123,
-        "borderTop": 69,
-        "borderBottom": 32,
-        "borderLeft": 50,
-        "borderRight": 38,
+        "rawHeight": 157,
+        "borderTop": 66,
+        "borderBottom": 50,
+        "borderLeft": 55,
+        "borderRight": 55,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -375.5,
-            -61.5,
+            -78.5,
             0,
             375.5,
-            -61.5,
+            -78.5,
             0,
             -375.5,
-            61.5,
+            78.5,
             0,
             375.5,
-            61.5,
+            78.5,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            123,
+            157,
             751,
-            123,
+            157,
             0,
             0,
             751,
@@ -104,12 +104,12 @@
           ],
           "minPos": [
             -375.5,
-            -61.5,
+            -78.5,
             0
           ],
           "maxPos": [
             375.5,
-            61.5,
+            78.5,
             0
           ]
         },
diff --git a/assets/resources/ui/chat/矩形 13-1.png b/assets/resources/ui/chat/矩形 13-1.png
index 56a495f1..13d045f4 100644
Binary files a/assets/resources/ui/chat/矩形 13-1.png and b/assets/resources/ui/chat/矩形 13-1.png differ
diff --git a/assets/resources/ui/chat/矩形 13.png b/assets/resources/ui/chat/矩形 13.png
index 3d0a3f2d..559e44e5 100644
Binary files a/assets/resources/ui/chat/矩形 13.png and b/assets/resources/ui/chat/矩形 13.png differ
diff --git a/assets/resources/ui/chat/矩形 8 拷贝 2.png b/assets/resources/ui/chat/矩形 8 拷贝 2.png
new file mode 100644
index 00000000..3f0de897
Binary files /dev/null and b/assets/resources/ui/chat/矩形 8 拷贝 2.png differ
diff --git a/assets/resources/ui/chat/矩形 8 拷贝 2.png.meta b/assets/resources/ui/chat/矩形 8 拷贝 2.png.meta
new file mode 100644
index 00000000..8cba734c
--- /dev/null
+++ b/assets/resources/ui/chat/矩形 8 拷贝 2.png.meta	
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "656d9da9-1a0a-4bd9-949a-8562056efdc9",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "656d9da9-1a0a-4bd9-949a-8562056efdc9@6c48a",
+      "displayName": "矩形 8 拷贝 2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "656d9da9-1a0a-4bd9-949a-8562056efdc9",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "656d9da9-1a0a-4bd9-949a-8562056efdc9@f9941",
+      "displayName": "矩形 8 拷贝 2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 281,
+        "height": 125,
+        "rawWidth": 281,
+        "rawHeight": 125,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -140.5,
+            -62.5,
+            0,
+            140.5,
+            -62.5,
+            0,
+            -140.5,
+            62.5,
+            0,
+            140.5,
+            62.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            125,
+            281,
+            125,
+            0,
+            0,
+            281,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -140.5,
+            -62.5,
+            0
+          ],
+          "maxPos": [
+            140.5,
+            62.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "656d9da9-1a0a-4bd9-949a-8562056efdc9@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "656d9da9-1a0a-4bd9-949a-8562056efdc9@6c48a"
+  }
+}
diff --git a/assets/resources/ui/chat/矩形 8 拷贝 4.png b/assets/resources/ui/chat/矩形 8 拷贝 4.png
index 308fff95..edd2c964 100644
Binary files a/assets/resources/ui/chat/矩形 8 拷贝 4.png and b/assets/resources/ui/chat/矩形 8 拷贝 4.png differ
diff --git a/assets/resources/ui/chat/矩形 8 拷贝 4.png.meta b/assets/resources/ui/chat/矩形 8 拷贝 4.png.meta
index def1b2c1..91cac46e 100644
--- a/assets/resources/ui/chat/矩形 8 拷贝 4.png.meta	
+++ b/assets/resources/ui/chat/矩形 8 拷贝 4.png.meta	
@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 125,
+        "width": 622,
         "height": 125,
-        "rawWidth": 125,
+        "rawWidth": 622,
         "rawHeight": 125,
         "borderTop": 33,
         "borderBottom": 33,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -62.5,
+            -311,
             -62.5,
             0,
-            62.5,
+            311,
             -62.5,
             0,
-            -62.5,
+            -311,
             62.5,
             0,
-            62.5,
+            311,
             62.5,
             0
           ],
@@ -85,11 +85,11 @@
           "uv": [
             0,
             125,
-            125,
+            622,
             125,
             0,
             0,
-            125,
+            622,
             0
           ],
           "nuv": [
@@ -103,12 +103,12 @@
             1
           ],
           "minPos": [
-            -62.5,
+            -311,
             -62.5,
             0
           ],
           "maxPos": [
-            62.5,
+            311,
             62.5,
             0
           ]
diff --git a/assets/resources/ui/chat/矩形 8 拷贝 5.png b/assets/resources/ui/chat/矩形 8 拷贝 5.png
index 4ad3606c..781faaed 100644
Binary files a/assets/resources/ui/chat/矩形 8 拷贝 5.png and b/assets/resources/ui/chat/矩形 8 拷贝 5.png differ
diff --git a/assets/resources/ui/chat/矩形 8 拷贝 5.png.meta b/assets/resources/ui/chat/矩形 8 拷贝 5.png.meta
index 2d71e5ff..1208bb83 100644
--- a/assets/resources/ui/chat/矩形 8 拷贝 5.png.meta	
+++ b/assets/resources/ui/chat/矩形 8 拷贝 5.png.meta	
@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 189,
+        "width": 988,
         "height": 189,
-        "rawWidth": 189,
+        "rawWidth": 988,
         "rawHeight": 189,
         "borderTop": 34,
         "borderBottom": 34,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -94.5,
+            -494,
             -94.5,
             0,
-            94.5,
+            494,
             -94.5,
             0,
-            -94.5,
+            -494,
             94.5,
             0,
-            94.5,
+            494,
             94.5,
             0
           ],
@@ -85,11 +85,11 @@
           "uv": [
             0,
             189,
-            189,
+            988,
             189,
             0,
             0,
-            189,
+            988,
             0
           ],
           "nuv": [
@@ -103,12 +103,12 @@
             1
           ],
           "minPos": [
-            -94.5,
+            -494,
             -94.5,
             0
           ],
           "maxPos": [
-            94.5,
+            494,
             94.5,
             0
           ]
diff --git a/assets/resources/ui/common/heart.png b/assets/resources/ui/common/heart.png
index a5a0784f..1ec2be88 100644
Binary files a/assets/resources/ui/common/heart.png and b/assets/resources/ui/common/heart.png differ
diff --git a/assets/resources/ui/common/heart.png.meta b/assets/resources/ui/common/heart.png.meta
index 3d7fd587..8f11b39f 100644
--- a/assets/resources/ui/common/heart.png.meta
+++ b/assets/resources/ui/common/heart.png.meta
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 72,
-        "height": 61,
-        "rawWidth": 72,
-        "rawHeight": 61,
+        "width": 62,
+        "height": 54,
+        "rawWidth": 62,
+        "rawHeight": 54,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -36,
-            -30.5,
+            -31,
+            -27,
             0,
-            36,
-            -30.5,
+            31,
+            -27,
             0,
-            -36,
-            30.5,
+            -31,
+            27,
             0,
-            36,
-            30.5,
+            31,
+            27,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            61,
-            72,
-            61,
+            54,
+            62,
+            54,
             0,
             0,
-            72,
+            62,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -36,
-            -30.5,
+            -31,
+            -27,
             0
           ],
           "maxPos": [
-            36,
-            30.5,
+            31,
+            27,
             0
           ]
         },
diff --git a/assets/resources/ui/common/heart_empty.png b/assets/resources/ui/common/heart_empty.png
index 13a69372..4f56fca0 100644
Binary files a/assets/resources/ui/common/heart_empty.png and b/assets/resources/ui/common/heart_empty.png differ
diff --git a/assets/resources/ui/common/heart_empty.png.meta b/assets/resources/ui/common/heart_empty.png.meta
index b474d8d6..41a1026e 100644
--- a/assets/resources/ui/common/heart_empty.png.meta
+++ b/assets/resources/ui/common/heart_empty.png.meta
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 72,
-        "height": 61,
-        "rawWidth": 72,
-        "rawHeight": 61,
+        "width": 62,
+        "height": 54,
+        "rawWidth": 62,
+        "rawHeight": 54,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -36,
-            -30.5,
+            -31,
+            -27,
             0,
-            36,
-            -30.5,
+            31,
+            -27,
             0,
-            -36,
-            30.5,
+            -31,
+            27,
             0,
-            36,
-            30.5,
+            31,
+            27,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            61,
-            72,
-            61,
+            54,
+            62,
+            54,
             0,
             0,
-            72,
+            62,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -36,
-            -30.5,
+            -31,
+            -27,
             0
           ],
           "maxPos": [
-            36,
-            30.5,
+            31,
+            27,
             0
           ]
         },
diff --git a/assets/resources/ui/common/图层 43.png b/assets/resources/ui/common/图层 43.png
index 7126ae8b..0ca5c0be 100644
Binary files a/assets/resources/ui/common/图层 43.png and b/assets/resources/ui/common/图层 43.png differ
diff --git a/assets/resources/ui/common/图层 43.png.meta b/assets/resources/ui/common/图层 43.png.meta
index c45adfb6..dd066155 100644
--- a/assets/resources/ui/common/图层 43.png.meta	
+++ b/assets/resources/ui/common/图层 43.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 102,
-        "height": 89,
-        "rawWidth": 102,
-        "rawHeight": 89,
+        "width": 91,
+        "height": 74,
+        "rawWidth": 91,
+        "rawHeight": 74,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -51,
-            -44.5,
+            -45.5,
+            -37,
             0,
-            51,
-            -44.5,
+            45.5,
+            -37,
             0,
-            -51,
-            44.5,
+            -45.5,
+            37,
             0,
-            51,
-            44.5,
+            45.5,
+            37,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            89,
-            102,
-            89,
+            74,
+            91,
+            74,
             0,
             0,
-            102,
+            91,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -51,
-            -44.5,
+            -45.5,
+            -37,
             0
           ],
           "maxPos": [
-            51,
-            44.5,
+            45.5,
+            37,
             0
           ]
         },
diff --git a/assets/resources/ui/common/组 13 拷贝.png b/assets/resources/ui/common/组 13 拷贝.png
new file mode 100644
index 00000000..504bac4a
Binary files /dev/null and b/assets/resources/ui/common/组 13 拷贝.png differ
diff --git a/assets/resources/ui/common/组 13 拷贝.png.meta b/assets/resources/ui/common/组 13 拷贝.png.meta
new file mode 100644
index 00000000..ff28de60
--- /dev/null
+++ b/assets/resources/ui/common/组 13 拷贝.png.meta	
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "af25f38e-1f30-4f4c-9b4f-47e81a4bf828",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "af25f38e-1f30-4f4c-9b4f-47e81a4bf828@6c48a",
+      "displayName": "组 13 拷贝",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "af25f38e-1f30-4f4c-9b4f-47e81a4bf828",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "af25f38e-1f30-4f4c-9b4f-47e81a4bf828@f9941",
+      "displayName": "组 13 拷贝",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 89,
+        "height": 109,
+        "rawWidth": 89,
+        "rawHeight": 109,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -44.5,
+            -54.5,
+            0,
+            44.5,
+            -54.5,
+            0,
+            -44.5,
+            54.5,
+            0,
+            44.5,
+            54.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            109,
+            89,
+            109,
+            0,
+            0,
+            89,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -44.5,
+            -54.5,
+            0
+          ],
+          "maxPos": [
+            44.5,
+            54.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "af25f38e-1f30-4f4c-9b4f-47e81a4bf828@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "af25f38e-1f30-4f4c-9b4f-47e81a4bf828@6c48a"
+  }
+}
diff --git a/assets/resources/ui/common/遮罩.png b/assets/resources/ui/common/遮罩.png
index e8e2c20f..127bd2f7 100644
Binary files a/assets/resources/ui/common/遮罩.png and b/assets/resources/ui/common/遮罩.png differ
diff --git a/assets/resources/ui/common/遮罩.png.meta b/assets/resources/ui/common/遮罩.png.meta
index 7aca21e1..00b5171b 100644
--- a/assets/resources/ui/common/遮罩.png.meta
+++ b/assets/resources/ui/common/遮罩.png.meta
@@ -47,9 +47,9 @@
         "trimX": 0,
         "trimY": 0,
         "width": 865,
-        "height": 256,
+        "height": 418,
         "rawWidth": 865,
-        "rawHeight": 256,
+        "rawHeight": 418,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -432.5,
-            -128,
+            -209,
             0,
             432.5,
-            -128,
+            -209,
             0,
             -432.5,
-            128,
+            209,
             0,
             432.5,
-            128,
+            209,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            256,
+            418,
             865,
-            256,
+            418,
             0,
             0,
             865,
@@ -104,12 +104,12 @@
           ],
           "minPos": [
             -432.5,
-            -128,
+            -209,
             0
           ],
           "maxPos": [
             432.5,
-            128,
+            209,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/w_录像 拷贝.png b/assets/resources/ui/girl_detail/w_录像 拷贝.png
index e98896c4..8d7703ec 100644
Binary files a/assets/resources/ui/girl_detail/w_录像 拷贝.png and b/assets/resources/ui/girl_detail/w_录像 拷贝.png differ
diff --git a/assets/resources/ui/girl_detail/w_录像 拷贝.png.meta b/assets/resources/ui/girl_detail/w_录像 拷贝.png.meta
index 215e2b66..c0d7e158 100644
--- a/assets/resources/ui/girl_detail/w_录像 拷贝.png.meta	
+++ b/assets/resources/ui/girl_detail/w_录像 拷贝.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 110,
-        "height": 68,
-        "rawWidth": 110,
-        "rawHeight": 68,
+        "width": 88,
+        "height": 55,
+        "rawWidth": 88,
+        "rawHeight": 55,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -55,
-            -34,
+            -44,
+            -27.5,
             0,
-            55,
-            -34,
+            44,
+            -27.5,
             0,
-            -55,
-            34,
+            -44,
+            27.5,
             0,
-            55,
-            34,
+            44,
+            27.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            68,
-            110,
-            68,
+            55,
+            88,
+            55,
             0,
             0,
-            110,
+            88,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -55,
-            -34,
+            -44,
+            -27.5,
             0
           ],
           "maxPos": [
-            55,
-            34,
+            44,
+            27.5,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/w_录像.png b/assets/resources/ui/girl_detail/w_录像.png
index fb5f65d9..1312bd69 100644
Binary files a/assets/resources/ui/girl_detail/w_录像.png and b/assets/resources/ui/girl_detail/w_录像.png differ
diff --git a/assets/resources/ui/girl_detail/w_录像.png.meta b/assets/resources/ui/girl_detail/w_录像.png.meta
index acdc7fa5..4f3506f6 100644
--- a/assets/resources/ui/girl_detail/w_录像.png.meta
+++ b/assets/resources/ui/girl_detail/w_录像.png.meta
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 110,
-        "height": 68,
-        "rawWidth": 110,
-        "rawHeight": 68,
+        "width": 88,
+        "height": 55,
+        "rawWidth": 88,
+        "rawHeight": 55,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -55,
-            -34,
+            -44,
+            -27.5,
             0,
-            55,
-            -34,
+            44,
+            -27.5,
             0,
-            -55,
-            34,
+            -44,
+            27.5,
             0,
-            55,
-            34,
+            44,
+            27.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            68,
-            110,
-            68,
+            55,
+            88,
+            55,
             0,
             0,
-            110,
+            88,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -55,
-            -34,
+            -44,
+            -27.5,
             0
           ],
           "maxPos": [
-            55,
-            34,
+            44,
+            27.5,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/图片3 拷贝 2.png b/assets/resources/ui/girl_detail/图片3 拷贝 2.png
index 7becbcc2..117d7c48 100644
Binary files a/assets/resources/ui/girl_detail/图片3 拷贝 2.png and b/assets/resources/ui/girl_detail/图片3 拷贝 2.png differ
diff --git a/assets/resources/ui/girl_detail/图片3 拷贝 2.png.meta b/assets/resources/ui/girl_detail/图片3 拷贝 2.png.meta
index 540aa8b3..c8b180ef 100644
--- a/assets/resources/ui/girl_detail/图片3 拷贝 2.png.meta	
+++ b/assets/resources/ui/girl_detail/图片3 拷贝 2.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 79,
-        "height": 71,
-        "rawWidth": 79,
-        "rawHeight": 71,
+        "width": 62,
+        "height": 56,
+        "rawWidth": 62,
+        "rawHeight": 56,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -39.5,
-            -35.5,
+            -31,
+            -28,
             0,
-            39.5,
-            -35.5,
+            31,
+            -28,
             0,
-            -39.5,
-            35.5,
+            -31,
+            28,
             0,
-            39.5,
-            35.5,
+            31,
+            28,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            71,
-            79,
-            71,
+            56,
+            62,
+            56,
             0,
             0,
-            79,
+            62,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -39.5,
-            -35.5,
+            -31,
+            -28,
             0
           ],
           "maxPos": [
-            39.5,
-            35.5,
+            31,
+            28,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/图片3 拷贝.png b/assets/resources/ui/girl_detail/图片3 拷贝.png
index 046bb457..32c57178 100644
Binary files a/assets/resources/ui/girl_detail/图片3 拷贝.png and b/assets/resources/ui/girl_detail/图片3 拷贝.png differ
diff --git a/assets/resources/ui/girl_detail/图片3 拷贝.png.meta b/assets/resources/ui/girl_detail/图片3 拷贝.png.meta
index e53a18f1..f74666bd 100644
--- a/assets/resources/ui/girl_detail/图片3 拷贝.png.meta	
+++ b/assets/resources/ui/girl_detail/图片3 拷贝.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 79,
-        "height": 71,
-        "rawWidth": 79,
-        "rawHeight": 71,
+        "width": 62,
+        "height": 56,
+        "rawWidth": 62,
+        "rawHeight": 56,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -39.5,
-            -35.5,
+            -31,
+            -28,
             0,
-            39.5,
-            -35.5,
+            31,
+            -28,
             0,
-            -39.5,
-            35.5,
+            -31,
+            28,
             0,
-            39.5,
-            35.5,
+            31,
+            28,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            71,
-            79,
-            71,
+            56,
+            62,
+            56,
             0,
             0,
-            79,
+            62,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -39.5,
-            -35.5,
+            -31,
+            -28,
             0
           ],
           "maxPos": [
-            39.5,
-            35.5,
+            31,
+            28,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/矩形 10 拷贝.png b/assets/resources/ui/girl_detail/矩形 10 拷贝.png
index 930f6d91..e6281485 100644
Binary files a/assets/resources/ui/girl_detail/矩形 10 拷贝.png and b/assets/resources/ui/girl_detail/矩形 10 拷贝.png differ
diff --git a/assets/resources/ui/girl_detail/矩形 10 拷贝.png.meta b/assets/resources/ui/girl_detail/矩形 10 拷贝.png.meta
index 0882c481..7246ab47 100644
--- a/assets/resources/ui/girl_detail/矩形 10 拷贝.png.meta	
+++ b/assets/resources/ui/girl_detail/矩形 10 拷贝.png.meta	
@@ -46,9 +46,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 58,
+        "width": 268,
         "height": 80,
-        "rawWidth": 58,
+        "rawWidth": 268,
         "rawHeight": 80,
         "borderTop": 2,
         "borderBottom": 20,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -29,
+            -134,
             -40,
             0,
-            29,
+            134,
             -40,
             0,
-            -29,
+            -134,
             40,
             0,
-            29,
+            134,
             40,
             0
           ],
@@ -85,11 +85,11 @@
           "uv": [
             0,
             80,
-            58,
+            268,
             80,
             0,
             0,
-            58,
+            268,
             0
           ],
           "nuv": [
@@ -103,12 +103,12 @@
             1
           ],
           "minPos": [
-            -29,
+            -134,
             -40,
             0
           ],
           "maxPos": [
-            29,
+            134,
             40,
             0
           ]
diff --git a/assets/resources/ui/girl_detail/矩形 11 拷贝.png b/assets/resources/ui/girl_detail/矩形 11 拷贝.png
new file mode 100644
index 00000000..13ea22fd
Binary files /dev/null and b/assets/resources/ui/girl_detail/矩形 11 拷贝.png differ
diff --git a/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta b/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta
new file mode 100644
index 00000000..0a0943a9
--- /dev/null
+++ b/assets/resources/ui/girl_detail/矩形 11 拷贝.png.meta	
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095@6c48a",
+      "displayName": "矩形 11 拷贝",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095@f9941",
+      "displayName": "矩形 11 拷贝",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1080,
+        "height": 307,
+        "rawWidth": 1080,
+        "rawHeight": 307,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -540,
+            -153.5,
+            0,
+            540,
+            -153.5,
+            0,
+            -540,
+            153.5,
+            0,
+            540,
+            153.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            307,
+            1080,
+            307,
+            0,
+            0,
+            1080,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -540,
+            -153.5,
+            0
+          ],
+          "maxPos": [
+            540,
+            153.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1f2275dc-ceb1-4b48-a4ae-f63f7abb1095@6c48a"
+  }
+}
diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png b/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png
deleted file mode 100644
index 58af3304..00000000
Binary files a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png and /dev/null differ
diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝.png b/assets/resources/ui/girl_detail/矩形 3 拷贝.png
index 4f8f0c12..8ba6b08d 100644
Binary files a/assets/resources/ui/girl_detail/矩形 3 拷贝.png and b/assets/resources/ui/girl_detail/矩形 3 拷贝.png differ
diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝.png.meta b/assets/resources/ui/girl_detail/矩形 3 拷贝.png.meta
index 2a887f35..3a4f5c6c 100644
--- a/assets/resources/ui/girl_detail/矩形 3 拷贝.png.meta	
+++ b/assets/resources/ui/girl_detail/矩形 3 拷贝.png.meta	
@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 106,
-        "height": 106,
-        "rawWidth": 106,
-        "rawHeight": 106,
-        "borderTop": 25,
-        "borderBottom": 25,
-        "borderLeft": 25,
-        "borderRight": 25,
+        "width": 120,
+        "height": 120,
+        "rawWidth": 120,
+        "rawHeight": 120,
+        "borderTop": 56,
+        "borderBottom": 56,
+        "borderLeft": 56,
+        "borderRight": 56,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -53,
-            -53,
+            -60,
+            -60,
             0,
-            53,
-            -53,
+            60,
+            -60,
             0,
-            -53,
-            53,
+            -60,
+            60,
             0,
-            53,
-            53,
+            60,
+            60,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            106,
-            106,
-            106,
+            120,
+            120,
+            120,
             0,
             0,
-            106,
+            120,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -53,
-            -53,
+            -60,
+            -60,
             0
           ],
           "maxPos": [
-            53,
-            53,
+            60,
+            60,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝5.png b/assets/resources/ui/girl_detail/矩形 3 拷贝5.png
new file mode 100644
index 00000000..5f4f9849
Binary files /dev/null and b/assets/resources/ui/girl_detail/矩形 3 拷贝5.png differ
diff --git a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta b/assets/resources/ui/girl_detail/矩形 3 拷贝5.png.meta
similarity index 80%
rename from assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta
rename to assets/resources/ui/girl_detail/矩形 3 拷贝5.png.meta
index 0a1489c4..f0f68215 100644
--- a/assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta	
+++ b/assets/resources/ui/girl_detail/矩形 3 拷贝5.png.meta	
@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "55a02beb-4d16-4456-96b3-fdcddb21b9f4@6c48a",
-      "displayName": "矩形 3 拷贝 4",
+      "displayName": "矩形 3 拷贝5",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "55a02beb-4d16-4456-96b3-fdcddb21b9f4@f9941",
-      "displayName": "矩形 3 拷贝 4",
+      "displayName": "矩形 3 拷贝5",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,14 +46,14 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 80,
-        "height": 80,
-        "rawWidth": 80,
-        "rawHeight": 80,
-        "borderTop": 20,
-        "borderBottom": 20,
-        "borderLeft": 20,
-        "borderRight": 20,
+        "width": 120,
+        "height": 120,
+        "rawWidth": 120,
+        "rawHeight": 120,
+        "borderTop": 56,
+        "borderBottom": 56,
+        "borderLeft": 56,
+        "borderRight": 56,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -40,
-            -40,
+            -60,
+            -60,
             0,
-            40,
-            -40,
+            60,
+            -60,
             0,
-            -40,
-            40,
+            -60,
+            60,
             0,
-            40,
-            40,
+            60,
+            60,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            80,
-            80,
-            80,
+            120,
+            120,
+            120,
             0,
             0,
-            80,
+            120,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -40,
-            -40,
+            -60,
+            -60,
             0
           ],
           "maxPos": [
-            40,
-            40,
+            60,
+            60,
             0
           ]
         },
diff --git a/assets/resources/ui/girl_detail/矩形 6.png b/assets/resources/ui/girl_detail/矩形 6.png
index 54896c65..d7c041b7 100644
Binary files a/assets/resources/ui/girl_detail/矩形 6.png and b/assets/resources/ui/girl_detail/矩形 6.png differ
diff --git a/assets/resources/ui/girl_detail/返回 (1).png b/assets/resources/ui/girl_detail/返回 (1).png
index e0911a02..56e5a4f7 100644
Binary files a/assets/resources/ui/girl_detail/返回 (1).png and b/assets/resources/ui/girl_detail/返回 (1).png differ
diff --git a/assets/resources/ui/girls_list/组 16 拷贝.png b/assets/resources/ui/girls_list/组 16 拷贝.png
index 16f92846..5bc26649 100644
Binary files a/assets/resources/ui/girls_list/组 16 拷贝.png and b/assets/resources/ui/girls_list/组 16 拷贝.png differ
diff --git a/assets/resources/ui/girls_list/组 16 拷贝.png.meta b/assets/resources/ui/girls_list/组 16 拷贝.png.meta
index 947d3804..e550f408 100644
--- a/assets/resources/ui/girls_list/组 16 拷贝.png.meta	
+++ b/assets/resources/ui/girls_list/组 16 拷贝.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 966,
-        "height": 300,
-        "rawWidth": 966,
-        "rawHeight": 300,
+        "width": 968,
+        "height": 296,
+        "rawWidth": 968,
+        "rawHeight": 296,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -483,
-            -150,
+            -484,
+            -148,
             0,
-            483,
-            -150,
+            484,
+            -148,
             0,
-            -483,
-            150,
+            -484,
+            148,
             0,
-            483,
-            150,
+            484,
+            148,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            300,
-            966,
-            300,
+            296,
+            968,
+            296,
             0,
             0,
-            966,
+            968,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -483,
-            -150,
+            -484,
+            -148,
             0
           ],
           "maxPos": [
-            483,
-            150,
+            484,
+            148,
             0
           ]
         },
diff --git a/assets/resources/ui/girls_list/组 18 拷贝.png b/assets/resources/ui/girls_list/组 18 拷贝.png
index 61a46072..88856ae0 100644
Binary files a/assets/resources/ui/girls_list/组 18 拷贝.png and b/assets/resources/ui/girls_list/组 18 拷贝.png differ
diff --git a/assets/resources/ui/girls_list/组 18 拷贝.png.meta b/assets/resources/ui/girls_list/组 18 拷贝.png.meta
index 0587e9ef..d0533d68 100644
--- a/assets/resources/ui/girls_list/组 18 拷贝.png.meta	
+++ b/assets/resources/ui/girls_list/组 18 拷贝.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 966,
-        "height": 300,
-        "rawWidth": 966,
-        "rawHeight": 300,
+        "width": 969,
+        "height": 297,
+        "rawWidth": 969,
+        "rawHeight": 297,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -483,
-            -150,
+            -484.5,
+            -148.5,
             0,
-            483,
-            -150,
+            484.5,
+            -148.5,
             0,
-            -483,
-            150,
+            -484.5,
+            148.5,
             0,
-            483,
-            150,
+            484.5,
+            148.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            300,
-            966,
-            300,
+            297,
+            969,
+            297,
             0,
             0,
-            966,
+            969,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -483,
-            -150,
+            -484.5,
+            -148.5,
             0
           ],
           "maxPos": [
-            483,
-            150,
+            484.5,
+            148.5,
             0
           ]
         },
diff --git a/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png b/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png
index 4617a88d..2834d6ab 100644
Binary files a/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png and b/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png differ
diff --git a/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png.meta b/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png.meta
index c25c807d..51a33ecc 100644
--- a/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png.meta	
+++ b/assets/resources/ui/girls_list_pop/矩形 11 拷贝.png.meta	
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 151,
-        "height": 151,
-        "rawWidth": 151,
-        "rawHeight": 151,
+        "width": 150,
+        "height": 150,
+        "rawWidth": 150,
+        "rawHeight": 150,
         "borderTop": 53,
         "borderBottom": 53,
         "borderLeft": 53,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -75.5,
-            -75.5,
+            -75,
+            -75,
             0,
-            75.5,
-            -75.5,
+            75,
+            -75,
             0,
-            -75.5,
-            75.5,
+            -75,
+            75,
             0,
-            75.5,
-            75.5,
+            75,
+            75,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            151,
-            151,
-            151,
+            150,
+            150,
+            150,
             0,
             0,
-            151,
+            150,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -75.5,
-            -75.5,
+            -75,
+            -75,
             0
           ],
           "maxPos": [
-            75.5,
-            75.5,
+            75,
+            75,
             0
           ]
         },
diff --git a/assets/resources/ui/girls_list_pop/矩形 6.png b/assets/resources/ui/girls_list_pop/矩形 6.png
index 54896c65..d7c041b7 100644
Binary files a/assets/resources/ui/girls_list_pop/矩形 6.png and b/assets/resources/ui/girls_list_pop/矩形 6.png differ
diff --git a/assets/resources/ui/personal/图层 60.png b/assets/resources/ui/personal/图层 60.png
new file mode 100644
index 00000000..127f5db4
Binary files /dev/null and b/assets/resources/ui/personal/图层 60.png differ
diff --git a/assets/resources/ui/personal/图层 60.png.meta b/assets/resources/ui/personal/图层 60.png.meta
new file mode 100644
index 00000000..ceb340b7
--- /dev/null
+++ b/assets/resources/ui/personal/图层 60.png.meta	
@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c70aaaff-69dc-4c52-a6dd-d22f641cef80",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c70aaaff-69dc-4c52-a6dd-d22f641cef80@6c48a",
+      "displayName": "图层 60",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "c70aaaff-69dc-4c52-a6dd-d22f641cef80",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "c70aaaff-69dc-4c52-a6dd-d22f641cef80@f9941",
+      "displayName": "图层 60",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1080,
+        "height": 2340,
+        "rawWidth": 1080,
+        "rawHeight": 2340,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -540,
+            -1170,
+            0,
+            540,
+            -1170,
+            0,
+            -540,
+            1170,
+            0,
+            540,
+            1170,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            2340,
+            1080,
+            2340,
+            0,
+            0,
+            1080,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -540,
+            -1170,
+            0
+          ],
+          "maxPos": [
+            540,
+            1170,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c70aaaff-69dc-4c52-a6dd-d22f641cef80@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c70aaaff-69dc-4c52-a6dd-d22f641cef80@6c48a"
+  }
+}
diff --git a/proto_cs b/proto_cs
index 7efc83e0..95585991 160000
--- a/proto_cs
+++ b/proto_cs
@@ -1 +1 @@
-Subproject commit 7efc83e05bbfa19557e9415f75158d9044a80b58
+Subproject commit 955859917593415acdbecf4409491ae20f75e31d
diff --git a/xchat_cfg b/xchat_cfg
index dd961ccc..03fe7f4e 160000
--- a/xchat_cfg
+++ b/xchat_cfg
@@ -1 +1 @@
-Subproject commit dd961ccc3b390e591abe30e5e7c126adba8379c7
+Subproject commit 03fe7f4ee7a4b3cac723b708a3044883996cf233