新ui入版

assets/Scenes/MainScene.scene

@@ -98,8 +98,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 375,
+      "x": 540,
-      "y": 667,
+      "y": 1170,
       "z": 0
     },
     "_lrot": {
@@ -184,7 +184,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 667,
+    "_orthoHeight": 1170,
     "_near": 0,
     "_far": 2000,
     "_color": {
@@ -558,8 +558,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 31,
+      "width": 361,
-      "height": -622
+      "height": 384
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -660,8 +660,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1334
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -786,8 +786,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1334
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -886,8 +886,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1334
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -938,8 +938,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 1080,
-      "height": 1334
+      "height": 2340
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Scenes/PreloadScene.scene

@@ -23,7 +23,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 62
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 63
+      "__id__": 61
     },
     "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4"
   },
@@ -76,14 +76,14 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 58
+      },
       {
         "__id__": 59
-      },
-      {
-        "__id__": 60
-      },
-      {
-        "__id__": 61
       }
     ],
     "_prefab": null,
@@ -223,25 +223,25 @@
         "__id__": 10
       },
       {
-        "__id__": 14
+        "__id__": 13
       },
       {
-        "__id__": 18
+        "__id__": 16
       },
       {
-        "__id__": 25
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 54
+      },
+      {
+        "__id__": 55
+      },
       {
         "__id__": 56
-      },
-      {
-        "__id__": 57
-      },
-      {
-        "__id__": 58
       }
     ],
     "_prefab": null,
@@ -362,13 +362,13 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
+      "r": 24,
-      "g": 255,
+      "g": 15,
-      "b": 255,
+      "b": 32,
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f6b9ad73-5f75-4381-9a26-bc242b1c9c7e@f9941",
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -400,7 +400,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "logo",
+    "_name": "Icon_BG",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -414,16 +414,13 @@
       },
       {
         "__id__": 12
-      },
-      {
-        "__id__": 13
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 47.06200000000001,
+      "x": 0,
-      "y": -457.41099999999994,
+      "y": 299.3589999999999,
       "z": 0
     },
     "_lrot": {
@@ -447,7 +444,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "107+/WGklMAKqG8ntcZljJ"
+    "_id": "96PSzdR+lNW6rxfZaUrhFR"
   },
   {
     "__type__": "cc.UITransform",
@@ -461,15 +458,15 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 693,
+      "width": 312,
-      "height": 285
+      "height": 312
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "bec7wLhcNABaV7oJi0nM2S"
+    "_id": "6cv3lYbA1LhIoC9AtJJObM"
   },
   {
     "__type__": "cc.Sprite",
@@ -492,7 +489,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "5ef9bbe1-032c-4c1c-a0bf-98290cf1dd1d@f9941",
+      "__uuid__": "956bb46f-bf99-44c5-b1d3-4717914d71ea@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -508,41 +505,11 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "e7LFGMjJ9Cw4av+MQLGYH0"
+    "_id": "f5WrotzqdGWJP9wQYVbDCZ"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_alignFlags": 1,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 1484.911,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": "165eMG+J1O15r6QC2SGObg"
   },
   {
     "__type__": "cc.Node",
-    "_name": "LabProgress",
+    "_name": "text",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -551,21 +518,18 @@
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 14
+      },
       {
         "__id__": 15
-      },
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 17
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -1019.5029999999999,
+      "y": -14.424999999999955,
       "z": 0
     },
     "_lrot": {
@@ -589,7 +553,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "4eKplCQcVIopTJpjTJhRYK"
+    "_id": "8dWZtjhe5MC4Vrv/iR99Wa"
   },
   {
     "__type__": "cc.UITransform",
@@ -597,21 +561,21 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 130.3388671875,
+      "width": 971.1772500000001,
-      "height": 50.4
+      "height": 307.104
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "ff7V6JMqNEVYiXxHXDcJyI"
+    "_id": "450JyC0olLu7EQEduC9/bx"
   },
   {
     "__type__": "cc.Label",
@@ -619,7 +583,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 14
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": null,
@@ -628,19 +592,19 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
+      "r": 195,
-      "g": 255,
+      "g": 186,
-      "b": 255,
+      "b": 206,
       "a": 255
     },
-    "_string": "加载中...",
+    "_string": "All characters, places, or organizations depicted in this app are fictitious. Any resemblance to real persons, living or dead, is purely coincidental.",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 34,
+    "_actualFontSize": 46,
-    "_fontSize": 34,
+    "_fontSize": 46,
-    "_fontFamily": "Arial",
+    "_fontFamily": "NotoSans-Regular",
-    "_lineHeight": 40,
+    "_lineHeight": 54.6,
-    "_overflow": 0,
+    "_overflow": 1,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -649,7 +613,7 @@
     "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
-    "_cacheMode": 1,
+    "_cacheMode": 0,
     "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
@@ -673,37 +637,7 @@
       "y": 2
     },
     "_shadowBlur": 2,
-    "_id": "1cK/CutPBC7Z4HWmZGFEAe"
+    "_id": "b4oSayshNMcqNuuyrCIJak"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 14
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_alignFlags": 4,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 125.29699999999997,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": "91FbQIXVdI4KMRkPC8HzGf"
   },
   {
     "__type__": "cc.Node",
@@ -715,26 +649,26 @@
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      },
       {
         "__id__": 22
-      },
-      {
-        "__id__": 23
-      },
-      {
-        "__id__": 24
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -975.5029999999999,
+      "y": -755.781,
       "z": 0
     },
     "_lrot": {
@@ -766,23 +700,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 16
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 18
       },
       {
-        "__id__": 21
+        "__id__": 19
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -255,
+      "x": -440.128,
-      "y": 0,
+      "y": -5.684341886080802e-14,
       "z": 0
     },
     "_lrot": {
@@ -814,14 +748,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 510,
+      "width": 877.9,
-      "height": 24
+      "height": 29.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -836,7 +770,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": null,
@@ -845,9 +779,9 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
+      "r": 83,
-      "g": 255,
+      "g": 48,
-      "b": 255,
+      "b": 112,
       "a": 255
     },
     "_spriteFrame": {
@@ -856,14 +790,14 @@
     },
     "_type": 3,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
       "y": 0
     },
     "_fillStart": 0,
