diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index 214d05c0..58f08c54 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -380,7 +380,7 @@ function BattleControllerDungeonRune:tryShowRebirth(callback) if callback then callback() end - end, true) + end, true, self.dungeonRuneRemainRoundCount <= 0) return true end end diff --git a/lua/app/module/dungeon_rune/dungeon_rune_manager.lua b/lua/app/module/dungeon_rune/dungeon_rune_manager.lua index f9ad944f..cfd5814e 100644 --- a/lua/app/module/dungeon_rune/dungeon_rune_manager.lua +++ b/lua/app/module/dungeon_rune/dungeon_rune_manager.lua @@ -25,8 +25,8 @@ function DungeonRuneManager:showTaskUI(id) UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_task_ui", params) end -function DungeonRuneManager:showRebirthUI(adCallback, closeCallback, isHpOver) - UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_rebirth_ui",{adCallback = adCallback, refuseCallback = closeCallback, isHpOver = isHpOver}) +function DungeonRuneManager:showRebirthUI(adCallback, closeCallback, isHpOver, roundIsOver) + UIManager:showUI("app/ui/dungeon_rune/dungeon_rune_rebirth_ui",{adCallback = adCallback, refuseCallback = closeCallback, isHpOver = isHpOver, roundIsOver = roundIsOver}) end function DungeonRuneManager:showRoundTipUI(round) diff --git a/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua b/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua index a15809ee..6d1d66e2 100644 --- a/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua +++ b/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua @@ -13,6 +13,7 @@ function DungeonRuneRebirthUI:ctor(params) self.adCallback = params.adCallback self.refuseCallback = params.refuseCallback self.isHpOver = params.isHpOver + self.roundIsOver = params.roundIsOver end function DungeonRuneRebirthUI:onLoadRootComplete() @@ -26,10 +27,13 @@ function DungeonRuneRebirthUI:_display() local desc1 local desc2 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) + 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) end uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(desc1)