From d35c87767f5c8ecf1dc455c47218bcf1cbdb783d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 21 九月 2018 23:37:17 +0800
Subject: [PATCH] 3797【前端】运营活动时间优化，开服日常限时活动定制时间优化
---
Utility/TimeUtility.cs | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/Utility/TimeUtility.cs b/Utility/TimeUtility.cs
index 1771abf..3ce6601 100644
--- a/Utility/TimeUtility.cs
+++ b/Utility/TimeUtility.cs
@@ -4,7 +4,7 @@
public static class TimeUtility
{
- private static DateTime _serverTime = DateTime.Now;
+ private static DateTime s_ServerTime = DateTime.Now;
private static float _checkTime = 0;
/// <summary>
@@ -15,10 +15,10 @@
get
{
float tick = Time.realtimeSinceStartup - _checkTime;
- DateTime real = _serverTime.AddSeconds(tick);
+ DateTime real = s_ServerTime.AddSeconds(tick);
return real;
}
- private set { _serverTime = value; }
+ private set { s_ServerTime = value; }
}
/// <summary>
@@ -95,7 +95,7 @@
get; private set;
}
- public static DateTime openServerTime;
+ public static DayOfWeek openServerDayOfWeek;
public static int OpenWeekCnt
{
@@ -138,10 +138,13 @@
public static void OnRefreshServerTime(HA004_tagServerDateTime vNetData)
{
DateTime n = new DateTime(vNetData.Year, vNetData.Month, vNetData.Day, vNetData.Hour, vNetData.Minute, vNetData.Second);
- _serverTime = n;
- DebugEx.Log("OnRefreshServerTime鏈堜唤锛�" + _serverTime.Month);
+ s_ServerTime = n;
+ DebugEx.Log("OnRefreshServerTime鏈堜唤锛�" + s_ServerTime.Month);
_checkTime = Time.realtimeSinceStartup;
- if (OnServerTimeRefresh != null) OnServerTimeRefresh();
+ if (OnServerTimeRefresh != null)
+ {
+ OnServerTimeRefresh();
+ }
TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.SyncServerTime, 60, (float tick) =>
{
SyncServerTime();
@@ -153,7 +156,18 @@
OpenDay = package.Day;
IsMixServer = package.IsMixServer == 1;
MixOpenDay = package.MixDay;
- DateTime.TryParse(package.OpenServerTime, out openServerTime);
+ openServerDayOfWeek = package.OpenWeekday == 7 ? DayOfWeek.Sunday : (DayOfWeek)package.OpenWeekday;
+ OnRefreshServerTime(new HA004_tagServerDateTime()
+ {
+ Year = package.NowYear,
+ Month = package.NowMonth,
+ Day = package.NowDay,
+ Hour = package.NowHour,
+ Minute = package.NowMinute,
+ Second = package.NowSecond,
+ MicSecond = package.NowMicSecond,
+ });
+ //DateTime.TryParse(package.OpenServerTime, out openServerTime);
if (OnServerOpenDayRefresh != null)
{
OnServerOpenDayRefresh();
--
Gitblit v1.8.0