Merge branch 'fang/dev' into dev

lua/app/common/event_manager.lua

@@ -29,6 +29,8 @@ EventManager.CUSTOM_EVENT = {
 	SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC",
 	GO_SHOP = "GO_SHOP", -- 跳转商店
 	UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度
+	GO_DAILY_CHALLENGE = "GO_DAILY_CHALLENGE", -- 跳转每日挑战
+	GO_CHAPTER = "GO_CHAPTER", -- 跳转主线章节
 	-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
 	-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
 }

lua/app/module/daily_challenge/daily_challenge_manager.lua

@@ -56,6 +56,7 @@ end
 
 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)
     end

lua/app/ui/main_city/component/main_comp.lua

@@ -72,8 +72,10 @@ function MainComp:refreshModuleComp()
 	self.dailyChallengeComp:getBaseObject():setActive(false)
 	if self.curModuleType == GConst.MainCityConst.BOTTOM_MODULE_KEY.CHAPTER then
 		self.chapterComp:getBaseObject():setActive(true)
+		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_CHAPTER)
 	elseif self.curModuleType == GConst.MainCityConst.BOTTOM_MODULE_KEY.DAILY_CHALLENGE then
 		self.dailyChallengeComp:getBaseObject():setActive(true)
+		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE)
 	end
 end
 
@@ -202,6 +204,10 @@ function MainComp:refresh()
 	self:refreshStageFormaion()
 end
 
+function MainComp:getCurModuleType()
+	return self.curModuleType
+end
+
 function MainComp:refreshChapter(force)
 	self.chapterComp:refreshChapter(force)
 end

lua/app/ui/main_city/main_city_ui.lua

@@ -142,6 +142,20 @@ function MainCityUI:_addListeners()
             self:refreshBottom(3, true)
         end
     end)
+
+    self:addEventListener(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE, function()
+        if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then
+            return
+        end
+        self:refreshBounty()
+    end)
+
+    self:addEventListener(EventManager.CUSTOM_EVENT.GO_CHAPTER, function()
+        if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then
+            return
+        end
+        self:refreshBounty()
+    end)
     DataManager.MailData:checkNewMail()
 end
 
@@ -579,7 +593,7 @@ end
 
 function MainCityUI:refreshBounty()
 	local isOpen = DataManager.BountyData:getIsOpen()
-	if not isOpen then
+	if not isOpen or self.mainComp:getCurModuleType() == GConst.MainCityConst.BOTTOM_MODULE_KEY.DAILY_CHALLENGE then
 		self.bountyNode:setVisible(false)
 		return
 	end

lua/app/userdata/daily_challenge/daily_challenge_data.lua

@@ -290,6 +290,11 @@ function DailyChallengeData:getTodayRemainLimitCount()
     return count
 end
 
+-- 处理主动退出的情况
+function DailyChallengeData:onFightCountReduce()
+    self.todayFightCount = self.todayFightCount + 1
+end
+
 function DailyChallengeData:getFixedChapterId()
     return self.fixedChapterId
 end