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/TimeUtility.cs | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/Main/Utility/TimeUtility.cs b/Main/Utility/TimeUtility.cs
index 587220d..b9db750 100644
--- a/Main/Utility/TimeUtility.cs
+++ b/Main/Utility/TimeUtility.cs
@@ -130,6 +130,12 @@
get; private set;
}
+ //寮�鏈嶆椂闂存埑
+ public static int openServerTick
+ {
+ get; private set;
+ }
+
public static DayOfWeek openServerDayOfWeek;
public static int OpenWeekCnt
@@ -168,18 +174,16 @@
}
public static event Action OnCreateRoleTimeRefresh;
- // public static void OnRefreshCreateRoleTime(HA124_tagMCPlayerInfo _package)
- // {
-
-
- // createRoleTime = Convert.ToDateTime(UIHelper.GetTime(_package.CreateRoleTime));
- // createRoleTimeTail = new DateTime(createRoleTime.Year, createRoleTime.Month, createRoleTime.Day);
- // if (OnCreateRoleTimeRefresh != null)
- // {
- // OnCreateRoleTimeRefresh();
- // }
- // Debug.LogFormat("CreateRoleTime {0} CreateDays {1}", createRoleTimeTail, CreateDays);
- // }
+ public static void OnRefreshCreateRoleTime(HA124_tagMCPlayerInfo _package)
+ {
+ createRoleTime = Convert.ToDateTime(UIHelper.GetTime(_package.CreateRoleTime));
+ createRoleTimeTail = new DateTime(createRoleTime.Year, createRoleTime.Month, createRoleTime.Day);
+ if (OnCreateRoleTimeRefresh != null)
+ {
+ OnCreateRoleTimeRefresh();
+ }
+ Debug.LogFormat("CreateRoleTime {0} CreateDays {1}", createRoleTimeTail, CreateDays);
+ }
public static event Action OnServerTimeRefresh;
public static void OnRefreshServerTime(HA004_tagServerDateTime vNetData)
@@ -208,13 +212,12 @@
public static event Action OnServerOpenDayRefresh;
public static void OnRefreshServerOpenDay(HA103_tagMCOpenServerDay package)
{
- {
- OpenDay = package.Day;
- IsMixServer = package.IsMixServer == 1;
- MixOpenDay = package.MixDay;
- openServerDayOfWeek = package.OpenWeekday == 7 ? DayOfWeek.Sunday : (DayOfWeek)package.OpenWeekday;
- WeekOfYear = package.WeekOfYear;
- }
+ OpenDay = package.Day;
+ IsMixServer = package.IsMixServer == 1;
+ MixOpenDay = package.MixDay;
+ openServerDayOfWeek = package.OpenWeekday == 7 ? DayOfWeek.Sunday : (DayOfWeek)package.OpenWeekday;
+ WeekOfYear = package.WeekOfYear;
+ openServerTick = (int)package.OpenServerTime;
OnRefreshServerTime(new HA004_tagServerDateTime()
{
@@ -409,7 +412,7 @@
return StringUtility.Concat(hours.ToString(), Language.Get("L1072"), mins.ToString(), Language.Get("L1073"));
}
else if (mins > 0)
- {
+ {
return StringUtility.Concat(mins.ToString(), Language.Get("L1073"));
}
return StringUtility.Concat(seconds.ToString(), Language.Get("L1075"));
@@ -515,7 +518,7 @@
}
// 浠婃棩鍒皒鐐硅繕瑕佸灏戠锛屽鏋滃凡缁忚繃浜唜鐐癸紝杩斿洖0
- public static int GetToTheHourSeconds(int hour=10)
+ public static int GetToTheHourSeconds(int hour = 10)
{
var now = ServerNow;
if (now.Hour < hour)
@@ -585,5 +588,21 @@
var now = GetCommServerNow(zoneID).AddDays(1);
return new DateTime(now.Year, now.Month, now.Day);
}
+
+ //鑾峰彇褰撳墠鍛ㄥ嚑锛�1-7
+ public static int GetCommonWeekday(int zoneID = 0)
+ {
+ var day = GetCommServerNow(zoneID).DayOfWeek;
+ return day == DayOfWeek.Sunday ? 7 : (int)day;
+ }
+
+ //鏈懆缁撴潫鏃堕棿 绉�
+ public static int GetCommonWeekEndTime(int zoneID = 0)
+ {
+ var now = GetCommServerNow(zoneID);
+ var weekDay = GetCommonWeekday(zoneID);
+ var endDay = now.AddDays(7 - weekDay + 1);
+ return (int)(new DateTime(endDay.Year, endDay.Month, endDay.Day) - now).TotalSeconds;
+ }
#endregion
}
--
Gitblit v1.8.0