From 7d3ced3fdfb3e939a0d0db1e49eac5f1175409f5 Mon Sep 17 00:00:00 2001 From: zhuguoqing Date: Mon, 6 Jun 2022 15:04:48 +0800 Subject: [PATCH] update --- assets/LoginScene.fire | 4 ++-- assets/res/prefabs/NUI/UINWantedSend.prefab | 3 +++ assets/res/prefabs/NUI/UINewWanted.prefab | 3 +++ assets/scripts/UI/task/mission_choose.js | 8 +++++++- assets/scripts/UI/task/singleWanted.js | 10 +++++++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/assets/LoginScene.fire b/assets/LoginScene.fire index f86994c6..c839bf42 100644 --- a/assets/LoginScene.fire +++ b/assets/LoginScene.fire @@ -47,8 +47,8 @@ }, "_scale": { "__type__": "cc.Vec3", - "x": 0.805834949016571, - "y": 0.805834949016571, + "x": 0.583953857421875, + "y": 0.583953857421875, "z": 1 }, "_quat": { diff --git a/assets/res/prefabs/NUI/UINWantedSend.prefab b/assets/res/prefabs/NUI/UINWantedSend.prefab index 7467530a..26899d84 100644 --- a/assets/res/prefabs/NUI/UINWantedSend.prefab +++ b/assets/res/prefabs/NUI/UINWantedSend.prefab @@ -23885,6 +23885,9 @@ "fullStarSpriteframe": { "__uuid__": "6558fdbc-ce62-4135-81fd-449de06bbd38" }, + "ceg_num": { + "__id__": 501 + }, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/UINewWanted.prefab b/assets/res/prefabs/NUI/UINewWanted.prefab index 2df59f6e..afd9aa29 100644 --- a/assets/res/prefabs/NUI/UINewWanted.prefab +++ b/assets/res/prefabs/NUI/UINewWanted.prefab @@ -3256,6 +3256,9 @@ "fullStarSpriteframe": { "__uuid__": "6558fdbc-ce62-4135-81fd-449de06bbd38" }, + "ceg_num": { + "__id__": 38 + }, "_id": "" }, { diff --git a/assets/scripts/UI/task/mission_choose.js b/assets/scripts/UI/task/mission_choose.js index 4c3c9493..f9d65c27 100644 --- a/assets/scripts/UI/task/mission_choose.js +++ b/assets/scripts/UI/task/mission_choose.js @@ -54,6 +54,10 @@ cc.Class({ fullStarSpriteframe:{ default:null, type:cc.SpriteFrame + }, + ceg_num:{ + default:null, + type:cc.Label } // needNode: { // default: null, @@ -61,7 +65,7 @@ cc.Class({ // }, }, - initData(data) { + initData(data,ceg_num) { console.log("mission detail:"+JSON.stringify(data)) this.allChooseHero = new Array(); @@ -98,6 +102,8 @@ cc.Class({ this.gunlistNode.children[i].active = true } } + + this.ceg_num.string =`x${ceg_num}` }, diff --git a/assets/scripts/UI/task/singleWanted.js b/assets/scripts/UI/task/singleWanted.js index 90221555..359cc4a6 100644 --- a/assets/scripts/UI/task/singleWanted.js +++ b/assets/scripts/UI/task/singleWanted.js @@ -46,6 +46,11 @@ cc.Class({ fullStarSpriteframe:{ default:null, type:cc.SpriteFrame + }, + + ceg_num:{ + default:null, + type:cc.Label } }, @@ -58,7 +63,7 @@ cc.Class({ } if (this.missionState == 1) { const node = cc.instantiate(this.missionPrefab); - node.getComponent('mission_choose').initData(this.wantedData); + node.getComponent('mission_choose').initData(this.wantedData,this.ceg); cc.find('Canvas').addChild(node); } if (this.missionState == 2) { @@ -142,6 +147,9 @@ cc.Class({ if (originData.state == 1) { this.node.destroy(); } + + this.ceg = originData.ceg_num + this.ceg_num.string =`x${originData.ceg_num}` }, start(){