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

bug修复

Browse Source
This commit is contained in:
xiekaidong 2023-09-04 20:06:11 +08:00
parent c6e44efbd6
commit f3d7d1c892
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua
View File

@ -89,7 +89,10 @@ end
function ActBossRushManager:rspEndBattle(result) function ActBossRushManager:rspEndBattle(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
if result.reqData 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 end
ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat) ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat)
end end
@ -160,7 +163,7 @@ end
function ActBossRushManager:rspBuyFundLevel(result) function ActBossRushManager:rspBuyFundLevel(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then 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 if addCount > 0 then
DataManager.ActBossRushData:addWaveCount(addCount) DataManager.ActBossRushData:addWaveCount(addCount)
end end

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

@ -52,7 +52,7 @@ function BattleArenaPauseUI:_addListeners()
okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL),
okFunc = function() okFunc = function()
self.battleController:controllBattleEnd() self.battleController:battleEnd()
end, end,
} }
GFunc.showMessageBox(params) GFunc.showMessageBox(params)

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

@ -67,6 +67,8 @@ function BattleBossRushResultUI:onLoadRootComplete()
local waveNew = uiMap["battle_boss_rush_result_ui.unit_node.desc_new_1"] 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"] 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() local tag1, tag2 = DataManager.ActBossRushData:getWaveRoundNewTag()
waveNew:setVisible(tag1 == true) waveNew:setVisible(tag1 == true)
roundNew:setVisible(tag2 == true) roundNew:setVisible(tag2 == true)

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

@ -61,7 +61,7 @@ function BattlePauseUI:_addListeners()
okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL),
okFunc = function() okFunc = function()
self.battleController:controllBattleEnd() self.battleController:battleEnd()
end, end,
} }
GFunc.showMessageBox(params) GFunc.showMessageBox(params)

4
lua/app/ui/ui_manager.lua
View File

@ -468,9 +468,7 @@ function UIManager:closeAllUIExceptMainUI(includeCurrencyBar)
local uiNum = #self.uiList local uiNum = #self.uiList
for i = uiNum, 1, -1 do for i = uiNum, 1, -1 do
if self.uiList[i]:getUIIndex() ~= UIManager.UI_PATH.MAINCITY_UI then if self.uiList[i]:getUIIndex() ~= UIManager.UI_PATH.MAINCITY_UI then
self.uiList[i]:_onClose() self.uiList[i]:closeUI()
self.uiList[i]:_onExitAnimationComplete()
table.remove(self.uiList, i)
end end
self:_updateUISwallowOrder() self:_updateUISwallowOrder()
end end