future 1 år sedan
förälder
incheckning
07f0fe18f4

+ 14 - 0
assets/resources/font/aaa.fnt

@@ -0,0 +1,14 @@
+info face="楷体" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=4,4,4,4 spacing=2,2 outline=0
+common lineHeight=33 base=28 scaleW=510 scaleH=80 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0
+page id=0 file="aaa_0.png"
+chars count=10
+char id=48   x=0     y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=49   x=51    y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=50   x=102   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=51   x=153   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=52   x=204   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=53   x=255   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=54   x=306   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=55   x=357   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=56   x=408   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15
+char id=57   x=459   y=0     width=49    height=65    xoffset=-4    yoffset=-4    xadvance=41    page=0  chnl=15

+ 132 - 0
assets/resources/font/aaa.fnt.meta

@@ -0,0 +1,132 @@
+{
+  "ver": "1.0.6",
+  "importer": "bitmap-font",
+  "imported": true,
+  "uuid": "4ab09250-9e6e-4fc6-b3bb-47a742e2f09e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "_fntConfig": {
+      "commonHeight": 33,
+      "fontSize": 32,
+      "atlasName": "aaa_0.png",
+      "fontDefDictionary": {
+        "48": {
+          "rect": {
+            "x": 0,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "49": {
+          "rect": {
+            "x": 51,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "50": {
+          "rect": {
+            "x": 102,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "51": {
+          "rect": {
+            "x": 153,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "52": {
+          "rect": {
+            "x": 204,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "53": {
+          "rect": {
+            "x": 255,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "54": {
+          "rect": {
+            "x": 306,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "55": {
+          "rect": {
+            "x": 357,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "56": {
+          "rect": {
+            "x": 408,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        },
+        "57": {
+          "rect": {
+            "x": 459,
+            "y": 0,
+            "width": 49,
+            "height": 65
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 41
+        }
+      },
+      "kerningDict": {}
+    },
+    "fontSize": 32,
+    "textureUuid": "1f512cd9-61a2-407d-90a9-fbdc6a109183"
+  }
+}

BIN
assets/resources/font/aaa_0.png


+ 134 - 0
assets/resources/font/aaa_0.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1f512cd9-61a2-407d-90a9-fbdc6a109183",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1f512cd9-61a2-407d-90a9-fbdc6a109183@6c48a",
+      "displayName": "aaa_0",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1f512cd9-61a2-407d-90a9-fbdc6a109183",
+        "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": "1f512cd9-61a2-407d-90a9-fbdc6a109183@f9941",
+      "displayName": "aaa_0",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -0.5,
+        "offsetY": 7.5,
+        "trimX": 5,
+        "trimY": 4,
+        "width": 499,
+        "height": 57,
+        "rawWidth": 510,
+        "rawHeight": 80,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -249.5,
+            -28.5,
+            0,
+            249.5,
+            -28.5,
+            0,
+            -249.5,
+            28.5,
+            0,
+            249.5,
+            28.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            5,
+            76,
+            504,
+            76,
+            5,
+            19,
+            504,
+            19
+          ],
+          "nuv": [
+            0.00980392156862745,
+            0.2375,
+            0.9882352941176471,
+            0.2375,
+            0.00980392156862745,
+            0.95,
+            0.9882352941176471,
+            0.95
+          ],
+          "minPos": [
+            -249.5,
+            -28.5,
+            0
+          ],
+          "maxPos": [
+            249.5,
+            28.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1f512cd9-61a2-407d-90a9-fbdc6a109183@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1f512cd9-61a2-407d-90a9-fbdc6a109183@f9941"
+  }
+}

+ 14 - 0
assets/resources/font/sss.fnt

@@ -0,0 +1,14 @@
+info face="楷体" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=4,4,4,4 spacing=2,2 outline=0
+common lineHeight=33 base=28 scaleW=420 scaleH=60 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0
+page id=0 file="sss_0.png"
+chars count=10
+char id=48   x=0     y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=49   x=37    y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=50   x=74    y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=51   x=111   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=52   x=148   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=53   x=185   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=54   x=222   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=55   x=259   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=56   x=296   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15
+char id=57   x=333   y=0     width=35    height=45    xoffset=-4    yoffset=-4    xadvance=27    page=0  chnl=15

+ 132 - 0
assets/resources/font/sss.fnt.meta

@@ -0,0 +1,132 @@
+{
+  "ver": "1.0.6",
+  "importer": "bitmap-font",
+  "imported": true,
+  "uuid": "82fa6ad1-dcce-4040-81e6-03e86f73e726",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "_fntConfig": {
+      "commonHeight": 33,
+      "fontSize": 32,
+      "atlasName": "sss_0.png",
+      "fontDefDictionary": {
+        "48": {
+          "rect": {
+            "x": 0,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "49": {
+          "rect": {
+            "x": 37,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "50": {
+          "rect": {
+            "x": 74,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "51": {
+          "rect": {
+            "x": 111,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "52": {
+          "rect": {
+            "x": 148,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "53": {
+          "rect": {
+            "x": 185,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "54": {
+          "rect": {
+            "x": 222,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "55": {
+          "rect": {
+            "x": 259,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "56": {
+          "rect": {
+            "x": 296,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        },
+        "57": {
+          "rect": {
+            "x": 333,
+            "y": 0,
+            "width": 35,
+            "height": 45
+          },
+          "xOffset": -4,
+          "yOffset": -4,
+          "xAdvance": 27
+        }
+      },
+      "kerningDict": {}
+    },
+    "fontSize": 32,
+    "textureUuid": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358"
+  }
+}

BIN
assets/resources/font/sss_0.png


+ 134 - 0
assets/resources/font/sss_0.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358@6c48a",
+      "displayName": "sss_0",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358",
+        "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": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358@f9941",
+      "displayName": "sss_0",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -26,
+        "offsetY": 7.5,
+        "trimX": 4,
+        "trimY": 4,
+        "width": 360,
+        "height": 37,
+        "rawWidth": 420,
+        "rawHeight": 60,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -180,
+            -18.5,
+            0,
+            180,
+            -18.5,
+            0,
+            -180,
+            18.5,
+            0,
+            180,
+            18.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            4,
+            56,
+            364,
+            56,
+            4,
+            19,
+            364,
+            19
+          ],
+          "nuv": [
+            0.009523809523809525,
+            0.31666666666666665,
+            0.8666666666666667,
+            0.31666666666666665,
+            0.009523809523809525,
+            0.9333333333333333,
+            0.8666666666666667,
+            0.9333333333333333
+          ],
+          "minPos": [
+            -180,
+            -18.5,
+            0
+          ],
+          "maxPos": [
+            180,
+            18.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "e3ff3859-7c23-4c33-87ee-fcb04dd3c358@f9941"
+  }
+}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 255 - 191
assets/resources/ui/home.prefab


+ 378 - 45
assets/resources/ui/user_info_view.prefab

@@ -25,23 +25,23 @@
         "__id__": 10
       },
       {
-        "__id__": 52
+        "__id__": 64
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 70
       },
       {
-        "__id__": 60
+        "__id__": 72
       },
       {
-        "__id__": 62
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -273,19 +273,25 @@
       },
       {
         "__id__": 41
+      },
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 59
       },
       {
-        "__id__": 49
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 63
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -552,7 +558,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "地区",
+    "_string": "",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
     "_actualFontSize": 41,
@@ -905,7 +911,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "img_number",
+    "_name": "lab_car_pai",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -926,8 +932,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -264.556,
-      "y": -375.993,
+      "x": -2.724,
+      "y": 302.648,
       "z": 0
     },
     "_lrot": {
@@ -965,6 +971,165 @@
     "__prefab": {
       "__id__": 37
     },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 500,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b4ROjk+OVDX4VHGSioToHK"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 39
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 41,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 2,
+    "_enableWrapText": true,
+    "_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": "71Br/IGWVOg5EMWRuJDY1N"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "9eoSQNPctEOJCv0UdMSDvr",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "img_number",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 10
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 44
+      }
+    ],
+    "_prefab": {
+      "__id__": 46
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -264.556,
+      "y": -375.993,
+      "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__": 41
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 43
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 80,
@@ -987,11 +1152,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1048,19 +1213,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 48
       },
       {
-        "__id__": 44
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 207.804,
-      "y": -375.722,
+      "x": 111.804,
+      "y": -371.722,
       "z": 0
     },
     "_lrot": {
@@ -1092,16 +1257,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
-      "height": 37.8
+      "width": 0,
+      "height": 40
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1120,11 +1285,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 51
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1139,14 +1304,17 @@
     "_string": "",
     "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 37,
-    "_fontSize": 40,
+    "_actualFontSize": 35,
+    "_fontSize": 35,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 2,
+    "_overflow": 0,
     "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
+    "_font": {
+      "__uuid__": "82fa6ad1-dcce-4040-81e6-03e86f73e726",
+      "__expectedType__": "cc.BitmapFont"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_isItalic": false,
     "_isBold": false,
@@ -1195,6 +1363,165 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_car_name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 10
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 54
+      },
+      {
+        "__id__": 56
+      }
+    ],
+    "_prefab": {
+      "__id__": 58
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -540.276,
+      "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__": 53
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 55
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 800,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "25KFvr7rJMTaOONd2Li/xy"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 57
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 45,
+    "_fontSize": 45,
+    "_fontFamily": "Arial",
+    "_lineHeight": 60,
+    "_overflow": 2,
+    "_enableWrapText": true,
+    "_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": "5bj5+L8b1BbboB9V/RZk+M"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1e33PGkINF0Z+gM8yk1ze7",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -1205,7 +1532,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 60
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1233,7 +1560,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 62
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1293,14 +1620,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 65
       },
       {
-        "__id__": 55
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1337,11 +1664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 66
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1365,11 +1692,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 52
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 68
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1427,7 +1754,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1455,7 +1782,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 73
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1491,10 +1818,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 75
     },
     "btn_close": {
-      "__id__": 52
+      "__id__": 64
     },
     "img_head": {
       "__id__": 11
@@ -1508,12 +1835,18 @@
     "img_car": {
       "__id__": 29
     },
-    "img_number": {
+    "lab_car_pai": {
       "__id__": 35
     },
-    "lab_score": {
+    "img_number": {
       "__id__": 41
     },
+    "lab_score": {
+      "__id__": 47
+    },
+    "lab_car_name": {
+      "__id__": 53
+    },
     "_id": ""
   },
   {

+ 46 - 0
assets/script/GameManager.ts

@@ -1,6 +1,7 @@
 import { _decorator, Component, Node, sys } from 'cc';
 import { config } from './config';
 import { settingData } from './data';
+import { http } from './http';
 const { ccclass, property } = _decorator;
 
 @ccclass('GameManager')
@@ -23,7 +24,52 @@ export class GameManager extends Component {
 
     public static saveSettingData(data:settingData) {
         sys.localStorage.setItem(config.SETTING_DATA, JSON.stringify(data));
+    }
+
+    // stype 1:注册 2:重新设置
+    public static requestUserSetRegion(region_id:number,stype:number,cb) {
+        let opt = {'region_id':region_id, 'stype':stype}
+        http.post(config.API.user_set_region, opt, (err,d)=>{
+            let nd = JSON.parse(d)
+            if(nd.code === config.status.SUCCESS){
+                if(cb!=null){
+                    cb(nd.content)
+                }
+            }  
+        })
+    }
+    
+    // stype 0:全国 1:省 2:市
+    public static requestMineRank(stype:number, cb) {
+        let opt = {'stype': stype}
+        http.post(config.API.user_ranking, opt, (err,d)=>{
+            if(!err){
+                let data = JSON.parse(d)
+                if(data.code===config.status.SUCCESS){
+                    if(cb!=null) {
+                        cb(data.content)
+                    }
+                }
+            } else{
+                console.log("user rank Data err",err)
+            }
+        })
+    }
 
+    public static requestRankList(region_id:number, cb) {
+        http.get(config.STATIC_API.rankings(region_id),(err,d)=>{
+            if(!err){
+                let data = JSON.parse(d)
+                if(data.code===config.status.SUCCESS){
+                    // console.log('data=',data.content)
+                    if(cb!=null) {
+                        cb(data.content)
+                    }
+                }
+            } else{
+                console.log("rankList err",err)
+            }
+        })
     }
 }
 

+ 2 - 0
assets/script/config.ts

@@ -19,9 +19,11 @@ export class config  {
 
 
     public static STATIC_API = {
+        sysconfig : "/snakestatic/sysconfig.json",
         levels : "/snakestatic/levels.json",
         regions : "/snakestatic/regions.json",
         car_list : "/snakestatic/car_list.json",
+
         rankings: (region_id)=>{
             return `/snakestatic/rankings/${region_id}.json`
         }

+ 10 - 1
assets/script/data.ts

@@ -67,9 +67,13 @@ export class rankData{
     public nickName:string = "" //昵称
     public license_code:string = "" //车牌号
     public car_id:number = 1 // 当前汽车图片id
-    public car_url:string = "" //	当前汽车图片
+    public car_url:string = "" // 当前汽车图片
+    public car_name:string = "" // 当前汽车名字
     public province_name:string = ""//省名字
     public city_name:string = ""//市名字
+    public city_badge_status:number = 0 //城市徽章状态 1展示 0不展示
+    public province_badge_status:number = 0 //省级徽章状态 1展示 0不展示
+    public nationwide_badge_status:number = 0 //全国徽章状态 1展示 0不展示
 }
 
 export class user_car_list{
@@ -84,6 +88,11 @@ export class user_results{
     public ratio:string = ""
 }
 
+export class sysConfig{
+    public bulletin_img:string = "" //公告
+    public game_introduction_img:string = ""//游戏介绍
+}
+
 export class car_item_data{
     public id:number = 0;
     public name:string = "";

+ 3 - 29
assets/script/tools.ts

@@ -2,7 +2,7 @@ import { _decorator, assetManager, Component, ImageAsset, instantiate, Node, Pre
 import { config } from './config';
 
 import { main } from './main';
-import { car_item_data, edit_game_config_data, model_item_data, userData } from './data';
+import { car_item_data, edit_game_config_data, model_item_data, rankData, sysConfig, userData } from './data';
 import { game } from './game/game';
 import { Util } from './util';
 import { http } from './http';
@@ -13,6 +13,8 @@ export class tools  {
     public static levels:string[] = []
     public static tpl_list:model_item_data[] = []
     public static game_config:edit_game_config_data = null
+    public static sys_config:sysConfig = null
+    public static mine_rank_data:rankData = null
     public static all_car_list:car_item_data[] =[]
     public static init(n:Node){
         tools.parent = n
@@ -62,34 +64,6 @@ export class tools  {
         }); 
     }
 
-    // stype 1:注册 2:重新设置
-    public static requestUserSetRegion(region_id:number,stype:number,cb) {
-        let opt = {'region_id':region_id, 'stype':stype}
-        http.post(config.API.user_set_region, opt, (err,d)=>{
-            let nd = JSON.parse(d)
-                if(nd.code === config.status.SUCCESS){
-                    if(cb!=null){
-                        cb(nd.content)
-                    }
-                }  
-        })
-    }
-
-    public static requestRankList(region_id:number, cb) {
-        http.get(config.STATIC_API.rankings(region_id),(err,d)=>{
-            if(!err){
-                let data = JSON.parse(d)
-                if(data.code===config.status.SUCCESS){
-                    // console.log('data=',data.content)
-                    if(cb!=null) {
-                        cb(data.content)
-                    }
-                }
-            } else{
-                console.log("rankList err",err)
-            }
-        })
-    }
 }
 
 

+ 6 - 4
assets/script/ui/home/home_bottom.ts

@@ -1,9 +1,10 @@
-import { _decorator, Component, Node, Sprite } from 'cc';
+import { _decorator, Component, Label, Node, Sprite } from 'cc';
 import { uiManager } from '../../manager/uiManager';
 import { config } from '../../config';
-import { tools } from '../../tools';
 import { user_info_view } from '../user_info_view/user_info_view';
 import { home_bottom_rank_item } from './home_bottom_rank_item';
+import { GameManager } from '../../GameManager';
+import { tools } from '../../tools';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_bottom')
@@ -14,6 +15,7 @@ export class home_bottom extends Component {
     @property(Node) rank1_node:Node = null
     @property(Node) rank2_node:Node = null
     @property(Node) rank3_node:Node = null
+    @property(Node) lab_week_score:Node = null
     @property(Node) btn_wuxiancishu:Node = null
     start() {
         uiManager.Instance().onButtonListen(this.btn_up_rank, ()=>{
@@ -31,11 +33,11 @@ export class home_bottom extends Component {
     }
 
     public init() {
-        
+        this.lab_week_score.getComponent(Label).string = tools.mine_rank_data.score + ''
     }
     
     public reloadCountryRankData(){
-        tools.requestRankList(0, (d_content)=>{
+        GameManager.requestRankList(0, (d_content)=>{
             if(d_content.length>0) {
                 let rank_data = d_content[0]
                 this.rank1_node.getComponent(home_bottom_rank_item).initView(rank_data, this.onClickRankGotoUserInfo.bind(this))

+ 2 - 2
assets/script/ui/home/home_top.ts

@@ -4,7 +4,7 @@ import { config } from '../../config';
 import { userDataManager } from '../../manager/userDataManager';
 import { select_area } from '../select_area/select_area';
 import { area_item_data } from '../../data';
-import { tools } from '../../tools';
+import { GameManager } from '../../GameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('home_top')
@@ -36,7 +36,7 @@ export class home_top extends Component {
     }
 
     private onSelectArea(obj:select_area, data:area_item_data) {
-        tools.requestUserSetRegion(data.id, 2, (d)=>{
+        GameManager.requestUserSetRegion(data.id, 2, (d)=>{
             obj.closeSelf()
         })
     }

+ 39 - 1
assets/script/ui/loading_view/loading_view.ts

@@ -28,6 +28,7 @@ export class loading_view extends Component {
                 return;
             }
             progress += 0.1
+            progress = parseFloat(progress.toFixed(1))
             // console.log('progress=',progress)
             
             this.loading_bar.getComponent(ProgressBar).progress = progress
@@ -45,6 +46,18 @@ export class loading_view extends Component {
                     })
                     break
                 case 0.2:
+                    this.m_pause_status = true
+                    this.initSysConfig(()=>{
+                        this.m_pause_status = false
+                    })
+                    break
+                case 0.3:
+                    this.m_pause_status = true
+                    this.initMineRank(()=>{
+                        this.m_pause_status = false
+                    })
+                    break
+                case 0.4:
                     this.m_pause_status = true
                     this.getUserCarList(()=>{
                         this.m_pause_status = false
@@ -131,7 +144,7 @@ export class loading_view extends Component {
     private setUserSelectArea() {
         uiManager.Instance().showUi(config.UI.ui_select_area, this.node, (node:Node)=>{
             node.getComponent(select_area).initView(false, (obj:select_area, data:area_item_data)=>{
-                tools.requestUserSetRegion(data.id, 1, (d)=>{
+                GameManager.requestUserSetRegion(data.id, 1, (d)=>{
                     userDataManager.user_data.region_id = d.region_id
                     userDataManager.user_data.region_pid = d.region_pid
                     this.m_pause_status = false
@@ -141,6 +154,31 @@ export class loading_view extends Component {
         })
     }
 
+    private initSysConfig(cb) {
+        http.get(config.STATIC_API.sysconfig,(err,d)=>{
+            if(!err){
+                let data = JSON.parse(d)
+                if(data.code===config.status.SUCCESS){
+                    tools.sys_config = data.content
+                    if(cb!=null) {
+                        cb()
+                    }
+                }
+            }else{
+                console.log("initSysConfig err",err)
+            }
+        })
+    }
+
+    private initMineRank(cb) {
+        GameManager.requestMineRank(0, (d_content)=>{
+            tools.mine_rank_data = d_content
+            if(cb!=null) {
+                cb()
+            }
+        })
+    }
+
     private getUserCarList(cb){
         http.post(config.API.user_car_list,null,(err,d)=>{
             if(!err){

+ 7 - 15
assets/script/ui/rank/rank.ts

@@ -3,10 +3,8 @@ import { uiManager } from '../../manager/uiManager';
 import { rank_list_item } from './rank_list_item';
 import { rank_my_info } from './rank_my_info';
 import { rank_list_top } from './rank_list_top';
-import { http } from '../../http';
-import { config } from '../../config';
 import { userDataManager } from '../../manager/userDataManager';
-import { tools } from '../../tools';
+import { GameManager } from '../../GameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('rank')
@@ -73,7 +71,7 @@ export class rank extends Component {
         } else if(type==3) {
             id = userDataManager.user_data.region_id
         }
-        tools.requestRankList(id,(d_content)=>{
+        GameManager.requestRankList(id,(d_content)=>{
             this.reloadListTop(d_content)
             this.reloadListContent(d_content)
             this.reloadMyInfo(type)
@@ -100,21 +98,15 @@ export class rank extends Component {
 
     reloadMyInfo(type:number) {
         let stype = 0
-        if(type==2) {
+        if(type==1) {
+            stype = 0
+        } else if(type==2) {
             stype = 1
         } else if(type==3) {
             stype = 2
         }
-        let opt = {'stype': stype}
-        http.post(config.API.user_ranking, opt, (err,d)=>{
-            if(!err){
-                let data = JSON.parse(d)
-                if(data.code===config.status.SUCCESS){
-                    this.my_info_node.getComponent(rank_my_info).initView(data.content)
-                }
-            } else{
-                console.log("user rank Data err",err)
-            }
+        GameManager.requestMineRank(stype, (d_content)=>{
+            this.my_info_node.getComponent(rank_my_info).initView(d_content)
         })
     }
 

+ 4 - 1
assets/script/ui/user_info_view/user_info_view.ts

@@ -12,8 +12,10 @@ export class user_info_view extends base_ui {
     @property(Node) lab_region:Node = null
     @property(Node) lab_nickname:Node = null
     @property(Node) img_car:Node = null
+    @property(Node) lab_car_pai:Node = null
     @property(Node) img_number:Node = null
     @property(Node) lab_score:Node = null
+    @property(Node) lab_car_name:Node = null
     start() {
         this.btn_close.on(Node.EventType.TOUCH_END, ()=>{
             this.close()
@@ -27,8 +29,9 @@ export class user_info_view extends base_ui {
         this.lab_region.getComponent(Label).string = data.province_name + ' - ' + data.city_name
         this.lab_nickname.getComponent(Label).string = data.nickName
         this.img_car.getComponent(Sprite).spriteFrame = imageCacheManager.getRankCarImageById(data.car_id)
+        this.lab_car_pai.getComponent(Label).string = data.license_code
         this.lab_score.getComponent(Label).string = data.score + '分'
-
+        this.lab_car_name.getComponent(Label).string = data.car_name
     }
 }
 

Vissa filer visades inte eftersom för många filer har ändrats