-    "_fillRange": 0.7,
+    "_fillRange": 0,
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
@@ -875,14 +809,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 517,
+      "width": 896,
-      "height": 34
+      "height": 37
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -897,7 +831,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": null,
@@ -912,12 +846,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "c9e9e586-533e-4a1c-b263-2a4d19d42d3b@f9941",
+      "__uuid__": "43844079-261d-442c-a63a-5dfa72c3aeca@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 0,
+    "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -936,7 +870,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": null,
@@ -945,7 +879,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 0,
-    "_bottom": 177.49700000000007,
+    "_bottom": 395.71900000000005,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -970,31 +904,31 @@
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 24
       },
       {
-        "__id__": 34
+        "__id__": 32
       },
       {
-        "__id__": 38
+        "__id__": 36
       },
       {
-        "__id__": 42
+        "__id__": 40
       },
       {
-        "__id__": 46
+        "__id__": 44
       },
       {
-        "__id__": 50
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 52
       },
       {
-        "__id__": 55
+        "__id__": 53
       }
     ],
     "_prefab": null,
@@ -1033,33 +967,33 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 23
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 25
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 29
+      },
       {
         "__id__": 30
       },
       {
         "__id__": 31
-      },
-      {
-        "__id__": 32
-      },
-      {
-        "__id__": 33
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -809.7220000000001,
+      "y": -370.278,
       "z": 0
     },
     "_lrot": {
@@ -1091,16 +1025,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 26
       },
       {
-        "__id__": 29
+        "__id__": 27
       }
     ],
     "_prefab": null,
@@ -1139,7 +1073,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": null,
@@ -1161,7 +1095,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": null,
@@ -1223,7 +1157,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": null,
@@ -1245,7 +1179,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": null,
@@ -1284,7 +1218,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": null,
@@ -1293,7 +1227,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 0,
-    "_bottom": 305.2279999999999,
+    "_bottom": 744.672,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1314,7 +1248,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": null,
@@ -1356,7 +1290,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 26
+      "__id__": 24
     },
     "_id": "c9KDag5vBLKazTx4FSrM2p"
   },
@@ -1366,19 +1300,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 23
     },
     "_children": [],
     "_active": false,
     "_components": [
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 34
+      },
       {
         "__id__": 35
-      },
-      {
-        "__id__": 36
-      },
-      {
-        "__id__": 37
       }
     ],
     "_prefab": null,
@@ -1417,7 +1351,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1439,7 +1373,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1478,7 +1412,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": null,
@@ -1508,19 +1442,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 23
     },
     "_children": [],
     "_active": false,
     "_components": [
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 38
+      },
       {
         "__id__": 39
-      },
-      {
-        "__id__": 40
-      },
-      {
-        "__id__": 41
       }
     ],
     "_prefab": null,
@@ -1559,7 +1493,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": null,
@@ -1581,7 +1515,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": null,
@@ -1643,7 +1577,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": null,
@@ -1673,19 +1607,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 23
     },
     "_children": [],
     "_active": false,
     "_components": [
+      {
+        "__id__": 41
+      },
+      {
+        "__id__": 42
+      },
       {
         "__id__": 43
-      },
-      {
-        "__id__": 44
-      },
-      {
-        "__id__": 45
       }
     ],
     "_prefab": null,
@@ -1724,7 +1658,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": null,
@@ -1746,7 +1680,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": null,
@@ -1808,7 +1742,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": null,
@@ -1838,19 +1772,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 23
     },
     "_children": [],
     "_active": false,
     "_components": [
+      {
+        "__id__": 45
+      },
+      {
+        "__id__": 46
+      },
       {
         "__id__": 47
-      },
-      {
-        "__id__": 48
-      },
-      {
-        "__id__": 49
       }
     ],
     "_prefab": null,
@@ -1889,7 +1823,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": null,
@@ -1911,7 +1845,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": null,
@@ -1973,7 +1907,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": null,
@@ -2003,19 +1937,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 23
     },
     "_children": [],
     "_active": false,
     "_components": [
+      {
+        "__id__": 49
+      },
+      {
+        "__id__": 50
+      },
       {
         "__id__": 51
-      },
-      {
-        "__id__": 52
-      },
-      {
-        "__id__": 53
       }
     ],
     "_prefab": null,
