diff --git a/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua b/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua index 81d08f13..291395f4 100644 --- a/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua +++ b/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua @@ -72,6 +72,8 @@ function DungeonRuneFightUI:refreshRewardInfo() local descPassRound = uiMap["dungeon_rune_fight_ui.bg.desc_3"] local imgPassIcon = uiMap["dungeon_rune_fight_ui.bg.icon"] local rewardNode = uiMap["dungeon_rune_fight_ui.bg.reward_node"] + local lineR = uiMap["dungeon_rune_fight_ui.bg.line_r"] + local lineL = uiMap["dungeon_rune_fight_ui.bg.line_l"] rewardNode:setActive(not passed) descPassRound:setVisible(passed) imgPassIcon:setVisible(passed) @@ -81,7 +83,11 @@ function DungeonRuneFightUI:refreshRewardInfo() -- local round = self.runeData:getChapterPassRound(self.id) -- descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round)) -- GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5) + lineR:setVisible(false) + lineL:setVisible(false) else + lineR:setVisible(true) + lineL:setVisible(true) if not self.rewardCells then self.rewardCells = {} for i = 1, 4 do @@ -124,7 +130,7 @@ function DungeonRuneFightUI:refreshFightBtn() if passed then descAgain:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_2)) -- title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_6)) - title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_3)) + title:setText(GConst.EMPTY_STRING) else desc:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE)) num:setText(1) 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 947dc208..a15809ee 100644 --- a/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua +++ b/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua @@ -23,13 +23,16 @@ end function DungeonRuneRebirthUI:_display() local uiMap = self.root:genAllChildren() uiMap["dungeon_rune_rebirth_ui.title_bg_img.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_2)) - uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_3)) + 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_5) end + uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(desc1) uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx_2"]:setText(desc2) uiMap["dungeon_rune_rebirth_ui.title_bg_img.desc_close"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_7))