diff --git a/lua/app/module/daily_challenge/daily_challenge_manager.lua b/lua/app/module/daily_challenge/daily_challenge_manager.lua index 8507c751..8c6ee2e1 100644 --- a/lua/app/module/daily_challenge/daily_challenge_manager.lua +++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua @@ -71,10 +71,7 @@ function DailyChallengeManager:rspStartChallenge(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DailyChallengeData:onFightCountReduce() DataManager.DailyChallengeData:setFixedChapterId(result.today_fixed_chapter_id) - ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, {}, function() - UIManager:closeAllUI() - ModuleManager.MaincityManager:showMainCityUI(false, GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE) - end) + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE) end end diff --git a/lua/app/module/maincity/maincity_manager.lua b/lua/app/module/maincity/maincity_manager.lua index 1873819a..2e06fb85 100644 --- a/lua/app/module/maincity/maincity_manager.lua +++ b/lua/app/module/maincity/maincity_manager.lua @@ -98,4 +98,16 @@ function MaincityManager:isActivSideBarModule(moduleKey) return mainUI:isActivSideBarModule(moduleKey) end +function MaincityManager:setCurModule(moduleKey) + self.curModule = moduleKey +end + +function MaincityManager:getCurModule() + if not self.curModule then + -- 默认进主线章节 + return GConst.MainCityConst.MAIN_MODULE.CHAPTER + end + return self.curModule +end + return MaincityManager \ No newline at end of file diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 9b4c8cab..843351c0 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -7,7 +7,7 @@ local BOTTOM_HEIGHT = 120 function MainComp:init() self.uiMap = self:getBaseObject():genAllChildren() - self:refreshModule(GConst.MainCityConst.MAIN_MODULE.CHAPTER) + self:refreshModule(ModuleManager.MaincityManager:getCurModule()) self:initStageFormation() end @@ -29,6 +29,7 @@ function MainComp:refreshModule(selectModule) if self.curModuleType ~= selectModule then self.curModuleType = selectModule + ModuleManager.MaincityManager:setCurModule(self.curModuleType) if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.CHAPTER then -- 切换到主线章节 EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_CHAPTER)