From 2e790e086106dad0a6160b8a8ec65071f1c6ed85 Mon Sep 17 00:00:00 2001 From: SELEKCJONER Date: Thu, 21 Nov 2024 23:16:28 +0100 Subject: [PATCH] add new version and new event entering new event is broken for some reason --- .../LobbyServer/Msgs/Event/GetJoinedEvent.cs | 24 +++++++--- EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs | 44 ++++++++++++++++--- .../Msgs/Gacha/CheckGachaDailyEvent.cs | 2 +- EpinelPS/gameconfig.json | 10 ++--- 4 files changed, 63 insertions(+), 17 deletions(-) diff --git a/EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs b/EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs index fa5a93f..a2a812c 100644 --- a/EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs @@ -63,12 +63,12 @@ namespace EpinelPS.LobbyServer.Msgs.Event }, JoinAt = 0 }); - // cinderella banner + // grave banner response.EventWithJoinData.Add(new NetEventWithJoinData() { EventData = new NetEventData() { - Id = 70070, + Id = 70071, EventSystemType = 6, EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks, EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks, @@ -77,12 +77,12 @@ namespace EpinelPS.LobbyServer.Msgs.Event }, JoinAt = 0 }); - //cinderella free pull + //grave free pull response.EventWithJoinData.Add(new NetEventWithJoinData() { EventData = new NetEventData() { - Id = 80004, + Id = 80005, EventSystemType = 21, EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks, EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks, @@ -90,8 +90,22 @@ namespace EpinelPS.LobbyServer.Msgs.Event EventDisableDate = DateTime.Now.AddDays(20).Ticks }, JoinAt = 0 + }); + // banner for flora + response.EventWithJoinData.Add(new NetEventWithJoinData() + { + EventData = new NetEventData() + { + Id = 70072, + EventSystemType = 6, + 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 + }, + JoinAt = 0 }); - + await WriteDataAsync(response); } } diff --git a/EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs b/EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs index 9a8215e..24705a8 100644 --- a/EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs @@ -130,7 +130,7 @@ namespace EpinelPS.LobbyServer.Msgs.Event */ // Old tales - +/* response.EventList.Add(new NetEventData() { Id = 81600, @@ -206,27 +206,59 @@ namespace EpinelPS.LobbyServer.Msgs.Event EventEndDate = DateTime.Now.AddDays(20).Ticks, EventDisableDate = DateTime.Now.AddDays(20).Ticks, }); - // banner for cinderella i think + + */ + // secret garden - system error when trying to enter event idk why response.EventList.Add(new NetEventData() { - Id = 70070, + Id = 40063, + EventSystemType = 5, + 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, + }); + // Enable challenge mode + response.EventList.Add(new NetEventData() + { + Id = 60063, + EventSystemType = 20, + 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, + }); + + // banner for grave i think + response.EventList.Add(new NetEventData() + { + Id = 70071, EventSystemType = 6, 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, }); - // free pull for cinderella + // free pull for grave response.EventList.Add(new NetEventData() { - Id = 80004, + Id = 80005, EventSystemType = 21, 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, }); - + // banner for flora + response.EventList.Add(new NetEventData() + { + Id = 70072, + EventSystemType = 6, + 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() diff --git a/EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs b/EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs index f259add..a28a59e 100644 --- a/EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs +++ b/EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs @@ -14,7 +14,7 @@ namespace EpinelPS.LobbyServer.Msgs.Gacha response.FreeCount = 1; response.EventData = new NetEventData() { - Id = 80004, + Id = 80005, EventSystemType = 21, EventVisibleDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7)).Ticks, EventStartDate = DateTime.UtcNow.Subtract(TimeSpan.FromDays(1)).Ticks, diff --git a/EpinelPS/gameconfig.json b/EpinelPS/gameconfig.json index 1bbe60f..d37bb8a 100644 --- a/EpinelPS/gameconfig.json +++ b/EpinelPS/gameconfig.json @@ -2,14 +2,14 @@ // Asset Urls for game version 125.8.15 // Extracted from POST https://global-lobby.nikke-kr.com/v1/staticdatapack "StaticData": { - "Url": "https://cloud.nikke-kr.com/prdenv/126-c5efef67ba/staticdata/data/qa-241031-10b/348030/StaticData.pack", - "Version": "data/qa-241031-10b/348030", - "Salt1": "/XEVbXNDHebPC7CTGSl1XbWZZ8rZ0TaxIR43FaOKVdY=", - "Salt2": "SE9ra6+WFkYF6PVSOWKW1/c8t8J5wVr8pfhk7jt/fII=" + "Url": "https://cloud.nikke-kr.com/prdenv/126-c225064606/staticdata/data/qa-241121-10b-p1/351035/StaticData.pack", + "Version": "data/qa-241121-10b-p1/351035", + "Salt1": "IBNNwvPQCU2pYVpFpe1fb4FXCVY0iioSLlRWKiR0fLQ=", + "Salt2": "vulc+i/FfifybDz5HF6ZI/uHgCuPsDfoBISCqTU9CHw=" }, // Extracted from POST https://global-lobby.nikke-kr.com/v1/resourcehosts2 - "ResourceBaseURL": "https://cloud.nikke-kr.com/prdenv/126-bf15712d2c/{Platform}", + "ResourceBaseURL": "https://cloud.nikke-kr.com/prdenv/126-b96225e7af/{Platform}", // Extracted from route config "GameMinVer": "126.12.4",