少年修仙传客户端代码仓库
client_Zxw
2018-09-18 1bb41ef5fae769c2adbe2d1bee29b3437f225997
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
10 ■■■■ 已修改文件
System/DailyQuest/DailyQuestData.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowBase/Window.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestData.cs
@@ -357,7 +357,9 @@
    private bool ContainWeek(int week)
    {
        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
        var dayDelta = (week == 0 ? 7 : week) - openDayWeek;
        var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
        var dayDelta = ((week == 0 ? 7 : week) - (todayWeek == 0 ? 7 : todayWeek)) + TimeUtility.OpenWeekCnt * 7;
        if (TimeUtility.OpenWeekCnt < 1 && dayDelta < 0)
        {
            return openTimes.ContainsKey(week);
@@ -420,7 +422,8 @@
        if (isSpecificDay)
        {
            var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
            var dayDelta = ((week == 0 ? 7 : week) - openDayWeek) + TimeUtility.OpenWeekCnt * 7;
            var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
            var dayDelta = ((week == 0 ? 7 : week) - (todayWeek == 0 ? 7 : todayWeek)) + TimeUtility.OpenWeekCnt * 7;
            var dayIndex = TimeUtility.OpenDay + 1 + dayDelta;
            if (specialOpenTimes.ContainsKey(openDayWeek) && specialOpenTimes[openDayWeek].ContainsKey(dayIndex))
            {
System/WindowBase/Window.cs
@@ -473,7 +473,8 @@
                        foreach (var child in childWindows)
                        {
                            var window = WindowCenter.Instance.Get(child);
                            if (window != null && !window.executedActiveWindow)
                            if (window != null && (window.windowState == WindowState.Opening || window.windowState == WindowState.Opened)
                                && !window.executedActiveWindow)
                            {
                                window.ChildActive();
                            }