From d003c8a551698b1a9e90af351ccacb3a959bcd27 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Mon, 4 Sep 2023 16:51:34 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/main_city/main_city_ui.lua                         | 2 +-
 .../userdata/activity/act_boss_rush/act_boss_rush_data.lua    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 4849436d..45961d48 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -1118,7 +1118,7 @@ function MainCityUI:checkMainPop()
         return
     end
 
-    if DataManager.ActBossRushData:getIsOpen() then -- 弹窗
+    if DataManager.ActBossRushData:getIsOpen() and not DataManager.TutorialData:getIsInTutorial()  then -- 弹窗
         if not DataManager.ActBossRushData:getMarkPoped() then
             if ModuleManager.ActBossRushManager:showPopUI() then
                 return
diff --git a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua
index f57470e4..c7608829 100644
--- a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua
+++ b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua
@@ -163,7 +163,9 @@ function ActBossRushData:getConditionDay()
 end
 
 function ActBossRushData:getIsOpen()
-    -- 开启条件
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then
+        return false
+    end
     if DataManager:getRegisterTs() <= self:getConditionDay() then -- 前14天的号，看不到
         return false
     end