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/Utility/EnumHelper.cs | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 259009d..af301c5 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -713,6 +713,9 @@
ChallengeVoucher = 286,//鎸戞垬鍑瘉
DailySpecials = 287, //鐗规儬鍗扮欢
OSGalaScore = 288, //寮�鏈嶅簡鍏哥Н鍒�
+ QunyingWDL = 289, //缇よ嫳闂紟浠�
+ QYScore = 290, //缇よ嫳绉垎
+ heroSkin = 291, // 鐢ㄤ簬鐨偆鍟嗗簵璐拱
};
@@ -850,6 +853,11 @@
FuncPreset = 56, //娴佹淳棰勮
TimingGift = 57, //鏃舵満绀煎寘
TimeRush = 58, //闄愭椂鍐插埡
+ OSHeroTrain = 59, //寮�鏈嶆灏嗗煿鍏绘娲诲姩
+ OSBeautyMM = 60, //寮�鏈嶇孩棰滄娲诲姩
+ OSMingge = 61, //寮�鏈嶅懡鏍煎煿鍏绘娲诲姩
+ Qunying = 62, //缇よ嫳姒�
+ HeroDebut = 63,//姝﹀皢鐧诲満
}
@@ -1803,29 +1811,8 @@
//OpenServerActivityCenter.ActivityType.AT_Activity2鐨勬椿鍔� 鍘嗗彶鍘熷洜涓嶈鐢�100
public enum NewDayActivityID
{
- BossTrial = 200, //boss鍑瘉
- LoginAct = 201, //鐧诲綍娲诲姩
- MissionAct = 202, //浠诲姟娲诲姩
- RechargeGiftAct = 203, //鍏呭�肩ぜ鍖咃紙鍏呭�兼鏁板鍔憋級
- CrossBossTrial = 204, //璺ㄦ湇boss鍑瘉 蹇呴』鍜孊ossTrial 涓�璧�
- FamilyRechargeConnAct = 205, //浠欑洘鍗忓姪
- CustomizedGiftWin = 206, //鑷�夌ぜ鍖�
- SecretPlaceXB = 207, //绉樺瀵诲疂
- SecretPlaceXBCross = 208, //绉樺瀵诲疂 璺ㄦ湇
- RechargeGiftAct31 = 209, //鑷�夊厖鍊� + 鍟嗗簵绀煎寘
- PetHorseAct = 210, //瀹犵墿鍧愰獞娲诲姩
- PetHorseActCross = 211, //瀹犵墿鍧愰獞娲诲姩 璺ㄦ湇
- TreasurePavilionAct = 212, //鍙ゅ疂娲诲姩
- TreasurePavilionActCross = 213, //鍙ゅ疂娲诲姩 璺ㄦ湇
- FairyAffinityLoginAct = 214, //浠欑紭鐧婚檰娲诲姩
- FairyAffinityMissionAct = 215, //浠欑紭浠诲姟娲诲姩
- FairyAffinityRechargeGiftAct = 216, //浠欑紭绀煎寘娲诲姩
- TimeRushAct = 217, //杞洖娈挎椿鍔�
- YunShiXBAct = 218, //杩愬娍瀵诲疂娲诲姩
- YunShiMissionAct = 219, //杩愬娍浠诲姟娲诲姩
- YunShiRechargeGiftAct = 220, //杩愬娍绀煎寘娲诲姩
- LianQiActCross = 221, //浠欏尃澶т細娲诲姩 璺ㄦ湇
- LianQiRechargeGiftActCross = 222, //浠欏尃澶т細绀煎寘娲诲姩 璺ㄦ湇
+ TimeRushAct = 200, //杞洖娈�(姝﹀皢鍐插埡)
+ HeroDebutAct = 201, //鑻遍泟鐧诲満娲诲姩
}
//浠欑帀璐拱鐨勪簩娆＄‘璁ゆ绫诲瀷
@@ -1844,5 +1831,5 @@
{
viewPlayerData = 0, //鏌ョ湅鐜╁鍩烘湰淇℃伅锛屽叕鐢ㄦ墦寮�鐣岄潰
viewGuildLeader = 1, //鏌ョ湅鐜╁鐨勫叕浼氭棌闀夸俊鎭�
- viewArenaBattleEnemyHero = 2, //鏌ョ湅绔炴妧鍦烘垬鏂楁晫鏂硅嫳闆勪俊鎭�
+ viewPVPBattleEnemyHero = 2, //鏌ョ湅绔炴妧鍦烘垬鏂楁晫鏂硅嫳闆勪俊鎭�
}
--
Gitblit v1.8.0