diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index 70e20ca5..562cb7e5 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -102,17 +102,18 @@ function ArenaManager:rspChallenge(result) end -- 结算 -function ArenaManager:reqSettlement(win) +function ArenaManager:reqSettlement(win, battleReport, taskProgress) local parmas = { win = win, - season = DataManager.ArenaData:getSeason() + season = DataManager.ArenaData:getSeason(), + task_stat = taskProgress } self:sendMessage(ProtoMsgType.FromMsgEnum.PVPChallengeSettlementReq, parmas, {}, self.rspSettlement, BIReport.ITEM_GET_TYPE.ARENA_SETTLEMENT) end function ArenaManager:rspSettlement(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - + local reqData = result.reqData -- 异常数据判断处理 local curScore = DataManager.ArenaData:getScore() local minScore = DataManager.ArenaData:getGradingMinScore(curScore) @@ -131,6 +132,8 @@ function ArenaManager:rspSettlement(result) -- 展示结算界面 ModuleManager.BattleManager:showArenaBattleResultUI(result.settlement, result.rewards, checkCount) self:checkSeasonChange() + + ModuleManager.TaskManager:addFightTaskProgress(reqData.task_stat) end end diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 7f5da891..225582f2 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -14,11 +14,11 @@ local BATTLE_CONTROLLER = { [BattleConst.BATTLE_TYPE.ARENA] = "app/module/battle/controller/battle_controller_arena" } -function BattleManager:showPauseUI(battleType) +function BattleManager:showPauseUI(battleType, battleController) if battleType == BattleConst.BATTLE_TYPE.ARENA then - UIManager:showUI("app/ui/battle/battle_arena_pause_ui", {battleType = battleType}) + UIManager:showUI("app/ui/battle/battle_arena_pause_ui", {battleType = battleType, battleController = battleController}) else - UIManager:showUI("app/ui/battle/battle_pause_ui", {battleType = battleType}) + UIManager:showUI("app/ui/battle/battle_pause_ui", {battleType = battleType, battleController = battleController}) end end diff --git a/lua/app/module/battle/controller/battle_controller_arena.lua b/lua/app/module/battle/controller/battle_controller_arena.lua index fb42cc71..ef8c298b 100644 --- a/lua/app/module/battle/controller/battle_controller_arena.lua +++ b/lua/app/module/battle/controller/battle_controller_arena.lua @@ -80,7 +80,7 @@ function BattleControllerArena:controllBattleEnd() end self.combatReport.defReport = defReport local win = self.victory - ModuleManager.ArenaManager:reqSettlement(win, self.combatReport) + ModuleManager.ArenaManager:reqSettlement(win, self.combatReport, self.taskProgress) end -- 一共有多少波 diff --git a/lua/app/ui/battle/battle_arena_pause_ui.lua b/lua/app/ui/battle/battle_arena_pause_ui.lua index 82e6ba37..41363fda 100644 --- a/lua/app/ui/battle/battle_arena_pause_ui.lua +++ b/lua/app/ui/battle/battle_arena_pause_ui.lua @@ -19,6 +19,7 @@ end function BattleArenaPauseUI:ctor(params) self.battleType = params.battleType + self.battleController = params.battleController end function BattleArenaPauseUI:onClose() @@ -51,7 +52,7 @@ function BattleArenaPauseUI:_addListeners() okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), okFunc = function() - ModuleManager.ArenaManager:reqSettlement(false) + self.battleController:controllBattleEnd() end, } GFunc.showMessageBox(params) diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua index 8bfaf6f3..30da1fd3 100644 --- a/lua/app/ui/battle/battle_base_ui.lua +++ b/lua/app/ui/battle/battle_base_ui.lua @@ -239,7 +239,7 @@ function BattleBaseUI:onPressBackspace() end end - ModuleManager.BattleManager:showPauseUI(self.battleController.battleType) + ModuleManager.BattleManager:showPauseUI(self.battleController.battleType, self.battleController) end function BattleBaseUI:onClose() diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 3da2b46e..ce4cf944 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -295,7 +295,7 @@ end function BattleUI:_addListeners() local uiMap = self.root:genAllChildren() uiMap["battle_ui.top_node.close_btn"]:addClickListener(function() - ModuleManager.BattleManager:showPauseUI(self.battleController.battleType) + ModuleManager.BattleManager:showPauseUI(self.battleController.battleType, self.battleController) end) self:addEventListener(EventManager.CUSTOM_EVENT.SHOW_ELIMINATION_TUTORAIL, function(posIdList) diff --git a/lua/app/ui/battle/battle_ui_pvp.lua b/lua/app/ui/battle/battle_ui_pvp.lua index 6d6f2fd8..8d61b870 100644 --- a/lua/app/ui/battle/battle_ui_pvp.lua +++ b/lua/app/ui/battle/battle_ui_pvp.lua @@ -170,7 +170,7 @@ end function BattleUIPVP:_addListeners() local uiMap = self.root:genAllChildren() uiMap["battle_ui_pvp.top_node.close_btn"]:addClickListener(function() - ModuleManager.BattleManager:showPauseUI(self.battleController.battleType) + ModuleManager.BattleManager:showPauseUI(self.battleController.battleType, self.battleController) end) end