Merge remote-tracking branch 'origin/master'

assets/Bundles/HomeScene/HomeScene.scene

@@ -478,7 +478,7 @@
       "y": -180,
       "z": -12.000012657215834
     },
-    "_id": "862inAURhGc6/a5pdr+6E7"
+    "_id": "e5yCjA/fBHQqB0Ynz3XmQ/"
   },
   {
     "__type__": "cc.UITransform",
@@ -500,7 +500,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "aawpMD3ItDYpGy3/WFLKWq"
+    "_id": "aep5EZeoFDNKlALem7PtqZ"
   },
   {
     "__type__": "cc.Sprite",
@@ -536,7 +536,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "a5NOBxC8VOyKg6POw1HhC8"
+    "_id": "56XdQn5DNLpru3gZCxTHuC"
   },
   {
     "__type__": "cc.Node",
@@ -584,7 +584,7 @@
       "y": -180,
       "z": -11.00000220913452
     },
-    "_id": "d7EQDYWQtAirNFX/hsQFtt"
+    "_id": "95Epc+aRNJtbk++8rW293G"
   },
   {
     "__type__": "cc.UITransform",
@@ -606,7 +606,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "b0u8i9HxpAL49LWvlO9zuT"
+    "_id": "f3nohNwk9CYrezNbl/59VD"
   },
   {
     "__type__": "cc.Sprite",
@@ -642,7 +642,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "84eRsEvblK/KU1fKYLh+xu"
+    "_id": "90lPl+nVdDSabEAZTXBAFV"
   },
   {
     "__type__": "cc.Node",
@@ -690,7 +690,7 @@
       "y": -180,
       "z": -64.00000614258742
     },
-    "_id": "04a9sAqy9P65K057mAJIw9"
+    "_id": "fciGIB1udHUJxd72cAVPWE"
   },
   {
     "__type__": "cc.UITransform",
@@ -712,7 +712,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "4bBNy0JDlBHI3zOTOkg2fJ"
+    "_id": "eehDHpEM5G5agLMWMA5Sre"
   },
   {
     "__type__": "cc.Sprite",
@@ -748,7 +748,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "66PlNAbyFBnrg17Bdhi6RW"
+    "_id": "b0qGl0MRpIG5c302aFTvyK"
   },
   {
     "__type__": "cc.Node",
@@ -796,7 +796,7 @@
       "y": 180,
       "z": 25.99999385741257
     },
-    "_id": "8e5ShR1PpHUrVnS11KvScn"
+    "_id": "feimniHO9HoYMwQId7pwTr"
   },
   {
     "__type__": "cc.UITransform",
@@ -818,7 +818,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "20kKVhuNFDvr6/16/ez1Oz"
+    "_id": "760O/SJ79HwreRPPbJXhlu"
   },
   {
     "__type__": "cc.Sprite",
@@ -854,7 +854,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "bfxmQi//dAB6i6paIlUNYs"
+    "_id": "daRP4utA1MzaBacM0BhGFz"
   },
   {
     "__type__": "cc.UITransform",

assets/Bundles/RankScene/png/奖励品1.png.meta → assets/Bundles/RankScene/png/奖励品.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "ce259195-d60f-4500-af25-cf991cc1799e",
+  "uuid": "91db920b-9a31-4d63-a1ba-7e08c6d2c492",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a",
-      "displayName": "奖励品1",
+      "uuid": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@6c48a",
+      "displayName": "奖励品",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ce259195-d60f-4500-af25-cf991cc1799e",
+        "imageUuidOrDatabaseUri": "91db920b-9a31-4d63-a1ba-7e08c6d2c492",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "ce259195-d60f-4500-af25-cf991cc1799e@f9941",
-      "displayName": "奖励品1",
+      "uuid": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@f9941",
+      "displayName": "奖励品",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a",
+        "imageUuidOrDatabaseUri": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ce259195-d60f-4500-af25-cf991cc1799e@6c48a"
+    "redirect": "91db920b-9a31-4d63-a1ba-7e08c6d2c492@6c48a"
   }
 }

assets/Bundles/RankScene/png/奖励品2-10.png.meta

