From 1bb41ef5fae769c2adbe2d1bee29b3437f225997 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 18 九月 2018 15:26:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowBase/Window.cs | 3 ++-
System/DailyQuest/DailyQuestData.cs | 7 +++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/System/DailyQuest/DailyQuestData.cs b/System/DailyQuest/DailyQuestData.cs
index f44b370..b09eec9 100644
--- a/System/DailyQuest/DailyQuestData.cs
+++ b/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))
{
diff --git a/System/WindowBase/Window.cs b/System/WindowBase/Window.cs
index e6373a3..c6f9217 100644
--- a/System/WindowBase/Window.cs
+++ b/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();
}
--
Gitblit v1.8.0