diff --git a/assets/LoginScene.fire b/assets/LoginScene.fire index 6f40109d..3eb28c77 100644 --- a/assets/LoginScene.fire +++ b/assets/LoginScene.fire @@ -47,8 +47,8 @@ }, "_scale": { "__type__": "cc.Vec3", - "x": 0.583953857421875, - "y": 0.583953857421875, + "x": 0.743359386920929, + "y": 0.743359386920929, "z": 1 }, "_quat": { diff --git a/assets/scripts/game/GameOverUINew.js b/assets/scripts/game/GameOverUINew.js index 9175057e..53fdf866 100644 --- a/assets/scripts/game/GameOverUINew.js +++ b/assets/scripts/game/GameOverUINew.js @@ -191,9 +191,13 @@ cc.Class({ if(v.weapons_stats){ if(v.weapons_stats[0]){ //gun1 + this.gunt1Name.string = v.weapons_stats[0].weapon_name; + this.gun1_reward.string = v.weapons_stats[0].reward_ceg; } if(v.weapons_stats[1]){ //gun2 + this.gunt2Name.string = v.weapons_stats[1].weapon_name; + this.gun2_reward.string = v.weapons_stats[1].reward_ceg; } }