-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "31aefadb-7170-4150-bcf0-df0851c8e734",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a",
-      "displayName": "奖励品2-10",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "31aefadb-7170-4150-bcf0-df0851c8e734",
-        "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": "31aefadb-7170-4150-bcf0-df0851c8e734@f9941",
-      "displayName": "奖励品2-10",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 200,
-        "height": 300,
-        "rawWidth": 200,
-        "rawHeight": 300,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -100,
-            -150,
-            0,
-            100,
-            -150,
-            0,
-            -100,
-            150,
-            0,
-            100,
-            150,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            300,
-            200,
-            300,
-            0,
-            0,
-            200,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -100,
-            -150,
-            0
-          ],
-          "maxPos": [
-            100,
-            150,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "31aefadb-7170-4150-bcf0-df0851c8e734@6c48a"
-  }
-}

assets/Bundles/RankScene/prefab/FriendRankItem.prefab

@@ -68,7 +68,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "length",
+    "_name": "rank",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -92,8 +92,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 206.97799999999995,
-      "y": 1.1368683772161603e-13,
+      "x": -311.627,
+      "y": -0.1999999999999318,
       "z": 0
     },
     "_lrot": {
@@ -133,7 +133,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
+      "width": 16.6845703125,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -145,7 +145,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "9ecsZFTlVLYodszU2jCcwg"
+    "fileId": "6avPcoO59FS5LSYlL93oGO"
   },
   {
     "__type__": "cc.Label",
@@ -169,7 +169,7 @@
       "b": 0,
       "a": 255
     },
-    "_string": "超过xx长度的玩家数",
+    "_string": "1",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
@@ -213,7 +213,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "688U9sYXJI85JrKZ68pxlH"
+    "fileId": "abdqjtGXtJnYl0DKkEhSUD"
   },
   {
     "__type__": "cc.Widget",
@@ -227,11 +227,11 @@
     "__prefab": {
       "__id__": 8
     },
-    "_alignFlags": 8,
+    "_alignFlags": 9,
     "_target": null,
-    "_left": 471.97799999999995,
+    "_left": 80.03071484374999,
     "_right": 0,
-    "_top": 0,
+    "_top": -6.750155989720952e-14,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -249,7 +249,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f48ev5ZiZKio+z89L+JPnO"
+    "fileId": "c8TCeIRD5BP4M130pL/3YZ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -259,7 +259,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "da0euZuE1HaYwFfn35L7eZ",
+    "fileId": "19UcNA0AZLQogeRF6vASaC",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -290,7 +290,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -140,
+      "x": -80,
       "y": 1.1368683772161603e-13,
       "z": 0
     },
@@ -343,7 +343,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0aDCBp/nBH5avdETc722TH"
+    "fileId": "bdtUCfF4FNEJe0bl9+j+Te"
   },
   {
     "__type__": "cc.Label",
@@ -411,7 +411,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "16n1hv1yxIsIWt/pc48t8G"
+    "fileId": "1dcfSMEgdA+oYvQyD9v2IN"
   },
   {
     "__type__": "cc.Widget",
@@ -427,7 +427,7 @@
     },
     "_alignFlags": 8,
     "_target": null,
-    "_left": 230,
+    "_left": 290,
     "_right": 0,
     "_top": 0,
     "_bottom": 0,
@@ -447,7 +447,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d6PKYyfX9BAZme/edu97eo"
+    "fileId": "f0dKHTzl9GD7P7ElKIHK75"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -457,14 +457,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "60Ma3Z8CBDZ4ltTvumb0ql",
+    "fileId": "97U6ox/IBNaq4gCOkWrtCc",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "rank",
+    "_name": "length",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -488,8 +488,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -340,
-      "y": -0.1999999999999993,
+      "x": 206.97799999999995,
+      "y": 1.1368683772161603e-13,
       "z": 0
     },
     "_lrot": {
@@ -529,7 +529,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
+      "width": 270,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -541,7 +541,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "99UkYPjyBPo6BMY+EZrvT8"
+    "fileId": "5erpOthtNJjrstPS7ppmvp"
   },
   {
     "__type__": "cc.Label",
@@ -565,7 +565,7 @@
       "b": 0,
       "a": 255
     },
