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-09-20 11:16:33 +08:00
parent ca0762659b
commit 2e6541445e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,7 @@ function BattleControllerDungeonRune:tryShowRebirth(callback)
if callback then if callback then
callback() callback()
end end
end, true) end, true, self.dungeonRuneRemainRoundCount <= 0)
return true return true
end end
end end

4
lua/app/module/dungeon_rune/dungeon_rune_manager.lua
View File

@ -25,8 +25,8 @@ function DungeonRuneManager:showTaskUI(id)
UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_task_ui", params) UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_task_ui", params)
end end
function DungeonRuneManager:showRebirthUI(adCallback, closeCallback, isHpOver) function DungeonRuneManager:showRebirthUI(adCallback, closeCallback, isHpOver, roundIsOver)
UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_rebirth_ui",{adCallback = adCallback, refuseCallback = closeCallback, isHpOver = isHpOver}) UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_rebirth_ui",{adCallback = adCallback, refuseCallback = closeCallback, isHpOver = isHpOver, roundIsOver = roundIsOver})
end end
function DungeonRuneManager:showRoundTipUI(round) function DungeonRuneManager:showRoundTipUI(round)

10
lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua
View File

@ -13,6 +13,7 @@ function DungeonRuneRebirthUI:ctor(params)
self.adCallback = params.adCallback self.adCallback = params.adCallback
self.refuseCallback = params.refuseCallback self.refuseCallback = params.refuseCallback
self.isHpOver = params.isHpOver self.isHpOver = params.isHpOver
self.roundIsOver = params.roundIsOver
end end
function DungeonRuneRebirthUI:onLoadRootComplete() function DungeonRuneRebirthUI:onLoadRootComplete()
@ -26,10 +27,13 @@ function DungeonRuneRebirthUI:_display()
local desc1 local desc1
local desc2 local desc2
if self.isHpOver then if self.isHpOver then
desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_3)
desc2 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_4)
else
desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_6) desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_6)
desc2 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_4)
if self.roundIsOver then
desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_3)
end
else
desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_3)
desc2 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_5) desc2 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_5)
end end
uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(desc1) uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(desc1)