From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

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

diff --git a/Main/System/TimeRush/TimeRushManager.cs b/Main/System/TimeRush/TimeRushManager.cs
index 70eb289..b6ed1e5 100644
--- a/Main/System/TimeRush/TimeRushManager.cs
+++ b/Main/System/TimeRush/TimeRushManager.cs
@@ -6,8 +6,6 @@
 
 public class TimeRushManager : GameSystemManager<TimeRushManager>, IOpenServerActivity
 {
-
-
     public Action PlayAnimationSync;
 
     private bool isPlayAnimation = false;
@@ -28,10 +26,10 @@
         }
     }
 
-    public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_Activity2;
+    public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
     public const int activityID = (int)NewDayActivityID.TimeRushAct;
     public int actNum = 10;
-    public static OperationType operaType = OperationType.default47;
+    public static OperationType operaType = OperationType.TimeRush;
     public Redpoint redPoint = new Redpoint(MainRedDot.TimeRushRepoint);
 
     public bool IsOpen => OperationTimeHepler.Instance.SatisfyOpenCondition(operaType);

--
Gitblit v1.8.0