Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

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,	-- 点击任意区域

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

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
 
 -- 检查礼包(首充/章节/新手/助力/成长/金币顺序)

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