更新UI

assets/Scene/GameScene.fire

@@ -14644,7 +14644,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "585826a8-ee0c-4ef2-b91c-1ba647ca9ade"
+      "__uuid__": "74a6cf90-2210-4700-bd59-29b1c8cf5054"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -14657,9 +14657,7 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_atlas": {
-      "__uuid__": "933f7976-6238-4e66-bef6-a7e118893b12"
-    },
+    "_atlas": null,
     "_id": "66oP/IO61CHqMsEkV8Dv2K"
   },
   {

assets/Scene/HomeScene.fire

@@ -537,7 +537,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "2dece190-21a1-4502-9947-858be2b5d927"
+      "__uuid__": "73244291-e89d-4b9b-872f-e72671c2bd69"
     },
     "_type": 1,
     "_sizeMode": 0,

assets/Script/JiaZai.ts

@@ -3110,6 +3110,7 @@ export default class JiaZai extends cc.Component {
                                     for (let i = 0; i < rankData.length; i++) {
                                         rankData[i].rank = i + 1;
                                     }
+                                    console.log("rankingData_________", rankData);
                                     if (this.RankNode != null && this.RankNode != undefined) {
                                         // console.log("_________________________预制体已经加载好了，准备渲染");
                                         this.node.getChildByName("Career").addChild(this.RankNode);
@@ -3149,7 +3150,7 @@ export default class JiaZai extends cc.Component {
 
                     }
 
-                    // console.log("rankingData_________", rankData);
+
                 });
             }, isShow);
         }
