diff --git a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua index f40440da..4db9a716 100644 --- a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua +++ b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua @@ -89,7 +89,10 @@ end function ActBossRushManager:rspEndBattle(result) if result.err_code == GConst.ERROR_STR.SUCCESS then if result.reqData then - DataManager.ActBossRushData:addWaveCount(result.reqData.task_stat.pass_wave or 0) + local wave = result.reqData.task_stat.pass_wave or 0 + local round = result.reqData.task_stat.total_turn or 0 + DataManager.ActBossRushData:addWaveCount(wave) + DataManager.ActBossRushData:updateWaveAndRound(wave, round) end ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat) end @@ -160,7 +163,7 @@ end function ActBossRushManager:rspBuyFundLevel(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - local addCount = result.accum_round - DataManager.ActBossRushData:getWaveCount() + local addCount = result.accum_wave - DataManager.ActBossRushData:getWaveCount() if addCount > 0 then DataManager.ActBossRushData:addWaveCount(addCount) end diff --git a/lua/app/ui/battle/battle_arena_pause_ui.lua b/lua/app/ui/battle/battle_arena_pause_ui.lua index 469ededf..7156820c 100644 --- a/lua/app/ui/battle/battle_arena_pause_ui.lua +++ b/lua/app/ui/battle/battle_arena_pause_ui.lua @@ -52,7 +52,7 @@ function BattleArenaPauseUI:_addListeners() okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), okFunc = function() - self.battleController:controllBattleEnd() + self.battleController:battleEnd() end, } GFunc.showMessageBox(params) diff --git a/lua/app/ui/battle/battle_bossrush_result_ui.lua b/lua/app/ui/battle/battle_bossrush_result_ui.lua index 5f087343..01b2a58b 100644 --- a/lua/app/ui/battle/battle_bossrush_result_ui.lua +++ b/lua/app/ui/battle/battle_bossrush_result_ui.lua @@ -67,6 +67,8 @@ function BattleBossRushResultUI:onLoadRootComplete() local waveNew = uiMap["battle_boss_rush_result_ui.unit_node.desc_new_1"] local roundNew = uiMap["battle_boss_rush_result_ui.unit_node.desc_new_2"] + waveNew:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_28)) + roundNew:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_28)) local tag1, tag2 = DataManager.ActBossRushData:getWaveRoundNewTag() waveNew:setVisible(tag1 == true) roundNew:setVisible(tag2 == true) diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua index b0701ab9..9fb48fdf 100644 --- a/lua/app/ui/battle/battle_pause_ui.lua +++ b/lua/app/ui/battle/battle_pause_ui.lua @@ -61,7 +61,7 @@ function BattlePauseUI:_addListeners() okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), okFunc = function() - self.battleController:controllBattleEnd() + self.battleController:battleEnd() end, } GFunc.showMessageBox(params) diff --git a/lua/app/ui/ui_manager.lua b/lua/app/ui/ui_manager.lua index ea026392..7946cbf5 100644 --- a/lua/app/ui/ui_manager.lua +++ b/lua/app/ui/ui_manager.lua @@ -468,9 +468,7 @@ function UIManager:closeAllUIExceptMainUI(includeCurrencyBar) local uiNum = #self.uiList for i = uiNum, 1, -1 do if self.uiList[i]:getUIIndex() ~= UIManager.UI_PATH.MAINCITY_UI then - self.uiList[i]:_onClose() - self.uiList[i]:_onExitAnimationComplete() - table.remove(self.uiList, i) + self.uiList[i]:closeUI() end self:_updateUISwallowOrder() end