future 1 年之前
父節點
當前提交
744e9813b3

+ 216 - 51
assets/resources/ui/bag_avatar_preview.prefab

@@ -25,26 +25,26 @@
         "__id__": 10
       },
       {
-        "__id__": 62
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 74
       },
       {
-        "__id__": 70
+        "__id__": 76
       },
       {
-        "__id__": 72
+        "__id__": 78
       },
       {
-        "__id__": 74
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -267,19 +267,22 @@
       },
       {
         "__id__": 43
+      },
+      {
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 63
       },
       {
-        "__id__": 59
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -334,7 +337,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 441.536,
+      "y": 350,
       "z": 0
     },
     "_lrot": {
@@ -497,7 +500,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 41,
+      "y": 57,
       "z": 0
     },
     "_lrot": {
@@ -509,8 +512,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1.7,
-      "y": 1.7,
+      "x": 1.4,
+      "y": 1.4,
       "z": 1
     },
     "_mobility": 0,
@@ -1037,6 +1040,165 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 10
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 46
+      }
+    ],
+    "_prefab": {
+      "__id__": 48
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -157,
+      "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__": 43
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 45
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 700,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ee3h7J9VxMiJCY/RLSlKVi"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 43
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 47
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 80,
+      "g": 121,
+      "b": 237,
+      "a": 255
+    },
+    "_string": "默认头像框",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d1iZpJomtB7o7CAf/+YpKm"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "eb7qrSwUlLD4NKd64yqNXM",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.Node",
     "_name": "btn_true",
@@ -1047,28 +1209,28 @@
     },
     "_children": [
       {
-        "__id__": 44
+        "__id__": 50
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 56
       },
       {
-        "__id__": 52
+        "__id__": 58
       },
       {
-        "__id__": 54
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -420,
+      "y": -326,
       "z": 0
     },
     "_lrot": {
@@ -1100,20 +1262,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 43
+      "__id__": 49
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 51
       },
       {
-        "__id__": 47
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 55
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1150,11 +1312,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 52
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1178,11 +1340,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 54
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1259,11 +1421,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 57
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1287,11 +1449,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 59
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1332,11 +1494,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 61
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1388,7 +1550,7 @@
     "_duration": 0.1,
     "_zoomScale": 0.9,
     "_target": {
-      "__id__": 43
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1419,12 +1581,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 980,
-      "height": 1052
+      "width": 860,
+      "height": 844
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1447,7 +1609,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1507,14 +1669,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 69
       },
       {
-        "__id__": 65
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1551,11 +1713,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1579,11 +1741,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 72
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1641,7 +1803,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1669,7 +1831,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 77
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1705,7 +1867,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 79
     },
     "img_avatar": {
       "__id__": 19
@@ -1713,11 +1875,14 @@
     "img_avatar_border": {
       "__id__": 34
     },
+    "lab_name": {
+      "__id__": 43
+    },
     "btn_close": {
-      "__id__": 62
+      "__id__": 68
     },
     "btn_true": {
-      "__id__": 43
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1735,7 +1900,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 81
     },
     "_id": ""
   },

+ 14 - 14
assets/resources/ui/home.prefab

@@ -149,7 +149,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -296,7 +296,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 244.9999999999999,
+      "y": 245,
       "z": 0
     },
     "_lrot": {
@@ -662,8 +662,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -422,
-      "y": -75,
+      "x": -393,
+      "y": -74,
       "z": 0
     },
     "_lrot": {
@@ -719,8 +719,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 17,
-      "y": 11,
+      "x": 0,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -813,8 +813,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
-      "height": 172
+      "width": 185,
+      "height": 190
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -932,8 +932,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
-      "height": 172
+      "width": 185,
+      "height": 190
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1272,7 +1272,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 44,
+      "x": 72,
       "y": -27,
       "z": 0
     },
@@ -1577,7 +1577,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 44,
+      "x": 72,
       "y": -117.03,
       "z": 0
     },
