From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/TimeRush/TimeRushManager.cs |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Main/System/TimeRush/TimeRushManager.cs b/Main/System/TimeRush/TimeRushManager.cs
index 364d752..5b803f9 100644
--- a/Main/System/TimeRush/TimeRushManager.cs
+++ b/Main/System/TimeRush/TimeRushManager.cs
@@ -26,8 +26,7 @@
         }
     }
 
-    public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
-    public const int activityID = (int)NewDayActivityID.TimeRushAct;
+    public const int activityID = (int)OperationType.TimeRush;
     public int actNum = 10;
     public static OperationType operaType = OperationType.TimeRush;
     public Redpoint redPoint = new Redpoint(MainRedDot.TimeRushRepoint);
@@ -68,7 +67,7 @@
         OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;
         StoreModel.Instance.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
         //storeModel.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
-        OpenServerActivityCenter.Instance.Register(activityID, this, activityType);
+        OpenServerActivityCenter.Instance.Register(activityID, this);
 
         var config = FuncConfigConfig.Get("TimeRush");
         windowIDDict = ConfigParse.ParseIntDict(config.Numerical1);

--
Gitblit v1.8.0