puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

引导和界面冲突处理

Browse Source
This commit is contained in:
Fang 2023-06-06 10:39:06 +08:00
parent 61b9ef3ae0
commit 1cebb9f5aa
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/ui/main_city/component/main_comp.lua
View File

@ -35,7 +35,7 @@ function MainComp:refreshModule(selectModule)
elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then
-- 切换到每日挑战 -- 切换到每日挑战
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE)
if not Datamanager.TutorialData:getIsInTutorial() and DataManager.DailyChallengeData:getIsPopTask() then if not DataManager.TutorialData:getIsInTutorial() and DataManager.DailyChallengeData:getIsPopTask() then
ModuleManager.DailyChallengeManager:showBattleTaskUI() ModuleManager.DailyChallengeManager:showBattleTaskUI()
end end
end end

4
lua/app/ui/main_city/main_city_ui.lua
View File

@ -954,6 +954,10 @@ function MainCityUI:checkGift()
if DataManager.TutorialData:getIsHaveTutorial() then if DataManager.TutorialData:getIsHaveTutorial() then
return return
end end
-- 非主线章节界面不处理（只在主线章节也就是主界面弹）
if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN or self.subComps[self.selectedIndex]:getCurModuleType() ~= GConst.MainCityConst.MAIN_MODULE.CHAPTER then
return
end
-- 章节礼包 -- 章节礼包
local chapterPopUpGifts = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT) local chapterPopUpGifts = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT)
-- 通用礼包 -- 通用礼包