diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index b6ff31b..5e1331c 100644 --- a/assets/Scene/GameScene.fire +++ b/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" }, { diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 3f838c5..a2ccc01 100644 --- a/assets/Script/JiaZai.ts +++ b/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 { diff --git a/assets/career/img/careerUI.png.meta b/assets/career/img/careerUI.png.meta index 6a6d42e..5d2f1f8 100644 --- a/assets/career/img/careerUI.png.meta +++ b/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": {} } \ No newline at end of file diff --git a/assets/career/img/ruzhiBg.png b/assets/career/img/ruzhiBg.png index 8e96ba4..d0e3f50 100644 Binary files a/assets/career/img/ruzhiBg.png and b/assets/career/img/ruzhiBg.png differ diff --git a/assets/career/img/yuangongka.png b/assets/career/img/yuangongka.png new file mode 100644 index 0000000..3b49a19 Binary files /dev/null and b/assets/career/img/yuangongka.png differ diff --git a/assets/career/img/yuangongka.png.meta b/assets/career/img/yuangongka.png.meta new file mode 100644 index 0000000..8dd61ca --- /dev/null +++ b/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": {} + } + } +} \ No newline at end of file diff --git a/assets/career/prefab/careerRankCity.prefab b/assets/career/prefab/careerRankCity.prefab index 5364881..09e8e17 100644 --- a/assets/career/prefab/careerRankCity.prefab +++ b/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": "" }, { diff --git a/assets/career/script/CareerItem.ts b/assets/career/script/CareerItem.ts index b95210e..91657c5 100644 --- a/assets/career/script/CareerItem.ts +++ b/assets/career/script/CareerItem.ts @@ -75,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);