@@ -2054,7 +1988,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": null,
@@ -2076,7 +2010,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": null,
@@ -2138,7 +2072,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": null,
@@ -2168,7 +2102,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": null,
@@ -2190,7 +2124,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": null,
@@ -2357,28 +2291,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 64
+      "__id__": 62
     },
     "shadows": {
-      "__id__": 65
+      "__id__": 63
     },
     "_skybox": {
-      "__id__": 66
+      "__id__": 64
     },
     "fog": {
-      "__id__": 67
+      "__id__": 65
     },
     "octree": {
-      "__id__": 68
+      "__id__": 66
     },
     "skin": {
-      "__id__": 69
+      "__id__": 67
     },
     "lightProbeInfo": {
-      "__id__": 70
+      "__id__": 68
     },
     "postSettings": {
-      "__id__": 71
+      "__id__": 69
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

assets/Scripts/Sub/UI/PreloadUI.ts

@@ -36,7 +36,7 @@ import MachineInfoService from "db://assets/Scripts/chat18x/foundation/identity/
 import { AuthService } from "db://assets/Scripts/chat18x/network/services/AuthService";
 import { PlayerDataService } from "db://assets/Scripts/chat18x/network/services/PlayerDataService";
 import { ApiCode } from "db://assets/Scripts/chat18x/network/client/types";
-import proto from 'db://assets/Scripts/proto/proto.pb.js';
+import proto from "db://assets/Scripts/proto/proto.pb.js";
 
 const { ccclass, property } = _decorator;
 
@@ -48,7 +48,7 @@ export class PreloadUI extends Component {
 
   private jinduBar: Node = null;
   private jinduFilled: Sprite = null;
-  private LabProgress: Label = null;
+  //private LabProgress: Label = null;
   private loginNode: Node = null;
   private btnLogin: Node = null; //登录按钮
 
@@ -59,9 +59,9 @@ export class PreloadUI extends Component {
     this.jinduFilled = this.jinduBar
       .getChildByName("jinduFilled")
       .getComponent(Sprite);
-    this.LabProgress = this.node
+    // this.LabProgress = this.node
-      .getChildByName("LabProgress")
+    //   .getChildByName("LabProgress")
-      .getComponent(Label);
+    //   .getComponent(Label);
     this.loginNode = this.node.getChildByName("loginNode");
     this.btnLogin = this.loginNode.getChildByName("btnLogin");
 
@@ -75,7 +75,7 @@ export class PreloadUI extends Component {
 
     // 初始化配置
     ConfigManager.I.init();
-    //console.log(ConfigManager.tables.TbGlobalConfig.GameName);    
+    //console.log(ConfigManager.tables.TbGlobalConfig.GameName);
     // 初始化环境配置
     AppConfig.I;
     // 初始化数据层
@@ -208,7 +208,7 @@ export class PreloadUI extends Component {
 
   // 进入登录模块
   private enterLoginModule() {
-    this.LabProgress.node.active = false;
+    //this.LabProgress.node.active = false;
     this.jinduBar.active = false;
     this.loginNode.active = true;
   }
@@ -257,10 +257,10 @@ export class PreloadUI extends Component {
     // })
 
     // 游客登录
-    const deviceId =  DeviceIdService.I.id;
+    const deviceId = DeviceIdService.I.id;
     const machineIdentifier = MachineInfoService.I.getMachineIdentifier();
     const reqData = {
-      platType: 'guset',
+      platType: "guset",
       userId: deviceId,
       device: deviceId,
       os: 3,
@@ -277,18 +277,16 @@ export class PreloadUI extends Component {
       loginData.expire = resData.expire;
       const playerData = DataManager.I.getDataById<PlayerData>(DataId.Player);
       playerData.name = resData.name;
-      
+
       this.loginFinish = true;
 
       // this.reqMyInfo();
-    };
+    }
   }
 
   // 请求个人信息
   private async reqMyInfo() {
-    const reqData = {
+    const reqData = {};
-
-    };
     console.log("个人信息请求数据：", reqData);
     let res = await PlayerDataService.I.reqMyInfo(reqData);
     console.log("个人信息响应数据：", res);
@@ -297,7 +295,7 @@ export class PreloadUI extends Component {
       // 保存数据
       const walletData = DataManager.I.getDataById<WalletData>(DataId.Wallet);
       walletData.diamond = resData.diamond;
-      walletData.vipExpire = resData.vipExpire;  
+      walletData.vipExpire = resData.vipExpire;
     }
   }
 
@@ -305,7 +303,7 @@ export class PreloadUI extends Component {
     //let islogin = HttpUnit.IsLogin();
     //console.log("进入游戏，登录状态：", islogin);
     this.jinduBar.active = false;
-    this.LabProgress.node.active = false;
+    //this.LabProgress.node.active = false;
     //this.btnLogin.node.active = false
     // if (islogin) {
     // } else {
@@ -318,5 +316,5 @@ export class PreloadUI extends Component {
 
   private registerListener() {
     GButton.BandClick(this.btnLogin, this.onLogin, this);
-  }  
+  }
 }

assets/Scripts/chat18x/manager/NavigationManager.ts

@@ -1,170 +1,185 @@
 import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
 import { UITransitionHelper } from "../utils/UITransitionHelper";
+import GameRootUI from "../../Main/Common/GameRootUI";
 
 /**
  * 导航管理器
- * 
+ *
  * 负责管理游戏中的页面导航和路由，将导航逻辑从业务逻辑中分离出来
- * 
+ *
- * @author AI Chat System  
+ * @author AI Chat System
  * @version 1.0.0
  */
 export class NavigationManager {
-    private static _instance: NavigationManager;
+  private static _instance: NavigationManager;
 
-    /**
+  /**
-     * 获取NavigationManager的单例实例
+   * 获取NavigationManager的单例实例
-     * 
+   *
-     * @returns {NavigationManager} 导航管理器实例
+   * @returns {NavigationManager} 导航管理器实例
-     * @static
+   * @static
-     */
+   */
-    public static get Instance(): NavigationManager {
+  public static get Instance(): NavigationManager {
-        if (!this._instance) {
+    if (!this._instance) {
-            this._instance = new NavigationManager();
+      this._instance = new NavigationManager();
-        }
+    }
-        return this._instance;
+    return this._instance;
+  }
+
+  private constructor() {}
+
+  /**
+   * 进入角色列表页面
+   *
+   * @param {number} themeId - 主题ID，用于筛选角色
+   *
+   * @example
+   * ```typescript
+   * NavigationManager.Instance.navigateToGirlList(1);
+   * ```
+   */
+  public navigateToGirlList(themeId: number): void {
+    if (themeId == null || themeId < 0) {
+      console.warn("Invalid theme ID for girl list navigation:", themeId);
+      return;
+    }
+    GameRootUI.I.hideDefaultView();
+
+    console.log(`Navigating to girl list with theme ID: ${themeId}`);
+    ViewManager.I.openBundlesView("GirlListPanel", themeId);
+  }
+
+  /**
+   * 进入聊天页面
+   *
+   * @param {number} roleId - 角色ID
+   *
+   * @example
+   * ```typescript
+   * NavigationManager.Instance.navigateToChat(10001);
+   * ```
+   */
+  public navigateToChat(roleId: number): void {
+    if (roleId == null || roleId <= 0) {
+      console.warn("Invalid role ID for chat navigation:", roleId);
+      return;
     }
 
-    private constructor() {}
+    console.log(`Navigating to chat with role ID: ${roleId}`);
+    ViewManager.I.openBundlesView("ChatPanel", roleId);
+  }
 
-    /**
+  /**
-     * 进入角色列表页面
+   * 带过渡动画进入聊天页面
-     * 
+   * 从GirlDetailPanel平滑过渡到ChatPanel
-     * @param {number} themeId - 主题ID，用于筛选角色
+   *
-     * 
+   * @param {number} roleId - 角色ID
-     * @example
+   * @param {any} currentPanel - 当前面板实例（GirlDetailPanel）
-     * ```typescript
+   *
-     * NavigationManager.Instance.navigateToGirlList(1);
+   * @example
-     * ```
+   * ```typescript
-     */
+   * NavigationManager.Instance.navigateToChatWithTransition(10001, this);
-    public navigateToGirlList(themeId: number): void {
+   * ```
-        if (themeId == null || themeId < 0) {
+   */
-            console.warn("Invalid theme ID for girl list navigation:", themeId);
+  public navigateToChatWithTransition(
-            return;
+    roleId: number,
-        }
+    currentPanel?: any
-
+  ): void {
-        console.log(`Navigating to girl list with theme ID: ${themeId}`);
+    if (roleId == null || roleId <= 0) {
-        ViewManager.I.openBundlesView("GirlListPanel", themeId);
+      console.warn(
+        "Invalid role ID for chat navigation with transition:",
+        roleId
+      );
+      return;
     }
 
-    /**
+    console.log(`Navigating to chat with transition, role ID: ${roleId}`);
-     * 进入聊天页面
-     * 
-     * @param {number} roleId - 角色ID
-     * 
-     * @example
-     * ```typescript  
-     * NavigationManager.Instance.navigateToChat(10001);
-     * ```
-     */
-    public navigateToChat(roleId: number): void {
-        if (roleId == null || roleId <= 0) {
-            console.warn("Invalid role ID for chat navigation:", roleId);
-            return;
-        }
 
-        console.log(`Navigating to chat with role ID: ${roleId}`);
+    // 打开ChatPanel，同时标记需要执行滑入动画
-        ViewManager.I.openBundlesView("ChatPanel", roleId);
+    ViewManager.I.openBundlesView(
-    }
+      "ChatPanel",
-
+      {
-    /**
+        roleId: roleId,
-     * 带过渡动画进入聊天页面
+        withSlideTransition: true,
-     * 从GirlDetailPanel平滑过渡到ChatPanel
+      },
-     * 
+      (chatNode) => {
-     * @param {number} roleId - 角色ID
+        // ChatPanel打开后，如果有当前面板，执行滑出动画
-     * @param {any} currentPanel - 当前面板实例（GirlDetailPanel）
+        if (currentPanel && currentPanel.node && currentPanel.node.isValid) {
-     * 
+          UITransitionHelper.slideOutToLeft(currentPanel.node, 0.3, () => {
-     * @example
+            // 滑出动画完成后关闭原面板
-     * ```typescript
+            if (
-     * NavigationManager.Instance.navigateToChatWithTransition(10001, this);
+              currentPanel.onClose &&
-     * ```
+              typeof currentPanel.onClose === "function"
-     */
+            ) {
-    public navigateToChatWithTransition(roleId: number, currentPanel?: any): void {
+              currentPanel.onClose();
-        if (roleId == null || roleId <= 0) {
-            console.warn("Invalid role ID for chat navigation with transition:", roleId);
-            return;
-        }
-
-        console.log(`Navigating to chat with transition, role ID: ${roleId}`);
-        
-        // 打开ChatPanel，同时标记需要执行滑入动画
-        ViewManager.I.openBundlesView("ChatPanel", { 
-            roleId: roleId, 
-            withSlideTransition: true 
-        }, (chatNode) => {
-            // ChatPanel打开后，如果有当前面板，执行滑出动画
-            if (currentPanel && currentPanel.node && currentPanel.node.isValid) {
-                UITransitionHelper.slideOutToLeft(currentPanel.node, 0.3, () => {
-                    // 滑出动画完成后关闭原面板
-                    if (currentPanel.onClose && typeof currentPanel.onClose === 'function') {
-                        currentPanel.onClose();
-                    }
-                });
             }
-        });
+          });
-    }
-
-    /**
-     * 进入角色详情页面
-     * 
-     * @param {number} roleId - 角色ID
-     * 
-     * @example
-     * ```typescript
-     * NavigationManager.Instance.navigateToGirlDetail(10001);
-     * ```
-     */
-    public navigateToGirlDetail(roleId: number): void {
-        if (roleId == null || roleId <= 0) {
-            console.warn("Invalid role ID for detail navigation:", roleId);
-            return;
         }
+      }
+    );
+  }
 
-        console.log(`Navigating to girl detail with role ID: ${roleId}`);
+  /**
-        ViewManager.I.openBundlesView("GirlDetailPanel", roleId);
+   * 进入角色详情页面
+   *
+   * @param {number} roleId - 角色ID
+   *
+   * @example
+   * ```typescript
+   * NavigationManager.Instance.navigateToGirlDetail(10001);
+   * ```
+   */
+  public navigateToGirlDetail(roleId: number): void {
+    if (roleId == null || roleId <= 0) {
+      console.warn("Invalid role ID for detail navigation:", roleId);
+      return;
     }
 
-    /**
+    console.log(`Navigating to girl detail with role ID: ${roleId}`);
-     * 返回主界面
+    ViewManager.I.openBundlesView("GirlDetailPanel", roleId);
-     * 
+  }
-     * @example
-     * ```typescript
-     * NavigationManager.Instance.navigateToMainMenu();
-     * ```
-     */
-    public navigateToMainMenu(): void {
-        console.log("Navigating to main menu");
-        // TODO: 实现返回主界面的逻辑
-        // ViewManager.I.openBundlesView("MainMenu");
-    }
 
-    /**
+  /**
-     * 检查是否可以导航到指定页面
+   * 返回主界面
-     * 
+   *
-     * @param {string} pageName - 页面名称
+   * @example
-     * @returns {boolean} 是否可以导航
+   * ```typescript
-     */
+   * NavigationManager.Instance.navigateToMainMenu();
-    public canNavigateTo(pageName: string): boolean {
+   * ```
-        const allowedPages = ["GirlListPanel", "ChatPanel", "GirlDetailPanel"];
+   */
-        return allowedPages.indexOf(pageName)>=0;
+  public navigateToMainMenu(): void {
-    }
+    console.log("Navigating to main menu");
+    // TODO: 实现返回主界面的逻辑
+    // ViewManager.I.openBundlesView("MainMenu");
+  }
 
-    /**
+  /**
-     * 获取当前页面的导航历史（预留功能）
+   * 检查是否可以导航到指定页面
-     * 
+   *
-     * @returns {string[]} 导航历史数组
+   * @param {string} pageName - 页面名称
-     */
+   * @returns {boolean} 是否可以导航
-    public getNavigationHistory(): string[] {
+   */
-        // TODO: 实现导航历史记录功能
+  public canNavigateTo(pageName: string): boolean {
-        console.log("Navigation history feature not implemented yet");
+    const allowedPages = ["GirlListPanel", "ChatPanel", "GirlDetailPanel"];
-        return [];
+    return allowedPages.indexOf(pageName) >= 0;
-    }
+  }
 
-    /**
+  /**
-     * 返回上一页（预留功能）
+   * 获取当前页面的导航历史（预留功能）
-     */
+   *
-    public goBack(): void {
+   * @returns {string[]} 导航历史数组
-        // TODO: 实现返回上一页功能
+   */
-        console.log("Go back feature not implemented yet");
+  public getNavigationHistory(): string[] {
-    }
+    // TODO: 实现导航历史记录功能
-}
+    console.log("Navigation history feature not implemented yet");
+    return [];
+  }
+
+  /**
+   * 返回上一页（预留功能）
+   */
+  public goBack(): void {
+    // TODO: 实现返回上一页功能
+    console.log("Go back feature not implemented yet");
+  }
+}

assets/Scripts/chat18x/ui/components/SimpleToggle.ts

@@ -19,8 +19,8 @@ export class SimpleToggle extends Component {
   }
 
   init(isSelected: boolean, callBack: () => {}) {
-    this.selectedSprite.enabled = isSelected;
+    this.selectedSprite.node.active = isSelected;
-    this.unSelectedSprite.enabled = !isSelected;
+    this.unSelectedSprite.node.active = !isSelected;
     if (this.callback) {
       this.onDestroy();
     }
@@ -30,8 +30,8 @@ export class SimpleToggle extends Component {
   }
 
   refresh(isSelected: boolean) {
-    this.selectedSprite.enabled = isSelected;
+    this.selectedSprite.node.active = isSelected;
-    this.unSelectedSprite.enabled = !isSelected;
+    this.unSelectedSprite.node.active = !isSelected;
   }
 
   onClickThis() {

assets/Scripts/chat18x/ui/components/SimpleToggleGroup.ts

@@ -6,9 +6,6 @@ const { ccclass, property } = _decorator;
 export class SimpleToggleGroup extends Component {
   toggles: SimpleToggle[];
 
-  @property(Node)
-  slider: Node;
-
   protected onLoad(): void {
     this.toggles = this.getComponentsInChildren(SimpleToggle);
 
@@ -19,12 +16,6 @@ export class SimpleToggleGroup extends Component {
   }
 
   toggleSelected(selectedNode: Node) {
-    const pos = this.slider.getPosition();
-    const targetPos = new Vec3(selectedNode.getPosition().x, pos.y, pos.z);
-    tween(this.slider)
-      .to(0.3, { position: targetPos }, { easing: "sineInOut" })
-      .start();
-
     for (let i = 0; i < this.toggles.length; i++) {
       const element = this.toggles[i];
       if (element.node === selectedNode) {

assets/Scripts/chat18x/ui/panels/ChatPanel.ts

@@ -402,7 +402,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
   protected onEnable(): void {
     if (!this.manager) this.manager = DialogManager.getInstance();
 
-    GameRootUI.I.hideDefaultView();
   }
 
   public async OnClickSend() {

assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts

@@ -19,14 +19,12 @@ import { SimpleToggle } from "../components/SimpleToggle";
 import { DataManager, DataId } from "../../data/DataManager";
 import { GirlData } from "../../data/GirlData";
 import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
-import proto from 'db://assets/Scripts/proto/proto.pb.js';
+import proto from "db://assets/Scripts/proto/proto.pb.js";
 
 const { ccclass, property } = _decorator;
 
 @ccclass("GirlDetailPanel")
 export class GirlDetailPanel extends li_BaseView {
-  @property(Sprite)
-  avatar: Sprite;
   @property(VideoPlayer)
   avatarVideo: VideoPlayer;
   @property(Label)
@@ -109,7 +107,7 @@ export class GirlDetailPanel extends li_BaseView {
       const videoTransform = this.avatarVideo.node.getComponent(UITransform);
 
       if (parentTransform && videoTransform && videoTransform.height > 0) {
-        const scale = parentTransform.height / videoTransform.height;
+        const scale = parentTransform.width / videoTransform.width;
         this.avatarVideo.node.setScale(scale, scale, 1);
         console.log(
           `Video scaled to: ${scale}, parent height: ${parentTransform.height}, video height: ${videoTransform.height}`
@@ -148,8 +146,11 @@ export class GirlDetailPanel extends li_BaseView {
       girlData.setGirlDetails(this.category.toString(), res.data);
       // 根据数据，刷新界面
       this.nameKey = girlData.getGrilName(this.category.toString(), this.id);
-      this.girlName.string = LanguageUtils.getText(this.nameKey);      
+      this.girlName.string = LanguageUtils.getText(this.nameKey);
-      this.desc.string = girlData.getGrilDesc(this.category.toString(), this.id);
+      this.desc.string = girlData.getGrilDesc(
+        this.category.toString(),
+        this.id
+      );
 
       let desc = "";
       this.tagKey = girlData.getGrilTagKey(this.category.toString(), this.id);
@@ -165,39 +166,43 @@ export class GirlDetailPanel extends li_BaseView {
       let age = girlData.getGrilAge(this.category.toString(), this.id);
       this.descAge.string =
         LanguageUtils.getText("girldetailpanel.age") + age.toString();
-  
-      const firstPath = girlData.getGrilVideoPath(this.category.toString(), this.id, 0);
-      ResManager.I.changeBundleVideo(
-        this.avatarVideo,
-        firstPath,
-        "Chat18x"
-      );
 
-      let allPhotoDataCount = girlData.getAllGrilPhotoDataCount(this.category.toString(), this.id);
+      const firstPath = girlData.getGrilVideoPath(
+        this.category.toString(),
+        this.id,
+        0
+      );
+      ResManager.I.changeBundleVideo(this.avatarVideo, firstPath, "Chat18x");
+
+      let allPhotoDataCount = girlData.getAllGrilPhotoDataCount(
+        this.category.toString(),
+        this.id
+      );
       // 也立即尝试调整（以防已经加载完成）
       this.adjustVideoScale();
       this.refreshImgs(1, this.category, this.id, allPhotoDataCount);
-    }   
+    }
   }
 
   bindImgToggle() {
     const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
-    let allPhotoDataCount = girlData.getAllGrilPhotoDataCount(this.category.toString(), this.id);
+    let allPhotoDataCount = girlData.getAllGrilPhotoDataCount(
+      this.category.toString(),
+      this.id
+    );
     this.refreshImgs(1, this.category, this.id, allPhotoDataCount);
   }
 
   bindVideoToggle() {
     const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
-    let allVideoDataCount = girlData.getAllGrilVideoDataCount(this.category.toString(), this.id);
+    let allVideoDataCount = girlData.getAllGrilVideoDataCount(
+      this.category.toString(),
+      this.id
+    );
     this.refreshImgs(2, this.category, this.id, allVideoDataCount);
   }
 
-  refreshImgs(
+  refreshImgs(type: number, category: number, id: number, count: number) {
-    type: number,
-    category: number,
-    id: number,
-    count: number    
-  ) {
     for (let i = this.imgsLayout.children.length - 1; i >= 0; i--) {
       this.imgsLayout.children[i].destroy();
     }

assets/Scripts/chat18x/ui/panels/GirlListPanel.ts

@@ -7,7 +7,8 @@ import { ConfigManager } from "../../manager/ConfigManager";
 import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
 import { DataManager, DataId } from "../../data/DataManager";
 import { GirlData } from "../../data/GirlData";
-import proto from 'db://assets/Scripts/proto/proto.pb.js';
+import proto from "db://assets/Scripts/proto/proto.pb.js";
+import GameRootUI from "../../../Main/Common/GameRootUI";
 
 const { ccclass, property } = _decorator;
 
@@ -59,7 +60,7 @@ export class GirlListPanel extends li_BaseView {
         item.refreshData(category, id, this.node);
         newNode.active = true;
         this.cache.push(item);
-        this.content.addChild(newNode);      
+        this.content.addChild(newNode);
       }
     }
   }
@@ -69,5 +70,6 @@ export class GirlListPanel extends li_BaseView {
   }
   Return() {
     this.onClose();
+    GameRootUI.I.showDefaultView();
   }
 }

assets/Scripts/chat18x/uiitems/DetailImageItem.ts

@@ -4,7 +4,7 @@ import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
 import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
 import { GButton } from "db://assets/Scripts/Main/Common/GButton";
 import { GirlDetailPanel } from "../ui/panels/GirlDetailPanel";
-import proto from 'db://assets/Scripts/proto/proto.pb.js';
+import proto from "db://assets/Scripts/proto/proto.pb.js";
 import { DataManager, DataId } from "../data/DataManager";
 import { GirlData } from "../data/GirlData";
 
@@ -15,11 +15,12 @@ export class DetailImageItem extends Component {
   @property(Sprite)
   img: Sprite;
 
-  @property(Node)
-  lock: Node;
   @property(Node)
   question: Node;
 
+  @property(Sprite)
+  video: Sprite;
+
   base: GirlDetailPanel;
   url: string;
   isImage: boolean;
@@ -27,7 +28,7 @@ export class DetailImageItem extends Component {
   category: number;
   id: number;
   index: number;
-  type : number;
+  type: number;
 
   onLoad() {
     GButton.BandClick(this.node, this.onClickThis, this);
@@ -99,21 +100,33 @@ export class DetailImageItem extends Component {
     this.category = category;
     this.id = id;
     this.index = index;
-    this.lock.active = false;
     this.question.active = true; // 显示问号，表示加载中
 
     const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
     let imgPath = "";
+    this.video.enabled = type === 2;
     if (type === 1) {
       // 图片
-      this.url = girlData.getGrilPhotoPic(this.category.toString(), this.id, this.index);
+      this.url = girlData.getGrilPhotoPic(
+        this.category.toString(),
+        this.id,
+        this.index
+      );
       imgPath = this.url;
       this.isImage = true;
     } else if (type === 2) {
       // 视频
       this.isImage = false;
-      this.url = girlData.getGrilVideoPath(this.category.toString(), this.id, this.index);
+      this.url = girlData.getGrilVideoPath(
-      let videoPrice = girlData.getGrilVideoPrice(this.category.toString(), this.id, this.index);
+        this.category.toString(),
+        this.id,
+        this.index
+      );
+      let videoPrice = girlData.getGrilVideoPrice(
+        this.category.toString(),
+        this.id,
+        this.index
+      );
       if (videoPrice > 0) {
         imgPath = this.url + "_thumbnail_blur";
       } else {

assets/Scripts/chat18x/uiitems/GirlListItem.ts

@@ -1,4 +1,13 @@
-import { _decorator, Component, Label, Node, Sprite, UITransform } from "cc";
+import {
+  _decorator,
+  AssetManager,
+  Component,
+  Label,
+  Node,
+  randomRangeInt,
+  Sprite,
+  UITransform,
+} from "cc";
 import { Config18x } from "db://assets/Scripts/Main/Config/Config18x";
 import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
 import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
@@ -24,13 +33,15 @@ export class GirlListItem extends Component {
   price: Label;
   @property(Node)
   freeNode: Node;
+
   @property(Node)
-  tryNode: Node;
+  chatIcon: Node;
-  @property(Node)
+
-  chatBtn: Node;
   @property(Node)
   starParent: Node;
 
+  stars: Sprite[];
+
   id: number = -1;
 
   nameKey: string;
@@ -68,6 +79,10 @@ export class GirlListItem extends Component {
 
   baseNode: Node;
   refreshData(category: number, girlId: number, baseNode: Node) {
+    if (!this.stars) {
+      this.stars = this.starParent.getComponentsInChildren(Sprite);
+    }
+
     this.category = category;
     this.baseNode = baseNode;
     this.id = girlId;
@@ -83,11 +98,17 @@ export class GirlListItem extends Component {
       desc += tags[i];
     }
     this.tags.string = desc;
-    let priceType = girlData.getGrilPriceType(this.category.toString(), this.id);
+    let priceType = girlData.getGrilPriceType(
+      this.category.toString(),
+      this.id
+    );
     this.price.node.active = priceType == PriceType.pay;
     this.freeNode.active = priceType == PriceType.free;
-    this.tryNode.active = priceType == PriceType.first_time_free;
+    //this.tryNode.active = priceType == PriceType.first_time_free;
-    let listAvatarPath = girlData.getGrilListAvatar(this.category.toString(), this.id);
+    let listAvatarPath = girlData.getGrilListAvatar(
+      this.category.toString(),
+      this.id
+    );
     ResManager.I.changeBundleSpriteFrame(
       this.avatar,
       listAvatarPath,
@@ -102,9 +123,22 @@ export class GirlListItem extends Component {
       }
     );
 
-    // for (let i = 0; i < 5; i++) {
+    //虚假好感度
-    //   this.starParent.children[i].active = i < data.;
+    const ratio = randomRangeInt(0, 5);
-    // }
+    this.starParent.active = ratio != 0;
+    this.chatIcon.active = ratio != 0;
+    this.price.node.active = ratio == 0;
+    for (let i = 0; i < this.stars.length; i++) {
+      const element = this.stars[i];
+      if (ratio > i) {
+        ResManager.I.changeResourceSpriteFrame(element, "ui/common/heart");
+      } else {
+        ResManager.I.changeResourceSpriteFrame(
+          element,
+          "ui/common/heart_empty"
+        );
+      }
+    }
   }
 
   onClickDetail() {

assets/bundles/Chat18x/PopupGIrlListPanel.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "9ae8b535-a2b4-45db-9a53-a5ef8b7dd605",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "PopupGIrlListPanel"
+  }
+}

assets/bundles/Chat18x/Popup_girlDetailPanel.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "e185756d-679b-4656-8e4d-4cf4cd28c03d",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "Popup_girlDetailPanel"
+  }
+}

assets/bundles/Chat18x/PurchasePanel.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "20f8c223-400b-4d21-9e93-351fb81dfd59",
+  "uuid": "9c682dc4-edc5-4f71-b8c0-3a3e2bf1f285",
   "files": [
     ".json"
   ],

assets/resources/Arial-MT.ttf.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.1",
+  "importer": "ttf-font",
+  "imported": true,
+  "uuid": "52af39e6-df78-413a-88bb-72dfdca7ec84",
+  "files": [
+    ".json",
+    "Arial-MT.ttf"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/resources/ui/chat/多边形 1 拷贝 2.png.meta

@@ -50,10 +50,10 @@
         "height": 123,
         "rawWidth": 751,
         "rawHeight": 123,
-        "borderTop": 0,
+        "borderTop": 66,
-        "borderBottom": 0,
+        "borderBottom": 27,
-        "borderLeft": 0,
+        "borderLeft": 23,
-        "borderRight": 0,
+        "borderRight": 46,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/chat/多边形 1 拷贝 3.png.meta

@@ -50,10 +50,10 @@
         "height": 123,
         "rawWidth": 751,
         "rawHeight": 123,
-        "borderTop": 0,
+        "borderTop": 69,
-        "borderBottom": 0,
+        "borderBottom": 32,
-        "borderLeft": 0,
+        "borderLeft": 50,
-        "borderRight": 0,
+        "borderRight": 38,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/chat/矩形 14.png.meta

@@ -2,22 +2,22 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "2602cfd5-8157-4f34-93c5-faf79f3b73ca",
+  "uuid": "8de6a058-06ab-4713-a448-e7935a56ed28",
   "files": [
-    ".jpg",
+    ".json",
-    ".json"
+    ".png"
   ],
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "2602cfd5-8157-4f34-93c5-faf79f3b73ca@6c48a",
+      "uuid": "8de6a058-06ab-4713-a448-e7935a56ed28@6c48a",
-      "displayName": "角色列表2解锁弹窗",
+      "displayName": "矩形 14",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "2602cfd5-8157-4f34-93c5-faf79f3b73ca",
+        "imageUuidOrDatabaseUri": "8de6a058-06ab-4713-a448-e7935a56ed28",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "2602cfd5-8157-4f34-93c5-faf79f3b73ca@f9941",
+      "uuid": "8de6a058-06ab-4713-a448-e7935a56ed28@f9941",
-      "displayName": "角色列表2解锁弹窗",
+      "displayName": "矩形 14",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -47,9 +47,9 @@
         "trimX": 0,
         "trimY": 0,
         "width": 1080,
-        "height": 2340,
+        "height": 281,
         "rawWidth": 1080,
-        "rawHeight": 2340,
+        "rawHeight": 281,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -540,
-            -1170,
+            -140.5,
             0,
             540,
-            -1170,
+            -140.5,
             0,
             -540,
-            1170,
+            140.5,
             0,
             540,
-            1170,
+            140.5,
             0
           ],
           "indexes": [
@@ -84,9 +84,9 @@
           ],
           "uv": [
             0,
-            2340,
+            281,
             1080,
-            2340,
+            281,
             0,
             0,
             1080,
@@ -104,17 +104,17 @@
           ],
           "minPos": [
             -540,
-            -1170,
+            -140.5,
             0
           ],
           "maxPos": [
             540,
-            1170,
+            140.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "2602cfd5-8157-4f34-93c5-faf79f3b73ca@6c48a",
+        "imageUuidOrDatabaseUri": "8de6a058-06ab-4713-a448-e7935a56ed28@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2602cfd5-8157-4f34-93c5-faf79f3b73ca@6c48a"
+    "redirect": "8de6a058-06ab-4713-a448-e7935a56ed28@6c48a"
   }
 }

assets/resources/ui/chat/矩形 8 拷贝 3.png.meta

@@ -50,10 +50,10 @@
         "height": 83,
         "rawWidth": 83,
         "rawHeight": 83,
-        "borderTop": 0,
+        "borderTop": 26,
-        "borderBottom": 0,
+        "borderBottom": 26,
-        "borderLeft": 0,
+        "borderLeft": 26,
-        "borderRight": 0,
+        "borderRight": 26,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/chat/矩形 8 拷贝 4.png.meta

@@ -50,10 +50,10 @@
         "height": 125,
         "rawWidth": 125,
         "rawHeight": 125,
-        "borderTop": 0,
+        "borderTop": 33,
-        "borderBottom": 0,
+        "borderBottom": 33,
-        "borderLeft": 0,
+        "borderLeft": 33,
-        "borderRight": 0,
+        "borderRight": 33,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/chat/矩形 8 拷贝 5.png.meta

@@ -50,10 +50,10 @@
         "height": 189,
         "rawWidth": 189,
         "rawHeight": 189,
-        "borderTop": 0,
+        "borderTop": 34,
-        "borderBottom": 0,
+        "borderBottom": 34,
-        "borderLeft": 0,
+        "borderLeft": 34,
-        "borderRight": 0,
+        "borderRight": 34,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/common/heart.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@6c48a",
-      "displayName": "组 1",
+      "displayName": "heart",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "25c2e519-b325-4d8b-a471-b2dac08ad6a7@f9941",
-      "displayName": "组 1",
+      "displayName": "heart",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

assets/resources/ui/common/heart_empty.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@6c48a",
-      "displayName": "组 1 拷贝",
+      "displayName": "heart_empty",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "f4e38fe6-4cf2-4f35-9246-f530b0bf4666@f9941",
-      "displayName": "组 1 拷贝",
+      "displayName": "heart_empty",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

assets/resources/ui/common/遮罩.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "fb37cda3-8a01-46a5-949f-cf061a7b4a82",
+  "uuid": "1d3168bf-96a7-46f3-b5b5-757be687597e",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "fb37cda3-8a01-46a5-949f-cf061a7b4a82@6c48a",
+      "uuid": "1d3168bf-96a7-46f3-b5b5-757be687597e@6c48a",
-      "displayName": "图层 4 拷贝",
+      "displayName": "遮罩",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fb37cda3-8a01-46a5-949f-cf061a7b4a82",
+        "imageUuidOrDatabaseUri": "1d3168bf-96a7-46f3-b5b5-757be687597e",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "fb37cda3-8a01-46a5-949f-cf061a7b4a82@f9941",
+      "uuid": "1d3168bf-96a7-46f3-b5b5-757be687597e@f9941",
-      "displayName": "图层 4 拷贝",
+      "displayName": "遮罩",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 102,
+        "width": 865,
-        "height": 89,
+        "height": 256,
-        "rawWidth": 102,
+        "rawWidth": 865,
-        "rawHeight": 89,
+        "rawHeight": 256,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -51,
+            -432.5,
-            -44.5,
+            -128,
             0,
-            51,
+            432.5,
-            -44.5,
+            -128,
             0,
-            -51,
+            -432.5,
-            44.5,
+            128,
             0,
-            51,
+            432.5,
-            44.5,
+            128,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            89,
+            256,
-            102,
+            865,
-            89,
+            256,
             0,
             0,
-            102,
+            865,
             0
           ],
           "nuv": [
@@ -103,18 +103,18 @@
             1
           ],
           "minPos": [
-            -51,
+            -432.5,
-            -44.5,
+            -128,
             0
           ],
           "maxPos": [
-            51,
+            432.5,
-            44.5,
+            128,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "fb37cda3-8a01-46a5-949f-cf061a7b4a82@6c48a",
+        "imageUuidOrDatabaseUri": "1d3168bf-96a7-46f3-b5b5-757be687597e@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fb37cda3-8a01-46a5-949f-cf061a7b4a82@6c48a"
+    "redirect": "1d3168bf-96a7-46f3-b5b5-757be687597e@6c48a"
   }
 }

assets/resources/ui/girl_detail/矩形 10 拷贝.png.meta

@@ -50,10 +50,10 @@
         "height": 80,
         "rawWidth": 58,
         "rawHeight": 80,
-        "borderTop": 0,
+        "borderTop": 2,
-        "borderBottom": 0,
+        "borderBottom": 20,
-        "borderLeft": 0,
+        "borderLeft": 2,
-        "borderRight": 0,
+        "borderRight": 20,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/girl_detail/矩形 3 拷贝 4.png.meta

@@ -50,10 +50,10 @@
         "height": 80,
         "rawWidth": 80,
         "rawHeight": 80,
-        "borderTop": 0,
+        "borderTop": 20,
-        "borderBottom": 0,
+        "borderBottom": 20,
-        "borderLeft": 0,
+        "borderLeft": 20,
-        "borderRight": 0,
+        "borderRight": 20,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/girl_detail/矩形 3 拷贝.png.meta

@@ -50,10 +50,10 @@
         "height": 106,
         "rawWidth": 106,
         "rawHeight": 106,
-        "borderTop": 0,
+        "borderTop": 25,
-        "borderBottom": 0,
+        "borderBottom": 25,
-        "borderLeft": 0,
+        "borderLeft": 25,
-        "borderRight": 0,
+        "borderRight": 25,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/girl_detail/矩形 6.png.meta

@@ -50,10 +50,10 @@
         "height": 146,
         "rawWidth": 541,
         "rawHeight": 146,
-        "borderTop": 0,
+        "borderTop": 27,
-        "borderBottom": 0,
+        "borderBottom": 27,
-        "borderLeft": 0,
+        "borderLeft": 27,
-        "borderRight": 0,
+        "borderRight": 27,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/girl_detail/遮罩.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "d5aa44e9-a6e4-4570-bfba-238a902ca222",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "d5aa44e9-a6e4-4570-bfba-238a902ca222@6c48a",
+      "displayName": "遮罩",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "d5aa44e9-a6e4-4570-bfba-238a902ca222",
+        "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": "d5aa44e9-a6e4-4570-bfba-238a902ca222@f9941",
+      "displayName": "遮罩",
+      "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": "d5aa44e9-a6e4-4570-bfba-238a902ca222@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "d5aa44e9-a6e4-4570-bfba-238a902ca222@6c48a"
+  }
+}

assets/resources/ui/girls_list_pop/矩形 11 拷贝 3.png.meta

@@ -50,10 +50,10 @@
         "height": 124,
         "rawWidth": 136,
         "rawHeight": 124,
-        "borderTop": 0,
+        "borderTop": 25,
-        "borderBottom": 0,
+        "borderBottom": 53,
-        "borderLeft": 0,
+        "borderLeft": 53,
-        "borderRight": 0,
+        "borderRight": 53,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/girls_list_pop/矩形 11 拷贝.png.meta

@@ -50,10 +50,10 @@
         "height": 151,
         "rawWidth": 151,
         "rawHeight": 151,
-        "borderTop": 0,
+        "borderTop": 53,
-        "borderBottom": 0,
+        "borderBottom": 53,
-        "borderLeft": 0,
+        "borderLeft": 53,
-        "borderRight": 0,
+        "borderRight": 53,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/login/矩形 1 拷贝 2.png.meta

@@ -52,8 +52,8 @@
         "rawHeight": 37,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
+        "borderLeft": 26,
-        "borderRight": 0,
+        "borderRight": 26,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/shop/矩118.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "8c1563d7-04b7-4129-98e1-dfe8995fa4e0",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "8c1563d7-04b7-4129-98e1-dfe8995fa4e0@6c48a",
+      "displayName": "矩118",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "8c1563d7-04b7-4129-98e1-dfe8995fa4e0",
+        "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": "8c1563d7-04b7-4129-98e1-dfe8995fa4e0@f9941",
+      "displayName": "矩118",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 361,
+        "height": 108,
+        "rawWidth": 361,
+        "rawHeight": 108,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -180.5,
+            -54,
+            0,
+            180.5,
+            -54,
+            0,
+            -180.5,
+            54,
+            0,
+            180.5,
+            54,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            108,
+            361,
+            108,
+            0,
+            0,
+            361,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -180.5,
+            -54,
+            0
+          ],
+          "maxPos": [
+            180.5,
+            54,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "8c1563d7-04b7-4129-98e1-dfe8995fa4e0@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "8c1563d7-04b7-4129-98e1-dfe8995fa4e0@6c48a"
+  }
+}

assets/resources/ui/theme/矩形 1 拷贝 3.png.meta

@@ -50,10 +50,10 @@
         "height": 89,
         "rawWidth": 90,
         "rawHeight": 89,
-        "borderTop": 0,
+        "borderTop": 34,
-        "borderBottom": 0,
+        "borderBottom": 34,
-        "borderLeft": 0,
+        "borderLeft": 34,
-        "borderRight": 0,
+        "borderRight": 34,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

assets/resources/ui/theme/矩形 2 拷贝.png.meta

@@ -52,8 +52,8 @@
         "rawHeight": 67,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
+        "borderLeft": 28,
-        "borderRight": 0,
+        "borderRight": 28,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,