From dd62b41f0025fc9e12b762754a200eb5ab68cd52 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 19:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller_dungeon_rune.lua | 9 --------- lua/app/ui/battle/battle_ui.lua | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) 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 7de6b4b7..cc6aa5a1 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -28,9 +28,6 @@ function BattleControllerDungeonRune:initOther() if self.battleUI then local desc = self.dungeonRuneRemainRoundCount - if not self.isBossChapter then - desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId) - end self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") end @@ -161,9 +158,6 @@ function BattleControllerDungeonRune:enterRoundBegin() self.dungeonRuneRemainRoundCount = self.dungeonRuneRemainRoundCount - 1 if self.battleUI then local desc = self.dungeonRuneRemainRoundCount + 1 - if not self.isBossChapter then - desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId) - end self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") end BattleController.enterRoundBegin(self) @@ -186,9 +180,6 @@ function BattleControllerDungeonRune:enterRoundBegin() end if self.battleUI then local desc = self.dungeonRuneRemainRoundCount + 1 - if not self.isBossChapter then - desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId) - end self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") end BattleController.enterRoundBegin(self) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index c7eab930..68cf0675 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -500,14 +500,10 @@ function BattleUI:refreshTaskNode() if self.battleController.battleType == GConst.BattleConst.BATTLE_TYPE.DUNGEON_RUNE then self.taskNode:setLocalScale(0.6, 0.6, 0.6) local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN) - local isBossChapter = runeData:isBossChapter(self.battleController.chapterId) local chapterCondition = runeData:getChapterCondition(self.battleController.chapterId) local taskProgress = ModuleManager.DungeonRuneManager:getTaskStatus(self.battleController, chapterCondition) for index, cell in ipairs(self.taskCells) do - local newIndex = index - if isBossChapter then - newIndex = index + 1 - end + local newIndex = index + 1 local condition = chapterCondition[newIndex] if condition then cell:getBaseObject():setActive(true)