@@ -3181,9 +3182,9 @@ export default class JiaZai extends cc.Component {
             }
         })
         if (rankingData) {
-            if (rankingData.length >= 8) {
+            if (rankingData.length >= 10) {
                 let jg = false;
-                for (let j = 0; j < 8; j++) {
+                for (let j = 0; j < 10; j++) {
                     if (rankingData[j].id == cc.fx.GameConfig.GM_INFO.uid) {
                         jg = true;
                         return;
@@ -3191,7 +3192,7 @@ export default class JiaZai extends cc.Component {
                 }
                 if (!jg) {
                     let length = rankingData.length;
-                    if (length > 8) length = 8;
+                    if (length > 10) length = 10;
                     for (let i = 0; i < length; i++) {
                         if (rankingData[i].addLevel < selfData.addLevel) {
                             rankingData.splice(i, 0, selfData);
@@ -3199,7 +3200,7 @@ export default class JiaZai extends cc.Component {
                             break;
                         }
                     }
-                    if (!self) rankingData[7] = selfData
+                    if (!self) rankingData[9] = selfData
                 }
             }
             else {

assets/UI/UI/start/careerBg.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "043a661e-1452-433f-b2f2-d270a7d8a6b9",
+  "uuid": "5964b76e-a129-4dd7-8bde-6f9aa53c5919",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -14,9 +14,9 @@
   "subMetas": {
     "careerBg": {
       "ver": "1.0.6",
-      "uuid": "2dece190-21a1-4502-9947-858be2b5d927",
+      "uuid": "73244291-e89d-4b9b-872f-e72671c2bd69",
       "importer": "sprite-frame",
-      "rawTextureUuid": "043a661e-1452-433f-b2f2-d270a7d8a6b9",
+      "rawTextureUuid": "5964b76e-a129-4dd7-8bde-6f9aa53c5919",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/career/img/careerUI.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 2048,
-  "height": 2048,
+  "width": 1021,
+  "height": 1242,
   "platformSettings": {},
   "subMetas": {}
 }

assets/career/img/cityBg.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "e884f956-351e-480c-896f-596e8c8efb7f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1042,
+  "height": 650,
+  "platformSettings": {},
+  "subMetas": {
+    "cityBg": {
+      "ver": "1.0.6",
+      "uuid": "b351898f-292b-4ef2-bf30-b56a1be1b7d1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "e884f956-351e-480c-896f-596e8c8efb7f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 1040,
+      "height": 648,
+      "rawWidth": 1042,
+      "rawHeight": 650,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/career/img/cityBg1.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a139a16d-fb49-4da7-acb5-c40e458de87d",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1042,
+  "height": 650,
+  "platformSettings": {},
+  "subMetas": {
+    "cityBg1": {
+      "ver": "1.0.6",
+      "uuid": "1a11697a-85b6-4d48-8acf-8579acc80ff3",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a139a16d-fb49-4da7-acb5-c40e458de87d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 1040,
+      "height": 648,
+      "rawWidth": 1042,
+      "rawHeight": 650,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/career/img/faguang.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3ae8ec0c-8d84-49f1-be81-7cda619b1119",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 539,
+  "height": 527,
+  "platformSettings": {},
+  "subMetas": {
+    "faguang": {
+      "ver": "1.0.6",
+      "uuid": "fc7cb2fa-9380-497c-9322-f6b2867ec5ff",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3ae8ec0c-8d84-49f1-be81-7cda619b1119",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -5.5,
+      "offsetY": 12,
+      "trimX": 5,
+      "trimY": 4,
+      "width": 518,
+      "height": 495,
+      "rawWidth": 539,
+      "rawHeight": 527,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/career/img/jiangbei.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "59c8f156-6c58-4650-9be6-fcd46a200388",
+  "uuid": "74bf5543-8845-42e6-9d5a-c224621362b9",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1080,
-  "height": 2340,
+  "width": 798,
+  "height": 716,
   "platformSettings": {},
   "subMetas": {
-    "careerBg": {
+    "jiangbei": {
       "ver": "1.0.6",
-      "uuid": "946b8178-887b-4052-ab0d-23aa8296ace0",
+      "uuid": "a0388a09-d1dd-48dd-bcb3-55bbbb27fa6c",
       "importer": "sprite-frame",
-      "rawTextureUuid": "59c8f156-6c58-4650-9be6-fcd46a200388",
+      "rawTextureUuid": "74bf5543-8845-42e6-9d5a-c224621362b9",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,11 +24,11 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 1080,
-      "height": 2340,
-      "rawWidth": 1080,
-      "rawHeight": 2340,
-      "borderTop": 1852,
+      "width": 798,
+      "height": 716,
+      "rawWidth": 798,
+      "rawHeight": 716,
+      "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
       "borderRight": 0,

assets/career/img/ruzhiBg.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "9f5a4a14-158e-4e45-84f0-4b2b3586d899",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 922,
+  "height": 203,
+  "platformSettings": {},
+  "subMetas": {
+    "ruzhiBg": {
+      "ver": "1.0.6",
+      "uuid": "74a6cf90-2210-4700-bd59-29b1c8cf5054",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "9f5a4a14-158e-4e45-84f0-4b2b3586d899",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 922,
+      "height": 203,
+      "rawWidth": 922,
+      "rawHeight": 203,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/career/img/yuangongka.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "ef855cfe-39c2-4a97-a0f3-1519b4af5d22",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 95,
+  "height": 114,
+  "platformSettings": {},
+  "subMetas": {
+    "yuangongka": {
+      "ver": "1.0.6",
+      "uuid": "93f578e5-569a-42dd-856d-b11448d35c87",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ef855cfe-39c2-4a97-a0f3-1519b4af5d22",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 95,
+      "height": 114,
+      "rawWidth": 95,
+      "rawHeight": 114,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/career/prefab/careerRankCity.prefab

@@ -185,9 +185,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "8b8f0cb9-1a62-4cec-b268-d10fdb043a81"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 1,
     "_fillType": 0,
@@ -199,9 +197,7 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_atlas": {
-      "__uuid__": "933f7976-6238-4e66-bef6-a7e118893b12"
-    },
+    "_atlas": null,
     "_id": ""
   },
   {

assets/career/script/CareerItem.ts

@@ -26,7 +26,7 @@ export default class CareerItem extends cc.Component {
     public dataChanged() {
         this.randerChildren = [];
 
-        for (let i = 4; i < 12; i++) {
+        for (let i = 4; i < 14; i++) {
             this.node.children[i].getChildByName("name").getComponent(cc.Label).string = "";
             this.node.children[i].getChildByName("level").getComponent(cc.Label).string = "";
             this.node.children[i].getChildByName("mask").getChildByName("icon").getComponent(cc.Sprite).spriteFrame = null;
@@ -42,6 +42,7 @@ export default class CareerItem extends cc.Component {
             this.node.getChildByName("ranking").getChildByName("nomal").active = false;
             if (this.data.rank == 1) {
                 this.node.getChildByName("ranking").getChildByName("one").active = true;
+                this.node.getChildByName("bg").getChildByName("bg1").active = true;
             }
             else if (this.data.rank == 2) {
                 this.node.getChildByName("ranking").getChildByName("two").active = true;
@@ -74,7 +75,7 @@ export default class CareerItem extends cc.Component {
                     }
 
                     let length = lengthTemp + 4;
-                    if (length > 12) length = 12;
+                    if (length > 14) length = 14;
                     for (let i = 4; i < length; i++) {
                         this.randerChildren.push(this.node.children[i]);
                         let username = cc.fx.GameTool.subName(this.data.rankingData[i - 4].username, 5);