diff --git a/lua/app/module/tutorial/tutorial_const.lua b/lua/app/module/tutorial/tutorial_const.lua index 7ae4647c..7c86e457 100644 --- a/lua/app/module/tutorial/tutorial_const.lua +++ b/lua/app/module/tutorial/tutorial_const.lua @@ -11,6 +11,7 @@ TutorialConst.DAILY_CHALLENGE_OPEN = 4 -- TutorialConst.UNLOCK_DAILY_CHALLENGE = 5 -- TutorialConst.UNLOCK_DUNGEON = 6 TutorialConst.UNLOCK_ARENA = 5 +TutorialConst.UNLOCK_SUMMON = 6 TutorialConst.TUTORIAL_TYPE = { CLICK = 1, -- 点击任意区域 diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index b6384bd9..a64a24b9 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -613,6 +613,15 @@ end -- 弹窗优先级: 升级>功能弹窗>英雄解锁弹窗>礼包弹窗>引导 function MainCityUI:checkMainPop() + local topUI = UIManager:getTopUIObj() + if topUI:getUIIndex() ~= self:getUIIndex() then + if topUI:getUIIndex() == UIManager.UI_PATH.REWARD_BOX then + topUI:addExitAniCompleteListener(function() + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_POP) + end) + end + return + end -- 续关 if self.isFirstEnter then local battleSnapshot = LocalData:getBattleSnapshot() @@ -697,6 +706,12 @@ function MainCityUI:checkTutorial(onlyCheck) end end + if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.UNLOCK_SUMMON) and DataManager.SummonData:getIsOpen() then + if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_SUMMON, onlyCheck) then + return true + end + end + if not DataManager.TutorialData:getIsFuncTutorialFinished2(GConst.TutorialConst.DAILY_CHALLENGE_OPEN) and DataManager.DailyChallengeData:isOpen() then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.DAILY_CHALLENGE_OPEN, onlyCheck) then return true