update event data

EpinelPS/LobbyServer/Event/EventTypes.cs

@@ -1,57 +0,0 @@
-namespace EpinelPS.LobbyServer.Event
-{
-    public enum EventType : int
-    {
-        None = 0,
-        DailyMissionEvent = 1,
-        LoginEvent = 2,
-        ViewShortCut = 3,
-        CooperationEvent = 4,
-        StoryEvent = 5,
-        PickupGachaEvent = 6,
-        PollEvent = 7,
-        ComeBackUserEvent = 8,
-        EventPass = 9,
-        FieldHubEvent = 10,
-        ShopEvent = 11,
-        MissionEvent = 12,
-        ChargeGachaEvent = 13,
-        MiniGameSortOut = 14,
-        CharacterSkillResetEvent = 15,
-        EventQuest = 16,
-        RewardUpEvent = 17,
-        SDBattleEvent = 18,
-        TextAdventure = 19,
-        ChallengeModeEvent = 20,
-        DailyFreeGachaEvent = 21,
-        BoxGachaEvent = 22,
-        DiceEvent = 23,
-        BBQTycoon = 24,
-        CE002MiniGame = 25,
-        TriggerMissionEventReward = 26,
-        ArenaRookieGroupShuffle = 27,
-        ArenaSpecialGroupShuffle = 28,
-        NKSMiniGame = 29,
-        DatingSimulator = 30,
-        DessertRush = 31,
-        CE003MiniGame = 32,
-        TowerDefense = 33,
-        EventPlaySoda = 34,
-        IslandAdventure = 35,
-        MiniGameDD = 36,
-        CE004MiniGame = 37,
-        MVGMiniGame = 38,
-        DragonDungeonRunMiniGame = 39,
-        NewPlayerLottery = 40,
-        PirateCafe = 41,
-        CEEvaMiniGame = 42,
-        BubbleMarchMiniGame = 43,
-        CE006BossChallengeMiniGame = 44,
-        SupportCharacterEvent = 45,
-        GachaBoard = 46,
-        FreeRewardPass = 47,
-        GachaPayback = 48,
-        FieldCollectEvent = 49,
-        MiniGameBTG = 50
-    }
-}

EpinelPS/LobbyServer/Event/ListEvents.cs

@@ -1,4 +1,5 @@
-using EpinelPS.Utils;
+using EpinelPS.Data;
+using EpinelPS.Utils;
 
 namespace EpinelPS.LobbyServer.Event
 {
@@ -12,11 +13,11 @@ namespace EpinelPS.LobbyServer.Event
             // types are defined in EventTypes.cs
             ResGetEventList response = new();
 
-            // Boom! The Ghost! summer event
+            // reborn evil collab event
             response.EventList.Add(new NetEventData()
             {
-                Id = 82400,
-                EventSystemType = (int)EventType.FieldHubEvent,
+                Id = 82600,
+                EventSystemType = (int)EventSystemType.FieldHubEvent,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -25,7 +26,7 @@ namespace EpinelPS.LobbyServer.Event
             response.EventList.Add(new NetEventData()
             {
                 Id = 82401,
-                EventSystemType = (int)EventType.MiniGameBTG,
+                EventSystemType = (int)EventSystemType.CE007MiniGame,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -33,8 +34,8 @@ namespace EpinelPS.LobbyServer.Event
             });
             response.EventList.Add(new NetEventData()
             {
-                Id = 82402,
-                EventSystemType = (int)EventType.ShopEvent,
+                Id = 82602,
+                EventSystemType = (int)EventSystemType.ShopEvent,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -42,8 +43,8 @@ namespace EpinelPS.LobbyServer.Event
             });
             response.EventList.Add(new NetEventData()
             {
-                Id = 40084,
-                EventSystemType = (int)EventType.StoryEvent,
+                Id = 40090,
+                EventSystemType = (int)EventSystemType.StoryEvent,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -51,8 +52,8 @@ namespace EpinelPS.LobbyServer.Event
             });
             response.EventList.Add(new NetEventData()
             {
-                Id = 40085,
-                EventSystemType = (int)EventType.StoryEvent,
+                Id = 40091,
+                EventSystemType = (int)EventSystemType.StoryEvent,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -60,8 +61,8 @@ namespace EpinelPS.LobbyServer.Event
             });
             response.EventList.Add(new NetEventData()
             {
-                Id = 60084,
-                EventSystemType = (int)EventType.ChallengeModeEvent,
+                Id = 60090,
+                EventSystemType = (int)EventSystemType.ChallengeModeEvent,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -69,8 +70,8 @@ namespace EpinelPS.LobbyServer.Event
             });
             response.EventList.Add(new NetEventData()
             {
-                Id = 100032,
-                EventSystemType = (int)EventType.EventPass,
+                Id = 100034,
+                EventSystemType = (int)EventSystemType.EventPass,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,
@@ -78,8 +79,26 @@ namespace EpinelPS.LobbyServer.Event
             });
             response.EventList.Add(new NetEventData()
             {
-                Id = 82403,
-                EventSystemType = (int)EventType.LoginEvent,
+                Id = 100035,
+                EventSystemType = (int)EventSystemType.EventPass,
+                EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
+                EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
+                EventEndDate = DateTime.Now.AddDays(20).Ticks,
+                EventDisableDate = DateTime.Now.AddDays(20).Ticks
+            });
+            response.EventList.Add(new NetEventData()
+            {
+                Id = 82603,
+                EventSystemType = (int)EventSystemType.LoginEvent,
+                EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
+                EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
+                EventEndDate = DateTime.Now.AddDays(20).Ticks,
+                EventDisableDate = DateTime.Now.AddDays(20).Ticks
+            });
+            response.EventList.Add(new NetEventData()
+            {
+                Id = 30076,
+                EventSystemType = (int)EventSystemType.CooperationEvent,
                 EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks,
                 EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks,
                 EventEndDate = DateTime.Now.AddDays(20).Ticks,

EpinelPS/Utils/RewardUtils.cs

@@ -68,7 +68,7 @@ namespace EpinelPS.Utils
                 user.userPointData.UserLevel = newLevel;
             }
 
-            foreach (RewardEntry item in rewardData.Rewards)
+            foreach (var item in rewardData.Rewards)
             {
                 if (item.RewardType != RewardType.None)
                 {