diff --git a/assets/scripts/game/GameOverUINew.js b/assets/scripts/game/GameOverUINew.js index c2c8549e..36690543 100644 --- a/assets/scripts/game/GameOverUINew.js +++ b/assets/scripts/game/GameOverUINew.js @@ -231,8 +231,8 @@ cc.Class({ if(v.hero_stats){ this.heroName.string = v.hero_stats.hero_name; this.hero_reward.string = v.hero_stats.reward_ceg; - this.hero_bar.progress = (v.hero_stats.today_get_ceg + v.hero_stats.reward_ceg) / v.hero_stats.ceg_uplimit; - this.hero_remain.string = v.hero_stats.ceg_uplimit - (v.hero_stats.today_get_ceg + v.hero_stats.reward_ceg) + this.hero_bar.progress = (v.hero_stats.today_get_ceg) / v.hero_stats.ceg_uplimit; + this.hero_remain.string = v.hero_stats.ceg_uplimit - (v.hero_stats.today_get_ceg) total+=parseInt(v.hero_stats.reward_ceg); } // weapons @@ -245,8 +245,8 @@ cc.Class({ this.gun1_remain.node.active = true; this.gunt1Name.string = v.weapons_stats[0].weapon_name; this.gun1_reward.string = v.weapons_stats[0].reward_ceg; - this.gun1_bar.progress = (v.weapons_stats[0].today_get_ceg + v.weapons_stats[0].reward_ceg) / v.weapons_stats[0].ceg_uplimit; - this.gun1_remain.string = v.weapons_stats[0].ceg_uplimit - (v.weapons_stats[0].today_get_ceg + v.weapons_stats[0].reward_ceg) + this.gun1_bar.progress = (v.weapons_stats[0].today_get_ceg) / v.weapons_stats[0].ceg_uplimit; + this.gun1_remain.string = v.weapons_stats[0].ceg_uplimit - (v.weapons_stats[0].today_get_ceg) total+=parseInt(v.weapons_stats[0].reward_ceg); } if(v.weapons_stats[1]){ @@ -257,8 +257,8 @@ cc.Class({ this.gun2_remain.node.active = true; this.gunt2Name.string = v.weapons_stats[1].weapon_name; this.gun2_reward.string = v.weapons_stats[1].reward_ceg; - this.gun2_bar.progress = (v.weapons_stats[1].today_get_ceg + v.weapons_stats[1].reward_ceg) / v.weapons_stats[1].ceg_uplimit; - this.gun2_remain.string = v.weapons_stats[1].ceg_uplimit - (v.weapons_stats[1].today_get_ceg + v.weapons_stats[1].reward_ceg); + this.gun2_bar.progress = (v.weapons_stats[1].today_get_ceg ) / v.weapons_stats[1].ceg_uplimit; + this.gun2_remain.string = v.weapons_stats[1].ceg_uplimit - (v.weapons_stats[1].today_get_ceg); total+=parseInt(v.weapons_stats[1].reward_ceg); } }