Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 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 @@
    }

    // 今日到x点还要多少秒，如果已经过了x点，返回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
}