From 5d9e8d33ded6374070a73ae32c93b0fff8619593 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 5 Jun 2023 10:58:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=B9=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/component/daily_challenge_comp.lua | 3 +++ lua/app/userdata/daily_challenge/daily_challenge_data.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lua/app/ui/main_city/component/daily_challenge_comp.lua b/lua/app/ui/main_city/component/daily_challenge_comp.lua index ff4610f4..4c59f52d 100644 --- a/lua/app/ui/main_city/component/daily_challenge_comp.lua +++ b/lua/app/ui/main_city/component/daily_challenge_comp.lua @@ -105,6 +105,9 @@ end function DailyChallengeComp:refreshBoss() local curBossInfo = DataManager.DailyChallengeData:getFinalBossInfo() + if not curBossInfo then + return + end if self.curModelId == curBossInfo.model_id then return end diff --git a/lua/app/userdata/daily_challenge/daily_challenge_data.lua b/lua/app/userdata/daily_challenge/daily_challenge_data.lua index f64038be..cf1e8d6c 100644 --- a/lua/app/userdata/daily_challenge/daily_challenge_data.lua +++ b/lua/app/userdata/daily_challenge/daily_challenge_data.lua @@ -128,6 +128,9 @@ function DailyChallengeData:getFinalBossInfo() return end local mapCfg = self:getMapConfig() + if not mapCfg then + return + end return ConfigManager:getConfig("monster")[mapCfg.monster[#mapCfg.monster]] end From c43e51b3d4b5ca25e7d42a12d2d290263eebd4fc Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 5 Jun 2023 11:05:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=8C=91=E6=88=98?= =?UTF-8?q?=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/tutorial/tutorial_const.lua | 1 + lua/app/ui/main_city/main_city_ui.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/lua/app/module/tutorial/tutorial_const.lua b/lua/app/module/tutorial/tutorial_const.lua index ba5d0d13..28aacd32 100644 --- a/lua/app/module/tutorial/tutorial_const.lua +++ b/lua/app/module/tutorial/tutorial_const.lua @@ -7,6 +7,7 @@ TutorialConst.START_TUTORIAL = 1 TutorialConst.PASS_ONE_CHAPTER = 2 TutorialConst.TWO_CHAPTER_BOX_CAN_GOT = 3 TutorialConst.PASS_THREE_CHAPTER = 4 +TutorialConst.UNLOCK_DAILY_CHALLENGE = 5 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 c363c79e..2a1e2718 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -900,6 +900,12 @@ function MainCityUI:checkTutorial() return true end end + + if DataManager.DailyChallengeData:isOpen() then + if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.UNLOCK_DAILY_CHALLENGE) then + return true + end + end end -- 检查礼包(首充/章节/新手/助力/成长/金币顺序)