-    "_string": "排行",
+    "_string": "超过xx长度的玩家数",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
@@ -609,7 +609,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "9cyjxJ+FlPMawHb9j5ctTe"
+    "fileId": "62TdxJRTpHaIUhEjq0HWtl"
   },
   {
     "__type__": "cc.Widget",
@@ -623,9 +623,9 @@
     "__prefab": {
       "__id__": 24
     },
-    "_alignFlags": 9,
+    "_alignFlags": 8,
     "_target": null,
-    "_left": 30,
+    "_left": 471.97799999999995,
     "_right": 0,
     "_top": 0,
     "_bottom": 0,
@@ -645,7 +645,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d6RucsS9BFda2VSLyU7wME"
+    "fileId": "45mZhbgmBGZp5atNM0YhlU"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -655,7 +655,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "42UxMRUB1KpY2W70MmutuD",
+    "fileId": "a5kFYO5f9HzYhjzOjvm2Xn",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null

assets/Bundles/RankScene/prefab/SingleRankItem.prefab

@@ -92,8 +92,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -212.127,
-      "y": -1.6999999999999318,
+      "x": -235.5,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -133,7 +133,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 16.6845703125,
+      "width": 63.3837890625,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -145,10 +145,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b4ugP7eY1LS4fQ0SuQ2YHk"
+    "fileId": "e4JFNhYSlBibE/E7Ru5unj"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -159,6 +159,42 @@
     "__prefab": {
       "__id__": 6
     },
+    "_alignFlags": 10,
+    "_target": null,
+    "_left": 33.30810546875,
+    "_right": 0,
+    "_top": 0,
+    "_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": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "92ANvFidhCvKtxMh+7zEv7"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
@@ -169,7 +205,7 @@
       "b": 0,
       "a": 255
     },
-    "_string": "1",
+    "_string": "label",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
@@ -213,43 +249,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "46Ju95znxMWKUtvIHqevZZ"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 8
-    },
-    "_alignFlags": 9,
-    "_target": null,
-    "_left": 80.03071484374999,
-    "_right": 0,
-    "_top": -6.750155989720952e-14,
-    "_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": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "50XE2kSHtPoqHVAl3nBP53"
+    "fileId": "64cCQe+WdAkbI5Qbz9MvXn"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -259,7 +259,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "78kE6VX99I54juzgggDrSw",
+    "fileId": "aeGurxoslOjZTn0PsVo8vD",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -290,8 +290,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 19.5,
-      "y": 1.1368683772161603e-13,
+      "x": -134.94499999999994,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -331,22 +331,22 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
+      "width": 63.3837890625,
       "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "182kTjp35Bg6r683Z1rtGK"
+    "fileId": "4cLneOSadMlKWfUwa9Dlni"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -357,6 +357,42 @@
     "__prefab": {
       "__id__": 14
     },
+    "_alignFlags": 9,
+    "_target": null,
+    "_left": 165.55500000000006,
+    "_right": 0,
+    "_top": -1.6999999999999993,
+    "_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": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a7b55bUqxED60p/a/INwY/"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
@@ -367,7 +403,7 @@
       "b": 0,
       "a": 255
     },
-    "_string": "省份",
+    "_string": "label",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
@@ -411,43 +447,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "adLN57OfxBwbMVCA3FdOpa"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 16
-    },
-    "_alignFlags": 8,
-    "_target": null,
-    "_left": 290,
-    "_right": 0,
-    "_top": 0,
-    "_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": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "5bLK9akQVK+ZPui6b9LgzT"
+    "fileId": "63mfnWMBJOdocwUnvORvv1"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -457,7 +457,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "871pE7dPBJaa7XidfwnOsp",
+    "fileId": "d71zOgndtM6a6MoD+t+Pue",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -488,8 +488,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 306.47799999999995,
-      "y": 1.1368683772161603e-13,
+      "x": 190.20885937499997,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -529,7 +529,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
+      "width": 63.3837890625,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -541,10 +541,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "35DjRK3LZPtYbwqB2KlEtw"
+    "fileId": "50JknmajhAJbgqmir58/Ec"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -555,6 +555,42 @@
     "__prefab": {
       "__id__": 22
     },
+    "_alignFlags": 8,
+    "_target": null,
+    "_left": 459.01696484375,
+    "_right": 0,
+    "_top": 0,
+    "_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": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "499Wuy86NJ8I1xdrfTphVm"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 24
+    },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
@@ -565,7 +601,7 @@
       "b": 0,
       "a": 255
     },
-    "_string": "超过xx长度的玩家数",
+    "_string": "label",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
@@ -609,43 +645,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6dk85x6ulPtbcUkK97It3K"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 18
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 24
-    },
-    "_alignFlags": 8,
-    "_target": null,
-    "_left": 471.97799999999995,
-    "_right": 0,
-    "_top": 0,
-    "_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": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f1ambxKf1KPbWt6VLgCXFm"
+    "fileId": "76egWYpxVHmrC1qPoI2xs5"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -655,7 +655,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "caIrtNL+pJfq253sm009/6",
+    "fileId": "7bUkqgPWNHwLXEfr3mYE8/",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null

