diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index f360fe1d..7fa5ee57 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -569,9 +569,6 @@ function BattleController:onLinkEnter(entity, posId, isVirtual) if self.battleData:alreadyInsertSequence(posId) then local info = sequence[#sequence - 1] local beforePosId = info and info.posId - if not beforePosId then - return - end if beforePosId == posId then -- 进入的是倒数第二个,则移除倒数第一个 local snapshot = self.battleData:removeGridSequence(lastPosId) if snapshot then -- 如果有快照,则恢复一次 @@ -590,8 +587,8 @@ function BattleController:onLinkEnter(entity, posId, isVirtual) self:findSkillInfluenceGrids() self:onLinkChange() - return end + return end local skillId = entity:getSkillId() diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 8fcb6d4d..264cd8a3 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -111,7 +111,7 @@ function MainCityUI:_bind() self:bind(DataManager.HeroData, "isDirty", function(binder, value) if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.HERO then self.subComps[self.selectedIndex]:refresh() - elseif self.selectedIndex == GConst.MainCityConst.MAIN then + elseif self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then self.subComps[self.selectedIndex]:refreshStageFormaion() end end) @@ -319,24 +319,24 @@ function MainCityUI:checkTutorial() -- end -- end - Logger.logHighlight(DataManager.ChapterData:getMaxChapterId()) if DataManager.ChapterData:getMaxChapterId() == 1 then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_ONE_CHAPTER) then return end end + if DataManager.ChapterData:getMaxChapterId() == 3 then + if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_THREE_CHAPTER) then + return + end + end + if DataManager.ChapterData:boxCanGet(2, 1) then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.TWO_CHAPTER_BOX_CAN_GOT) then return end end - if DataManager.ChapterData:getMaxChapterId() == 3 then - if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_THREE_CHAPTER) then - return - end - end end return MainCityUI \ No newline at end of file