puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

竞技场任务

Browse Source
This commit is contained in:
xiekaidong 2023-07-05 10:15:33 +08:00
parent c1592accae
commit 9718eca3d7
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lua/app/module/arena/arena_manager.lua
View File

@ -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

6
lua/app/module/battle/battle_manager.lua
View File

@ -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

2
lua/app/module/battle/controller/battle_controller_arena.lua
View File

@ -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
-- 一共有多少波

3
lua/app/ui/battle/battle_arena_pause_ui.lua
View File

@ -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)

2
lua/app/ui/battle/battle_base_ui.lua
View File

@ -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()

2
lua/app/ui/battle/battle_ui.lua
View File

@ -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)

2
lua/app/ui/battle/battle_ui_pvp.lua
View File

@ -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