mirror of
https://github.com/EpinelPS/EpinelPS.git
synced 2025-12-12 23:14:34 +01:00
use utc time for resethour
This commit is contained in:
@@ -601,14 +601,14 @@ namespace EpinelPS.Database
|
|||||||
|
|
||||||
private bool ShouldResetUser()
|
private bool ShouldResetUser()
|
||||||
{
|
{
|
||||||
var nowLocal = DateTime.Now;
|
var nowLocal = DateTime.UtcNow;
|
||||||
|
|
||||||
// Compute the last reset threshold (most recent 2 PM before or at nowLocal)
|
// Compute the last reset threshold (most recent 2 PM before or at nowLocal)
|
||||||
DateTime todayResetTime = new(
|
DateTime todayResetTime = new(
|
||||||
nowLocal.Year,
|
nowLocal.Year,
|
||||||
nowLocal.Month,
|
nowLocal.Month,
|
||||||
nowLocal.Day,
|
nowLocal.Day,
|
||||||
JsonDb.Instance.ResetHourLocalTime, 0, 0
|
JsonDb.Instance.ResetHourUtcTime, 0, 0
|
||||||
);
|
);
|
||||||
|
|
||||||
if (nowLocal < todayResetTime)
|
if (nowLocal < todayResetTime)
|
||||||
@@ -626,7 +626,7 @@ namespace EpinelPS.Database
|
|||||||
|
|
||||||
Logging.WriteLine("Resetting user...", LogType.Warning);
|
Logging.WriteLine("Resetting user...", LogType.Warning);
|
||||||
|
|
||||||
LastReset = DateTime.Now;
|
LastReset = DateTime.UtcNow;
|
||||||
ResetableData = new();
|
ResetableData = new();
|
||||||
JsonDb.Save();
|
JsonDb.Save();
|
||||||
}
|
}
|
||||||
@@ -644,7 +644,7 @@ namespace EpinelPS.Database
|
|||||||
public LogType LogLevel = LogType.Debug;
|
public LogType LogLevel = LogType.Debug;
|
||||||
|
|
||||||
public int MaxInterceptionCount = 3;
|
public int MaxInterceptionCount = 3;
|
||||||
public int ResetHourLocalTime = 14;
|
public int ResetHourUtcTime = 20;
|
||||||
}
|
}
|
||||||
internal class JsonDb
|
internal class JsonDb
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace EpinelPS.LobbyServer
|
|||||||
ResGetNow response = new()
|
ResGetNow response = new()
|
||||||
{
|
{
|
||||||
Tick = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
Tick = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
||||||
ResetHour = 1,
|
ResetHour = JsonDb.Instance.ResetHourUtcTime,
|
||||||
CheatShiftDuration = Duration.FromTimeSpan(TimeSpan.FromSeconds(0))
|
CheatShiftDuration = Duration.FromTimeSpan(TimeSpan.FromSeconds(0))
|
||||||
};
|
};
|
||||||
// todo: validate response with actual server
|
// todo: validate response with actual server
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
|
|||||||
ResEnterLobbyServer response = new()
|
ResEnterLobbyServer response = new()
|
||||||
{
|
{
|
||||||
User = LobbyHandler.CreateNetUserDataFromUser(user),
|
User = LobbyHandler.CreateNetUserDataFromUser(user),
|
||||||
ResetHour = 20,
|
ResetHour = JsonDb.Instance.ResetHourUtcTime,
|
||||||
Nickname = user.Nickname,
|
Nickname = user.Nickname,
|
||||||
SynchroLv = 1,
|
SynchroLv = 1,
|
||||||
OutpostBattleLevel = user.OutpostBattleLevel,
|
OutpostBattleLevel = user.OutpostBattleLevel,
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace EpinelPS.LobbyServer.LobbyUser
|
|||||||
|
|
||||||
|
|
||||||
response.User = LobbyHandler.CreateNetUserDataFromUser(user);
|
response.User = LobbyHandler.CreateNetUserDataFromUser(user);
|
||||||
response.ResetHour = 20;
|
response.ResetHour = JsonDb.Instance.ResetHourUtcTime;
|
||||||
response.OutpostBattleTime = new NetOutpostBattleTime() { MaxBattleTime = 864000000000, MaxOverBattleTime = 12096000000000, BattleTime = battleTimeMs };
|
response.OutpostBattleTime = new NetOutpostBattleTime() { MaxBattleTime = 864000000000, MaxOverBattleTime = 12096000000000, BattleTime = battleTimeMs };
|
||||||
response.OutpostBattleLevel = user.OutpostBattleLevel;
|
response.OutpostBattleLevel = user.OutpostBattleLevel;
|
||||||
response.IsSimple = req.IsSimple;
|
response.IsSimple = req.IsSimple;
|
||||||
|
|||||||
Reference in New Issue
Block a user