diff --git a/assets/res/prefabs/game/GameOverNew.prefab b/assets/res/prefabs/game/GameOverNew.prefab index b5486b05..1552dff0 100644 --- a/assets/res/prefabs/game/GameOverNew.prefab +++ b/assets/res/prefabs/game/GameOverNew.prefab @@ -4049,7 +4049,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139.04, + "width": 27.81, "height": 50 }, "_anchorPoint": { @@ -4092,8 +4092,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "65535", - "_N$string": "65535", + "_string": "0", + "_N$string": "0", "_fontSize": 50, "_lineHeight": 50, "_enableWrapText": true, @@ -4140,7 +4140,7 @@ "__id__": 125 } ], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -4721,7 +4721,7 @@ "__id__": 131 }, "_children": [], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -4819,7 +4819,7 @@ "__id__": 131 }, "_children": [], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -4839,7 +4839,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139.04, + "width": 27.81, "height": 50 }, "_anchorPoint": { @@ -4882,8 +4882,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "65535", - "_N$string": "65535", + "_string": "0", + "_N$string": "0", "_fontSize": 50, "_lineHeight": 50, "_enableWrapText": true, @@ -4930,7 +4930,7 @@ "__id__": 148 } ], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -5511,7 +5511,7 @@ "__id__": 154 }, "_children": [], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -5609,7 +5609,7 @@ "__id__": 154 }, "_children": [], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -5629,7 +5629,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 69.52, + "width": 13.9, "height": 25 }, "_anchorPoint": { @@ -5672,8 +5672,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "65535", - "_N$string": "65535", + "_string": "0", + "_N$string": "0", "_fontSize": 25, "_lineHeight": 25, "_enableWrapText": true, @@ -5720,7 +5720,7 @@ "__id__": 171 } ], - "_active": true, + "_active": false, "_level": 5, "_components": [ { @@ -6937,7 +6937,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139.04, + "width": 27.81, "height": 50 }, "_anchorPoint": { @@ -6980,8 +6980,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "65535", - "_N$string": "65535", + "_string": "0", + "_N$string": "0", "_fontSize": 50, "_lineHeight": 50, "_enableWrapText": true, diff --git a/assets/scripts/game/GameOverUINew.js b/assets/scripts/game/GameOverUINew.js index 53fdf866..8f326bae 100644 --- a/assets/scripts/game/GameOverUINew.js +++ b/assets/scripts/game/GameOverUINew.js @@ -164,7 +164,6 @@ cc.Class({ this.lb_rank.string = res.team_rank; }, refreshself(v) { - console.log(`game over data-----${v}`) this.lb_killcount.string = v.kills; this.lb_killcount2.string = v.kills; this.lb_dmg.string = v.damage_amount; @@ -181,26 +180,39 @@ cc.Class({ this.lb_des.string = this.getTitleDesc(this.rankmun, v.kills); + var total = 0; + // infos // hero if(v.hero_stats){ + console.log(`hero reward----${v.hero_stats.reward_ceg}`) this.heroName.string = v.hero_stats.hero_name; - this.hero_reward = v.hero_stats.reward_ceg; + this.hero_reward.string = v.hero_stats.reward_ceg; + total+=parseInt(v.hero_stats.reward_ceg); } // weapons if(v.weapons_stats){ if(v.weapons_stats[0]){ //gun1 + this.gun1_reward.node.active = true; + this.gunt1Name.node.active = true; this.gunt1Name.string = v.weapons_stats[0].weapon_name; this.gun1_reward.string = v.weapons_stats[0].reward_ceg; + total+=parseInt(v.weapons_stats[0].reward_ceg) } if(v.weapons_stats[1]){ //gun2 + this.gunt2Name.node.active = true; + this.gun2_reward.node.active = true; this.gunt2Name.string = v.weapons_stats[1].weapon_name; this.gun2_reward.string = v.weapons_stats[1].reward_ceg; + total+=parseInt(v.weapons_stats[1].reward_ceg) } } + this.total_reward.string = total; + + }, showplayerinfo(v) { for (var i = 0; i < 4; i++) {