assets/Scripts/Scenes/RankScene.ts

-import { _decorator, Button, Component, Label, Node, } from 'cc';
-import { observer } from '../store/decorators';
+import { _decorator, Button, Component, Label, Node, Size, Sprite, } from 'cc';
+import { observer, render } from '../store/decorators';
 import Scene from '../../Module/Scene';
-import { changeScene } from '../../Module/UIFast';
-import { _asyncThrottle } from '../Utils/Utils';
+import { changeScene, hideWaiting, showWaiting } from '../../Module/UIFast';
+import { _asyncThrottle, strFormat } from '../Utils/Utils';
 import { HomeScene } from './HomeScene';
 import { sendWebNet, WebNetName } from '../Utils/WebNet/WebNet';
-import { YXCollectionView, YXIndexPath } from '../../Component/YXList/lib';
+import { YXCollectionView, YXFlowLayout, YXIndexPath } from '../../Component/YXList/lib';
 const { ccclass, property } = _decorator;
 
 enum TAB {
@@ -41,6 +41,13 @@ export class RankScence extends Scene {
   @property(Node) Single_MY: Node = null;
   @property(Node) Friend_MY: Node = null;
 
+  @property(Sprite) leftPirzeImg: Sprite = null;
+  @property(Label) leftPirzeName: Label = null;
+  @property(Label) leftRank: Label = null;
+  @property(Sprite) rightPirzeImg: Sprite = null;
+  @property(Label) rightPirzeName: Label = null;
+  @property(Label) rightRank: Label = null;
+
 
   private _tab: TAB = TAB.SINGLE;
   set tab(tab: TAB) { // 设置tab切换
@@ -70,6 +77,7 @@ export class RankScence extends Scene {
   shengDate: any[] = [];
   singleDate: any[] = [];
   friendDate: any[] = [];
+
   onLoad() {
     this.tab = TAB.SINGLE;
 
@@ -81,7 +89,42 @@ export class RankScence extends Scene {
   }
 
 
-  start() {
+  async start() {
+    // 省榜
+    this.Sheng_List.numberOfItems = () => this.shengDate.length;
+    this.Sheng_List.onCellDisplay = this.onShengCellDisplay;
+
+    const shengLayout = new YXFlowLayout();
+    shengLayout.itemSize = new Size(800, 50);
+    this.Sheng_List.layout = shengLayout;
+    this.Sheng_List.reloadData();
+
+    // 个人榜
+    this.Single_List.numberOfItems = () => this.singleDate.length;
+    this.Single_List.onCellDisplay = this.onSingleCellDisplay;
+
+    const singleLayout = new YXFlowLayout();
+    singleLayout.itemSize = new Size(607, 47);
+    this.Single_List.layout = singleLayout;
+    this.Single_List.reloadData();
+
+    // 好友榜
+    this.Friend_List.numberOfItems = () => this.friendDate.length;
+    this.Friend_List.onCellDisplay = this.onFriendellDisplay;
+
+    const friendLayout = new YXFlowLayout();
+    friendLayout.itemSize = new Size(800, 50);
+    this.Friend_List.layout = friendLayout;
+    this.Friend_List.reloadData();
+
+
+    showWaiting(true);
+    await Promise.all([
+      this.updateSheng(),
+      this.updateSingle(),
+      this.updateFriend(),
+    ]);
+    hideWaiting();
 
   }
 
@@ -120,9 +163,9 @@ export class RankScence extends Scene {
     const { success, data } = await sendWebNet(WebNetName.shengRank);
     if (!success) return;
 
-    this.shengDate = data.rankList;
+    this.shengDate = data.rankInfos;
     this.Sheng_List.reloadData();
-    this.onCellDisplay(this.Sheng_MY, data.myRank);
+    this.onCellDisplay(this.Sheng_MY, data.myRankInfo);
 
     this.Sheng_List.node.active = this.shengDate.length > 0;
     // this.dailyNoOne.active = this.dailyData.length <= 0; // 如果没有数据隐藏
@@ -133,11 +176,22 @@ export class RankScence extends Scene {
     const { success, data } = await sendWebNet(WebNetName.singleRank);
     if (!success) return;
 
-    this.shengDate = data.rankList;
-    this.Sheng_List.reloadData();
-    this.onCellDisplay(this.Sheng_MY, data.myRank);
+    // this.rightPirzeImg = data.prizeImg;
+    const { awardConfigs = [] } = data;
+    if (awardConfigs.length > 0) {
+      this.leftPirzeImg.spriteFrame = awardConfigs[0].prizeImage;
+      this.leftPirzeName.string = strFormat(awardConfigs[0].prizeName, 12);
+      this.leftRank.string = awardConfigs[0].rankRange;
+      this.rightPirzeImg.spriteFrame = awardConfigs[1].prizeImage;
+      this.rightPirzeName.string = strFormat(awardConfigs[1].prizeName, 12);
+      this.rightRank.string = awardConfigs[1].rankRange;
+    }
 
-    this.Sheng_List.node.active = this.shengDate.length > 0;
+    this.singleDate = data.rankInfos;
+    this.Single_List.reloadData();
+    this.onCellDisplay(this.Single_MY, data.myRankInfo);
+
+    this.Single_List.node.active = this.singleDate.length > 0;
   }
 
   // 刷新好友榜
@@ -145,38 +199,46 @@ export class RankScence extends Scene {
     const { success, data } = await sendWebNet(WebNetName.friendRank);
     if (!success) return;
 
-    this.shengDate = data.rankList;
-    this.Sheng_List.reloadData();
-    this.onCellDisplay(this.Sheng_MY, data.myRank);
+    this.friendDate = data.rankInfos;
+    this.Friend_List.reloadData();
+    this.onCellDisplay(this.Friend_MY, data.myRankInfo);
 
-    this.Sheng_List.node.active = this.shengDate.length > 0;
+    this.Friend_List.node.active = this.friendDate.length > 0;
   }
 
   // 给每个cell设置数据
-  onDailyCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
+  onShengCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
     const data = this.shengDate[indexPath.item];
     this.onCellDisplay(cell, data);
   }
+  onSingleCellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
+    const data = this.singleDate[indexPath.item];
+    this.onCellDisplay(cell, data);
+  }
+  onFriendellDisplay = (cell: Node, indexPath: YXIndexPath, collectionView: YXCollectionView) => {
+    const data = this.friendDate[indexPath.item];
+    this.onCellDisplay(cell, data);
+  }
 
   onCellDisplay = (cell: Node, data) => {
-    let { rank, nickname, score } = data;
-
-    let rankTxt = rank;
-    if (!rank) {
-      if (score) {
-        rankTxt = "1000+";
-      } else {
-        rankTxt = "-";
-      }
+    let { index = 0, province = "", score = 0, nickname = "" } = data;
+
+    let rankTxt = index;
+
+    if (!index) {
+      rankTxt = "-";
+
     } else {
-      if (rank > 1000) {
-        rankTxt = "1000+";
+      if (index > 200) {
+        rankTxt = "200+";
       }
     }
+
+
     cell.getChildByName(`rank`).getComponent(Label).string = rankTxt;
 
-    cell.getChildByName(`sheng`).getComponent(Label).string = nickname || "***";
-    cell.getChildByName(`length`).getComponent(Label).string = score || "0";
+    cell.getChildByName(`sheng`).getComponent(Label).string = province || strFormat(`${nickname || "鸣鸣很忙用户"}`, 12);
+    cell.getChildByName(`length`).getComponent(Label).string = (score > 99999999 ? "99999999+" : score) || "0";
   }
 
 }

preview-template/mock/rank/friendRank.do.json

+{
+  "code": "ullamco deserunt dolor consectetur proident",
+  "data": {
+    "myRankInfo": {
+      "index": 279,
+      "score": 948,
+      "nickname": "好友的我的",
+      "avatar": "sint dolore ipsum"
+    },
+    "rankInfos": [
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 133
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友的222hes",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 3
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友22的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 31
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友e34的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 3193
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友e34的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 3193
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友e34的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 3193
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友54343的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 31999993133
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友543的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 3133
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好友543的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 3133
+      },
+      {
+        "index": 71550217.96398076,
+        "nickname": "好111友的inches",
+        "avatar": 77785740.50943324,
+        "meFlag": false,
+        "score": 75699
+      },
+      {
+        "index": 85111,
+        "nickname": "我的无奈为何方便接",
+        "avatar": -65807613.98292343,
+        "meFlag": false,
+        "score": 875745
+      }
+    ]
+  },
+  "message": "dolore in cupidatat id incididunt",
+  "success": true
+}
\ No newline at end of file