From 1f42a4e96726e4cd79f84d541c816792a55796bf Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Mon, 9 Oct 2023 11:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/tourn_arena/tourn_arena_data.lua        | 12 ++++++++++++
 .../userdata/activity/tourn_wave/tourn_wave_data.lua | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua b/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua
index 9f846dea..d8037abd 100644
--- a/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua
+++ b/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua
@@ -100,6 +100,9 @@ function TournArenaData:isOpen()
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then
         return false
     end
+    if Time:getServerTime() <= DataManager:getRegisterTs() + self:getConditionDay() then -- 前14天的号，看不到
+        return false
+    end
     return true
 end
 
@@ -144,6 +147,15 @@ function TournArenaData:getActDay()
     return days + 1
 end
 
+function TournArenaData:getConditionDay()
+    if not self.conditionDay then
+        self.conditionDay = GFunc.getConstIntValue('activity_recurring_day')
+        self.conditionDay = (self.conditionDay - 1) * 86400
+    end
+
+    return self.conditionDay
+end
+
 -- 是否有入口红点
 function TournArenaData:hasEntryRedPoint()
     return self:hasBountyRedPoint() or self:hasRankRedPoint() or self:hasGiftRedPoint()
diff --git a/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua b/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua
index f5134d61..b62f63f1 100644
--- a/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua
+++ b/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua
@@ -116,6 +116,9 @@ function TournWaveData:isOpen()
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then
         return false
     end
+    if Time:getServerTime() <= DataManager:getRegisterTs() + self:getConditionDay() then -- 前14天的号，看不到
+        return false
+    end
     return true
 end
 
@@ -160,6 +163,15 @@ function TournWaveData:getActDay()
     return days + 1
 end
 
+function TournWaveData:getConditionDay()
+    if not self.conditionDay then
+        self.conditionDay = GFunc.getConstIntValue('activity_recurring_day')
+        self.conditionDay = (self.conditionDay - 1) * 86400
+    end
+
+    return self.conditionDay
+end
+
 -- 是否有入口红点
 function TournWaveData:hasEntryRedPoint()
     return self:hasBountyRedPoint() or self:hasRankRedPoint() or self:hasGiftRedPoint()