From be6d42fe884cabdfe0b67a69d271af692fae60e9 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Tue, 6 Jun 2023 17:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E9=80=80=E5=87=BA=E5=90=8E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BB=E7=95=8C=E9=9D=A2=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daily_challenge/daily_challenge_manager.lua      |  5 +----
 lua/app/module/maincity/maincity_manager.lua         | 12 ++++++++++++
 lua/app/ui/main_city/component/main_comp.lua         |  3 ++-
 3 files changed, 15 insertions(+), 5 deletions(-)

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)