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/OpenServerActivity/OperationTimeHepler.cs | 132 +++++++++++++------------------------------
1 files changed, 40 insertions(+), 92 deletions(-)
diff --git a/Main/System/OpenServerActivity/OperationTimeHepler.cs b/Main/System/OpenServerActivity/OperationTimeHepler.cs
index 6e75950..b4ef7bc 100644
--- a/Main/System/OpenServerActivity/OperationTimeHepler.cs
+++ b/Main/System/OpenServerActivity/OperationTimeHepler.cs
@@ -435,17 +435,17 @@
public void UpdateActLunhuidianInfo(HAA88_tagMCActLunhuidianInfo package)
{
OperationBase operationBase = null;
- operationDict.TryGetValue(OperationType.default47, out operationBase);
+ operationDict.TryGetValue(OperationType.TimeRush, out operationBase);
if (string.IsNullOrEmpty(package.StartDate) || string.IsNullOrEmpty(package.EndtDate))
{
- ForceStopOperation(OperationType.default47);
+ ForceStopOperation(OperationType.TimeRush);
}
else
{
if (operationBase == null)
{
operationBase = new OperationCycleHall();
- operationDict.Add(OperationType.default47, operationBase);
+ operationDict.Add(OperationType.TimeRush, operationBase);
}
OperationCycleHall operation = operationBase as OperationCycleHall;
operation.Reset();
@@ -456,9 +456,43 @@
operation.ParseCycleHallInfo(package);
if (operationTimeUpdateEvent != null)
{
- operationTimeUpdateEvent(OperationType.default47);
+ operationTimeUpdateEvent(OperationType.TimeRush);
}
}
+ }
+
+ public void UpdateActHeroAppearInfo(HAA21_tagSCActHeroAppearInfo package)
+ {
+ var opreationType = OperationType.HeroDebut;
+ switch (package.ActNum)
+ {
+ case 10:
+ opreationType = OperationType.HeroDebut;
+ break;
+ // case 11:
+ // opreationType = OperationType.HeroBack;
+ // break;
+ }
+
+ if (string.IsNullOrEmpty(package.StartDate) || string.IsNullOrEmpty(package.EndtDate))
+ {
+ ForceStopOperation(opreationType);
+ return;
+ }
+
+ if (!operationDict.TryGetValue(opreationType, out OperationBase operationBase))
+ {
+ operationBase = new OperationHeroAppearInfo();
+ operationDict.Add(opreationType, operationBase);
+ }
+ OperationHeroAppearInfo operation = operationBase as OperationHeroAppearInfo;
+ operation.Reset();
+ operation.startDate = ParseOperationDate(package.StartDate);
+ operation.endDate = ParseOperationDate(package.EndtDate);
+ operation.ActType = package.ActType;
+ operation.CfgID = package.CfgID;
+
+ operationTimeUpdateEvent?.Invoke(opreationType);
}
// public void UpdateActYunShiInfo(HAA87_tagMCActYunshiInfo package)
@@ -1048,93 +1082,7 @@
public enum OperationType
{
-
-
- MultipleExp,
- ConsumeRebate,
- FlashSale,//闄愭椂鐗规儬
- BossReborn,
- GiftPackage,
- FairyCeremony, //浠欑晫鐩涘吀
- MultipRealmPoint, //N鍊嶄慨琛岀偣
- FlashRushToBuy, //闄愭椂鎶㈣喘
- WishingWellInfo, //璁告効姹�
- AccumulateRecharge,//绱鍏呭�硷紝鍗曟棩
- LoginReward,//鐧诲綍濂栧姳
- FestivalRedpack,//鑺傛棩绾㈠寘
- NewYearFairyCeremony, //鏄ヨ妭浠欑晫鐩涘吀
- SpringFestival,//鏄ヨ妭宸＄ぜ
- OpenServiceAchievement,//涓冩棩宸＄ぜ
- LuckyTreasure,//骞歌繍閴村疂
- MultiRecharge, //浠欑帀鍏呭�艰繑鍒� 锛堥鍏呭弻鍊嶏級
- CZBMGift, // 鎴愰暱蹇呬拱绀煎寘
- DaysAccumulateRecharge, //绱鍏呭�硷紝澶氭棩
- CollectWords, //鏀堕泦鏂囧瓧
- HolidayLogin, //鑺傛棩鐧诲綍
- HolidayWish, //鑺傛棩绁濈鐏
- HolidayMultiRecharge,//鑺傛棩绁濈鐨勫鏃ョ疮璁″厖鍊� 鍖呭惈浠绘剰鍏呭�肩晫闈㈠拰澶氭棩绱厖鐣岄潰
- HolidayTravel, //鑺傛棩娓稿巻
- HolidayAccumulateRecharge, //鑺傛棩-鍗曟棩鐨勭疮绉厖鍊�
- HolidayCollectWords, //鑺傛棩-闆嗗瓧
- HolidayGiftPackage, //鑺傛棩绁濈-闄愭椂绀煎寘
- HolidayFlashRushToBuy, //鑺傛棩-闄愭椂鎶㈣喘
- HolidayFlashSale, //鑺傛棩绁濈-闄愭椂鐗规儬
- HolidayConsumeRebate, //鑺傛棩绁濈-娑堣垂杩斿埄
-
- //鍚庣画IL寮�鍙戞坊鍔犻璁�
- default1, // 杩炵画澶氭棩绱厖
- default2,
- default3, // 鑺傛棩-鍨冨溇鍒嗙被
- default4, // 鑺傛棩-缈荤墝
- default5,
- default6,
- default7, // 绮惧僵娲诲姩-璺ㄦ湇鍏呭��
- default8, // 鍚堟湇-绂忓埄锛堝鏃ョ疮鍏�1妗ｏ級
- default9, // 鍚堟湇-杞洏
- default10, // 鍚堟湇-闆嗗瓧鐙傛
- default11, // 鍚堟湇-鍧愰獞鐩涘
- default12, // 鍚堟湇-瓒呭�奸檺璐�
- default13, // 鍚堟湇-闄愭椂绀煎寘
- default14,
- default15,
- default16,
- default17,
- default18, // 骞歌繍浜戣喘
- default19,
- default20, //鑺傛棩鎸囧畾绱鍏呭�奸搴︼紝鍜岃妭鏃ヤ换鎰忓厖鍊肩嫭绔嬩袱涓晫闈�
- default21,
- default22, //澶╁笣绀煎寘
- default23,
- default24,
- default25, //涔�1閫�5
- default26,
- default27, //鏃ユ湡鍨嬫椿鍔�- boss鍘嗙粌娲诲姩
- default28, //绮惧僵娲诲姩-鍗曠瑪鍏呭��
- default29, //鏃ユ湡鍨嬫椿鍔�- 鐧诲綍锛屽彲琛ョ
- default30, //鏃ユ湡鍨嬫椿鍔�- 浠诲姟
- default31, //鏃ユ湡鍨嬫椿鍔�- 绀煎寘锛屽彲绱璐拱娆℃暟棰嗗彇
- default32, //绂忕紭- 闀夸箙绱厖锛堝嚑涓湀鎴栨洿闀匡級 鐙珛鐣岄潰
- default33, //鏃ユ湡鍨嬫椿鍔�- boss 鍘嗙粌娲诲姩(璺ㄦ湇) 蹇呴』鍜屾椿鍔╠efault27涓�璧蜂娇鐢�
- default34, //鏃ユ湡鍨嬫椿鍔�- 浠欑洘鍏呭�间簰鍔╋紝鐗规畩锛氬厑璁稿涓椿鍔ㄥ悓鏃跺紑鍚�
- default35, //鑷�夌ぜ鍖�
- default36, //鏃ユ湡鍨嬫椿鍔�- 绉樺瀵诲疂锛堢被浠欏專锛� 涓绘椿鍔�
- default37, //鏃ユ湡鍨嬫椿鍔�- 绉樺瀵诲疂锛堢被浠欏專锛� 璺ㄦ湇
- default38, //鏃ユ湡鍨嬫椿鍔�- 鑷�夌ぜ鍖� + 鍟嗗簵
- default39, //鏃ユ湡鍨嬫椿鍔�- 楠戝疇鍩瑰吇鏈湇
- default40, //鏃ユ湡鍨嬫椿鍔�- 楠戝疇鍩瑰吇璺ㄦ湇
- default41, //鏃ユ湡鍨嬫椿鍔�- 鍙ゅ疂鍏绘垚鏈湇
- default42, //鏃ユ湡鍨嬫椿鍔�- 鍙ゅ疂鍏绘垚璺ㄦ湇
- default43, ////鏃ユ湡鍨嬫椿鍔�- 浠诲姟鐜�
- default44, //鏃ユ湡鍨嬫椿鍔� - 浠欑紭鐧婚檰,鍙ˉ绛�
- default45, //鏃ユ湡鍨嬫椿鍔� - 浠欑紭浠诲姟
- default46, //鏃ユ湡鍨嬫椿鍔� - 浠欑紭绀煎寘
- default47, //鏃ユ湡鍨嬫椿鍔� - 杞洖娈�
- default48, //鏃ユ湡鍨嬫椿鍔� - 杩愬娍瀵诲疂
- default49, //鏃ユ湡鍨嬫椿鍔� - 杩愬娍浠诲姟
- default50, //鏃ユ湡鍨嬫椿鍔� - 杩愬娍绀煎寘
- default51, //鏃ユ湡鍨嬫椿鍔� - 浠欏尃澶т細鐐煎櫒
- default52, //鏃ユ湡鍨嬫椿鍔� - 浠欏尃澶т細绀煎寘
- default53, //鏃ユ湡鍨嬫椿鍔� - 浠欑洘鏀诲煄鎴� 璺ㄦ湇
- default54, //鏃ユ湡鍨嬫椿鍔� - 浠欑洘鏀诲煄鎴樹粰鐩熷崗鍔╁拰绀煎寘
+ TimeRush = 1, //鏃ユ湡鍨嬫椿鍔� - 杞洖娈�
+ HeroDebut = 2, //鏃ユ湡鍨嬫椿鍔� - 姝﹀皢鐧诲満
max,
}
\ No newline at end of file
--
Gitblit v1.8.0