From 57d67a1f74f16bb4e536d4651b09fdd7d7758c97 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期五, 08 五月 2026 19:02:58 +0800
Subject: [PATCH] 597 时装特卖 优化活动系统
---
Main/Utility/EnumHelper.cs | 15 --
Main/System/CustomizedGift/CustomizedGiftModel.cs | 4
Main/System/HeroDebut/HeroDebutManager.cs | 3
Main/System/TimeRush/TimeRushManager.cs | 5
Main/System/FestivalActivity/FestivalActivityRechargeTotalManager.cs | 3
Main/System/FestivalActivity/FestivalActivityMissionManager.cs | 3
Main/System/FestivalActivity/FestivalActivityRechargeTotDayManager.cs | 3
Main/System/OpenServerActivity/OpenServerActivityCenter.cs | 322 ++++++++++++++++++---------------------------
Main/System/FestivalActivity/FestivalActivityManager.cs | 3
Main/System/FestivalActivity/FestivalActivityCheckInManager.cs | 3
Main/System/HeroReturn/HeroReturnManager.cs | 3
Main/System/TotDayRecharge/TotDayRechargeManager.cs | 3
Main/System/TotalRecharge/TotalRechargeManager.cs | 3
13 files changed, 141 insertions(+), 232 deletions(-)
diff --git a/Main/System/CustomizedGift/CustomizedGiftModel.cs b/Main/System/CustomizedGift/CustomizedGiftModel.cs
index 87ba3c5..f3159dd 100644
--- a/Main/System/CustomizedGift/CustomizedGiftModel.cs
+++ b/Main/System/CustomizedGift/CustomizedGiftModel.cs
@@ -12,9 +12,7 @@
private int GiftAwardRecord; //棰嗗彇鐘舵��
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
public const int activityID = 99999;
- //public const int activityID = (int)NewDayActivityID.CustomizedGiftWin;
public static OperationType operaType = (OperationType)99999999;
//public static OperationType operaType = OperationType.CustomizedGift;
@@ -27,7 +25,7 @@
OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;
- OpenServerActivityCenter.Instance.Register(activityID, this, activityType);
+ OpenServerActivityCenter.Instance.Register(activityID, this);
}
diff --git a/Main/System/FestivalActivity/FestivalActivityCheckInManager.cs b/Main/System/FestivalActivity/FestivalActivityCheckInManager.cs
index 26e4a0f..176f2f2 100644
--- a/Main/System/FestivalActivity/FestivalActivityCheckInManager.cs
+++ b/Main/System/FestivalActivity/FestivalActivityCheckInManager.cs
@@ -49,8 +49,7 @@
UpdateRedPoint();
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.FestivalActivityCheckInAct;
+ public const int activityID = (int)OperationType.FestivalActivity_CheckIn;
public static OperationType operaType = OperationType.FestivalActivity_CheckIn;
public Redpoint redPoint = new Redpoint(MainRedDot.FestivalActivityRepoint,
diff --git a/Main/System/FestivalActivity/FestivalActivityManager.cs b/Main/System/FestivalActivity/FestivalActivityManager.cs
index 1e2af89..48ad503 100644
--- a/Main/System/FestivalActivity/FestivalActivityManager.cs
+++ b/Main/System/FestivalActivity/FestivalActivityManager.cs
@@ -81,8 +81,7 @@
TryPopWin();
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.FestivalActivityAct;
+ public const int activityID = (int)OperationType.FestivalActivity;
public static OperationType operaType = OperationType.FestivalActivity;
public Redpoint redPoint = new Redpoint(MainRedDot.FestivalActivityRepoint);
diff --git a/Main/System/FestivalActivity/FestivalActivityMissionManager.cs b/Main/System/FestivalActivity/FestivalActivityMissionManager.cs
index d506b38..df5ac5d 100644
--- a/Main/System/FestivalActivity/FestivalActivityMissionManager.cs
+++ b/Main/System/FestivalActivity/FestivalActivityMissionManager.cs
@@ -65,8 +65,7 @@
UpdateRedPoint();
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.FestivalActivityMissionAct;
+ public const int activityID = (int)OperationType.FestivalActivity_Mission;
public static OperationType operaType = OperationType.FestivalActivity_Mission;
public Redpoint redPoint = new Redpoint(MainRedDot.FestivalActivityRepoint, FestivalActivityManager.Instance.GetRedPointId(FestivalActivityRepointType.Mission));
diff --git a/Main/System/FestivalActivity/FestivalActivityRechargeTotDayManager.cs b/Main/System/FestivalActivity/FestivalActivityRechargeTotDayManager.cs
index 0299911..aec7749 100644
--- a/Main/System/FestivalActivity/FestivalActivityRechargeTotDayManager.cs
+++ b/Main/System/FestivalActivity/FestivalActivityRechargeTotDayManager.cs
@@ -47,8 +47,7 @@
awardRecord = 0;
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.FestivalActivityRechargeTotDayAct;
+ public const int activityID = (int)OperationType.FestivalActivity_RechargeTotDay;
public static OperationType operaType = OperationType.FestivalActivity_RechargeTotDay;
// 鎬诲鍔�
public Redpoint redPoint = new Redpoint(
diff --git a/Main/System/FestivalActivity/FestivalActivityRechargeTotalManager.cs b/Main/System/FestivalActivity/FestivalActivityRechargeTotalManager.cs
index 70fc403..88272bb 100644
--- a/Main/System/FestivalActivity/FestivalActivityRechargeTotalManager.cs
+++ b/Main/System/FestivalActivity/FestivalActivityRechargeTotalManager.cs
@@ -48,8 +48,7 @@
awardRecord = 0;
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.FestivalActivityRechargeTotalAct;
+ public const int activityID = (int)OperationType.FestivalActivity_RechargeTotal;
public static OperationType operaType = OperationType.FestivalActivity_RechargeTotal;
// 鎬诲鍔�
public Redpoint redPoint = new Redpoint(
diff --git a/Main/System/HeroDebut/HeroDebutManager.cs b/Main/System/HeroDebut/HeroDebutManager.cs
index 28a24f1..5f4c475 100644
--- a/Main/System/HeroDebut/HeroDebutManager.cs
+++ b/Main/System/HeroDebut/HeroDebutManager.cs
@@ -104,8 +104,7 @@
}
public readonly int sendRankType = 6;
public int loadRankType => actNum * 1000 + sendRankType;
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.HeroDebutAct;
+ public const int activityID = (int)OperationType.HeroDebut;
public static OperationType operaType = OperationType.HeroDebut;
public Redpoint redPoint = new Redpoint(MainRedDot.HeroDebutRepoint);
diff --git a/Main/System/HeroReturn/HeroReturnManager.cs b/Main/System/HeroReturn/HeroReturnManager.cs
index 5f5647d..1578f94 100644
--- a/Main/System/HeroReturn/HeroReturnManager.cs
+++ b/Main/System/HeroReturn/HeroReturnManager.cs
@@ -104,8 +104,7 @@
}
public readonly int sendRankType = 6;
public int loadRankType => actNum * 1000 + sendRankType;
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.HeroReturnAct;
+ public const int activityID = (int)OperationType.HeroReturn;
public static OperationType operaType = OperationType.HeroReturn;
public Redpoint redPoint = new Redpoint(MainRedDot.HeroReturnRepoint);
diff --git a/Main/System/OpenServerActivity/OpenServerActivityCenter.cs b/Main/System/OpenServerActivity/OpenServerActivityCenter.cs
index 079d10c..7dc7d84 100644
--- a/Main/System/OpenServerActivity/OpenServerActivityCenter.cs
+++ b/Main/System/OpenServerActivity/OpenServerActivityCenter.cs
@@ -1,193 +1,129 @@
-锘縰sing System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-//淇敼鎴愭帶鍒跺涓椿鍔ㄦā鍧楋紝濡傜簿褰╂椿鍔ㄦā鏉�1锛岀簿褰╂椿鍔ㄦā鏉�2
-
-public class OpenServerActivityCenter : Singleton<OpenServerActivityCenter>
-{
- public event Action openServerActivityStateChange;
-
- //{娲诲姩妯℃澘锛歿娲诲姩ID锛氭椿鍔ㄦ帴鍙}
- Dictionary<int, Dictionary<int, IOpenServerActivity>> GameServerActivitys = new Dictionary<int, Dictionary<int, IOpenServerActivity>>();
-
- public int selectFuncOrder = -1;
-
- public enum ActivityType
- {
- AT_JCHD = 0, //绮惧僵娲诲姩
- AT_DateActivity, //鏃ユ湡鍨嬫椿鍔�- 鎸夋棩鏈熷紑鏀剧殑鎺掕姒滅郴鍒楁椿鍔ㄧ浉鍏� id浠�200寮�濮嬶紙涓庡叾浠栨椿鍔ㄥ尯鍒嗭紝铏界劧id閲嶅骞舵病鏈夊叧绯伙級锛� 绫诲悓鑺傛棩娲诲姩
- }
-
- public OpenServerActivityCenter()
- {
- TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;
- TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;
- }
-
- public void Register(int funcOrder, IOpenServerActivity activity, int activityType = (int)ActivityType.AT_JCHD)
- {
- if (!GameServerActivitys.ContainsKey(activityType))
- {
- GameServerActivitys.Add(activityType, new Dictionary<int, IOpenServerActivity>());
- }
-
- var openServerActivitys = GameServerActivitys[activityType];
- if (!openServerActivitys.ContainsKey(funcOrder))
- {
- openServerActivitys.Add(funcOrder, activity);
- activity.onStateUpdate -= OnStateUpdate;
- activity.onStateUpdate += OnStateUpdate;
- }
- }
-
- private void OnStateUpdate(int _order)
- {
- if (openServerActivityStateChange != null)
- {
- openServerActivityStateChange();
- }
- }
-
- private void OnServerOpenDayRefresh()
- {
- if (openServerActivityStateChange != null)
- {
- openServerActivityStateChange();
- }
- }
-
- public bool IsAnyActivityOpen(out int _functionOrder, int activityType = (int)ActivityType.AT_JCHD)
- {
- if (!GameServerActivitys.ContainsKey(activityType))
- {
- GameServerActivitys.Add(activityType, new Dictionary<int, IOpenServerActivity>());
- }
-
- var openServerActivitys = GameServerActivitys[activityType];
- _functionOrder = 0;
- foreach (var _order in openServerActivitys.Keys)
- {
- if (openServerActivitys[_order].IsOpen || openServerActivitys[_order].IsAdvance)
- {
- _functionOrder = _order;
- return true;
- }
- }
- return false;
- }
-
- public bool IsActivityOpen(int _funcOrder, int activityType = (int)ActivityType.AT_JCHD)
- {
- if (!GameServerActivitys.ContainsKey(activityType))
- {
- GameServerActivitys.Add(activityType, new Dictionary<int, IOpenServerActivity>());
- }
-
- bool isOpen = false;
- var openServerActivitys = GameServerActivitys[activityType];
- if (openServerActivitys.ContainsKey(_funcOrder))
- {
- isOpen = openServerActivitys[_funcOrder].IsOpen || openServerActivitys[_funcOrder].IsAdvance;
- }
-
- return isOpen;
- }
-
- public bool IsPriorityOpenOpen(int _funcOrder, int activityType = (int)ActivityType.AT_JCHD)
- {
- if (!GameServerActivitys.ContainsKey(activityType))
- {
- GameServerActivitys.Add(activityType, new Dictionary<int, IOpenServerActivity>());
- }
-
- var openServerActivitys = GameServerActivitys[activityType];
- if (openServerActivitys.ContainsKey(_funcOrder))
- {
- return openServerActivitys[_funcOrder].priorityOpen;
- }
- return false;
- }
-
-
-
-
- public void ProcessErrorTip()
- {
- SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
- }
-
- //AT_Activity2 鏃ユ湡鍨嬫椿鍔�-榛樿璁捐閮芥槸鍚屼竴涓叆鍙ｏ紝鏍规嵁娲诲姩鏇挎崲鍥炬爣鍜屽悕绉帮紝鎵撳紑涓嶅悓鐣岄潰
- public NewDayActivityInfo GetNewDayActionEnterInfo()
- {
- // if (IsActivityOpen((int)NewDayActivityID.BossTrial, (int)ActivityType.AT_Activity2))
- // {
- // return new NewDayActivityInfo() { activityID = (int)NewDayActivityID.BossTrial, redpointID = MainRedDot.BossTrialRepoint, winName = "BossTrialActWin" };
- // }
- // else if (IsActivityOpen((int)NewDayActivityID.SecretPlaceXB, (int)ActivityType.AT_Activity2))
- // {
- // return new NewDayActivityInfo() { activityID = (int)NewDayActivityID.SecretPlaceXB, redpointID = MainRedDot.MjxbRedpoint, winName = "SecretPlaceActWin" };
- // }
- // else if (IsActivityOpen((int)NewDayActivityID.PetHorseAct, (int)ActivityType.AT_Activity2))
- // {
- // return new NewDayActivityInfo() { activityID = (int)NewDayActivityID.PetHorseAct, redpointID = MainRedDot.QCTrainActRedpoint, winName = "PetHorseActWin" };
- // }
- // else if (IsActivityOpen((int)NewDayActivityID.TreasurePavilionAct, (int)ActivityType.AT_Activity2))
- // {
- // return new NewDayActivityInfo() { activityID = (int)NewDayActivityID.TreasurePavilionAct, redpointID = MainRedDot.TreasurePavilionRankActRepoint, winName = "TreasurePavilionRankActWin" };
- // }
-
- return new NewDayActivityInfo() { activityID = 0 };
- }
-
- //AT_Activity2 鍏ュ彛淇℃伅
- public struct NewDayActivityInfo
- {
- public int activityID;
- public int redpointID;
- public string winName;
- }
-}
-
-public interface IOpenServerActivity
-{
- bool IsOpen { get; }
- bool IsAdvance { get; }
- bool priorityOpen { get; }
-
- event Action<int> onStateUpdate;
-}
-
-public class ILOpenServerActivityProxy : IOpenServerActivity
-{
- public bool IsOpen => funcIsOpen();
-
- public bool IsAdvance => funcIsAdvance();
-
- public bool priorityOpen => funcPriorityOpen();
-
- public event Action<int> onStateUpdate;
-
- private Func<bool> funcIsOpen;
- private Func<bool> funcIsAdvance;
- private Func<bool> funcPriorityOpen;
-
- public ILOpenServerActivityProxy(Func<bool> isOpen, Func<bool> isAdvance, Func<bool> priorityOpen)
- {
- funcIsOpen = isOpen;
- funcIsAdvance = isAdvance;
- funcPriorityOpen = priorityOpen;
- }
-
-
- public void StateUpdate(int id)
- {
- if (onStateUpdate != null)
- {
- onStateUpdate(id);
- }
- }
-
-}
-
-
+锘縰sing System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+//淇敼鎴愭帶鍒跺涓椿鍔ㄦā鍧楋紝濡傜簿褰╂椿鍔ㄦā鏉�1锛岀簿褰╂椿鍔ㄦā鏉�2
+
+public class OpenServerActivityCenter : Singleton<OpenServerActivityCenter>
+{
+ public event Action openServerActivityStateChange;
+
+ //{娲诲姩ID锛氭椿鍔ㄦ帴鍙
+ Dictionary<int, IOpenServerActivity> GameServerActivitys = new Dictionary<int, IOpenServerActivity>();
+
+ public int selectFuncOrder = -1;
+
+ public OpenServerActivityCenter()
+ {
+ TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;
+ TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;
+ }
+
+ public void Register(int funcOrder, IOpenServerActivity activity)
+ {
+ if (!GameServerActivitys.ContainsKey(funcOrder))
+ {
+ GameServerActivitys.Add(funcOrder, activity);
+ activity.onStateUpdate -= OnStateUpdate;
+ activity.onStateUpdate += OnStateUpdate;
+ }
+ }
+
+ private void OnStateUpdate(int _order)
+ {
+ if (openServerActivityStateChange != null)
+ {
+ openServerActivityStateChange();
+ }
+ }
+
+ private void OnServerOpenDayRefresh()
+ {
+ if (openServerActivityStateChange != null)
+ {
+ openServerActivityStateChange();
+ }
+ }
+
+ public bool IsAnyActivityOpen(out int _functionOrder)
+ {
+ _functionOrder = 0;
+ foreach (var _order in GameServerActivitys.Keys)
+ {
+ if (GameServerActivitys[_order].IsOpen || GameServerActivitys[_order].IsAdvance)
+ {
+ _functionOrder = _order;
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public bool IsActivityOpen(int _funcOrder)
+ {
+ bool isOpen = false;
+ if (GameServerActivitys.ContainsKey(_funcOrder))
+ {
+ isOpen = GameServerActivitys[_funcOrder].IsOpen || GameServerActivitys[_funcOrder].IsAdvance;
+ }
+
+ return isOpen;
+ }
+
+ public bool IsPriorityOpenOpen(int _funcOrder)
+ {
+ if (GameServerActivitys.ContainsKey(_funcOrder))
+ {
+ return GameServerActivitys[_funcOrder].priorityOpen;
+ }
+ return false;
+ }
+
+
+
+ public void ProcessErrorTip()
+ {
+ SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
+ }
+}
+
+public interface IOpenServerActivity
+{
+ bool IsOpen { get; }
+ bool IsAdvance { get; }
+ bool priorityOpen { get; }
+
+ event Action<int> onStateUpdate;
+}
+
+public class ILOpenServerActivityProxy : IOpenServerActivity
+{
+ public bool IsOpen => funcIsOpen();
+
+ public bool IsAdvance => funcIsAdvance();
+
+ public bool priorityOpen => funcPriorityOpen();
+
+ public event Action<int> onStateUpdate;
+
+ private Func<bool> funcIsOpen;
+ private Func<bool> funcIsAdvance;
+ private Func<bool> funcPriorityOpen;
+
+ public ILOpenServerActivityProxy(Func<bool> isOpen, Func<bool> isAdvance, Func<bool> priorityOpen)
+ {
+ funcIsOpen = isOpen;
+ funcIsAdvance = isAdvance;
+ funcPriorityOpen = priorityOpen;
+ }
+
+
+ public void StateUpdate(int id)
+ {
+ if (onStateUpdate != null)
+ {
+ onStateUpdate(id);
+ }
+ }
+
+}
diff --git a/Main/System/TimeRush/TimeRushManager.cs b/Main/System/TimeRush/TimeRushManager.cs
index 58fc845..9461895 100644
--- a/Main/System/TimeRush/TimeRushManager.cs
+++ b/Main/System/TimeRush/TimeRushManager.cs
@@ -25,8 +25,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);
@@ -67,7 +66,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);
diff --git a/Main/System/TotDayRecharge/TotDayRechargeManager.cs b/Main/System/TotDayRecharge/TotDayRechargeManager.cs
index b2a7871..78bb223 100644
--- a/Main/System/TotDayRecharge/TotDayRechargeManager.cs
+++ b/Main/System/TotDayRecharge/TotDayRechargeManager.cs
@@ -47,8 +47,7 @@
awardRecord = 0;
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.TotDayRechargeAct;
+ public const int activityID = (int)OperationType.TotDayRecharge;
public static OperationType operaType = OperationType.TotDayRecharge;
// 鎬诲鍔�
public Redpoint redPoint = new Redpoint(MainRedDot.RedPoint_OSGala, MainRedDot.RedPoint_OSGala * 10 + 6);
diff --git a/Main/System/TotalRecharge/TotalRechargeManager.cs b/Main/System/TotalRecharge/TotalRechargeManager.cs
index 2a23413..c78de92 100644
--- a/Main/System/TotalRecharge/TotalRechargeManager.cs
+++ b/Main/System/TotalRecharge/TotalRechargeManager.cs
@@ -48,8 +48,7 @@
awardRecord = 0;
}
- public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
- public const int activityID = (int)NewDayActivityID.TotalRechargeAct;
+ public const int activityID = (int)OperationType.TotalRecharge;
public static OperationType operaType = OperationType.TotalRecharge;
// 鎬诲鍔�
public Redpoint redPoint = new Redpoint(MainRedDot.RedPoint_OSGala, MainRedDot.RedPoint_OSGala * 10 + 5);
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index a0618e8..845f48a 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -1810,21 +1810,6 @@
Mount,
}
-//OpenServerActivityCenter.ActivityType.AT_Activity2鐨勬椿鍔� 鍘嗗彶鍘熷洜涓嶈鐢�100
-public enum NewDayActivityID
-{
- TimeRushAct = 200, //杞洖娈�(姝﹀皢鍐插埡)
- HeroDebutAct = 201, //鑻遍泟鐧诲満娲诲姩
- HeroReturnAct = 202, //鑻遍泟杩斿満娲诲姩
- TotalRechargeAct = 203, //绱厖娲诲姩
- TotDayRechargeAct = 204, //绱厖澶╂椿鍔�
- FestivalActivityAct = 205, //鑺傛棩娲诲姩
- FestivalActivityRechargeTotalAct = 206,
- FestivalActivityRechargeTotDayAct = 207,
- FestivalActivityCheckInAct = 208,
- FestivalActivityMissionAct = 209, //鑺傛棩娲诲姩-浠诲姟
-}
-
//浠欑帀璐拱鐨勪簩娆＄‘璁ゆ绫诲瀷
public enum BuyStoreItemCheckType
{
--
Gitblit v1.8.0