@@ -4725,7 +4725,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -959.9999999999999,
+      "y": -960,
       "z": 0
     },
     "_lrot": {
@@ -14246,7 +14246,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

File diff suppressed because it is too large
+ 233 - 155
assets/resources/ui/rank.prefab


+ 138 - 60
assets/resources/ui/rank_list_item.prefab

@@ -28,29 +28,29 @@
         "__id__": 26
       },
       {
-        "__id__": 52
+        "__id__": 56
       },
       {
-        "__id__": 58
+        "__id__": 62
       },
       {
-        "__id__": 64
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 74
       },
       {
-        "__id__": 72
+        "__id__": 76
       },
       {
-        "__id__": 74
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -692,22 +692,22 @@
         "__id__": 27
       },
       {
-        "__id__": 43
+        "__id__": 45
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 55
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -177,
-      "y": 8,
+      "y": 15,
       "z": 0
     },
     "_lrot": {
@@ -756,15 +756,18 @@
       },
       {
         "__id__": 40
+      },
+      {
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -857,8 +860,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 117,
-      "height": 117
+      "width": 110,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -976,8 +979,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 117,
-      "height": 117
+      "width": 110,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1057,6 +1060,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "10Npe2ZnpJEJ8eU9X/F2Ew"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 27
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 43
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 10,
+    "_right": 10,
+    "_top": 10,
+    "_bottom": 10,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 125,
+    "_originalHeight": 125,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "88gps6EJVGPb1PcBxUTElb"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1082,19 +1121,22 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 46
+        "__id__": 48
+      },
+      {
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -9,
-      "y": -4,
+      "x": 0,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -1126,16 +1168,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 145,
-      "height": 145
+      "width": 130,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1154,11 +1196,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1193,6 +1235,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "6cu9sEk9FHdKTfEdxOu5zA"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 45
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 51
+    },
+    "_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": 145,
+    "_originalHeight": 145,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "727mndiPFFeJnl3ya6uklL"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1216,12 +1294,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 54
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 145,
-      "height": 145
+      "width": 130,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1259,14 +1337,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 57
       },
       {
-        "__id__": 55
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 61
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1303,11 +1381,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 56
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 58
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1331,11 +1409,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 56
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 60
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1418,14 +1496,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 63
       },
       {
-        "__id__": 61
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1462,11 +1540,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1490,11 +1568,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1577,14 +1655,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 69
       },
       {
-        "__id__": 67
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1621,11 +1699,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1649,11 +1727,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 72
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1708,7 +1786,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1736,7 +1814,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 77
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1781,7 +1859,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 79
     },
     "lab_number": {
       "__id__": 3
@@ -1790,16 +1868,16 @@
       "__id__": 28
     },
     "img_avatar_border": {
-      "__id__": 43
+      "__id__": 45
     },
     "lab_nickname": {
-      "__id__": 52
+      "__id__": 56
     },
     "lab_score": {
-      "__id__": 58
+      "__id__": 62
     },
     "img_car": {
-      "__id__": 64
+      "__id__": 68
     },
     "region_bg": {
       "__id__": 14

+ 9 - 9
assets/resources/ui/user_info_view.prefab

@@ -412,8 +412,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -400.611,
-      "y": 25,
+      "x": -412.611,
+      "y": 47,
       "z": 0
     },
     "_lrot": {
@@ -469,8 +469,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 17,
-      "y": 9,
+      "x": 0,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -563,8 +563,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
-      "height": 172
+      "width": 185,
+      "height": 190
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -682,8 +682,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 172,
-      "height": 172
+      "width": 185,
+      "height": 190
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1370,7 +1370,7 @@
         "__id__": 56
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 62

+ 1 - 0
assets/script/ui/bag/bag_avatar_preview.ts

@@ -8,6 +8,7 @@ const { ccclass, property } = _decorator;
 export class bag_avatar_preview extends base_ui {
     @property(Node) img_avatar:Node = null
     @property(Node) img_avatar_border:Node = null
+    @property(Node) lab_name:Node = null
     @property(Node) btn_close:Node = null
     @property(Node) btn_true:Node = null
     private m_true_cb = null

二進制
assets/texture/ui/public/public_avatar_border.png


+ 36 - 36
assets/texture/ui/public/public_avatar_border.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -15,
-        "offsetY": -12,
-        "trimX": 12,
-        "trimY": 30,
-        "width": 213,
-        "height": 218,
-        "rawWidth": 267,
-        "rawHeight": 254,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 357,
+        "height": 360,
+        "rawWidth": 357,
+        "rawHeight": 360,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -106.5,
-            -109,
+            -178.5,
+            -180,
             0,
-            106.5,
-            -109,
+            178.5,
+            -180,
             0,
-            -106.5,
-            109,
+            -178.5,
+            180,
             0,
-            106.5,
-            109,
+            178.5,
+            180,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            12,
-            224,
-            225,
-            224,
-            12,
-            6,
-            225,
-            6
+            0,
+            360,
+            357,
+            360,
+            0,
+            0,
+            357,
+            0
           ],
           "nuv": [
-            0.0449438202247191,
-            0.023622047244094488,
-            0.8426966292134831,
-            0.023622047244094488,
-            0.0449438202247191,
-            0.8818897637795275,
-            0.8426966292134831,
-            0.8818897637795275
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
-            -106.5,
-            -109,
+            -178.5,
+            -180,
             0
           ],
           "maxPos": [
-            106.5,
-            109,
+            178.5,
+            180,
             0
           ]
         },

二進制
assets/texture/ui/public/public_popup_bg_2.png


+ 22 - 22
assets/texture/ui/public/public_popup_bg_2.png.meta

@@ -46,10 +46,10 @@
         "offsetY": -1.5,
         "trimX": 0,
         "trimY": 3,
-        "width": 980,
-        "height": 1052,
-        "rawWidth": 980,
-        "rawHeight": 1055,
+        "width": 860,
+        "height": 844,
+        "rawWidth": 860,
+        "rawHeight": 847,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -490,
-            -526,
+            -430,
+            -422,
             0,
-            490,
-            -526,
+            430,
+            -422,
             0,
-            -490,
-            526,
+            -430,
+            422,
             0,
-            490,
-            526,
+            430,
+            422,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            1052,
-            980,
-            1052,
+            844,
+            860,
+            844,
             0,
             0,
-            980,
+            860,
             0
           ],
           "nuv": [
@@ -98,18 +98,18 @@
             1,
             0,
             0,
-            0.9971563981042654,
+            0.9964580873671782,
             1,
-            0.9971563981042654
+            0.9964580873671782
           ],
           "minPos": [
-            -490,
-            -526,
+            -430,
+            -422,
             0
           ],
           "maxPos": [
-            490,
-            526,
+            430,
+            422,
             0
           ]
         },

Some files were not shown because too many files changed in this diff