From 7da5f5b780af330ecda645f5538e0917bd9eeb01 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 19:37:20 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Activity/ActivityModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index e5d3470..7fb7dc2 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -85,7 +85,7 @@
}
}
activityNotifies.Clear();
- if (WindowCenter.Instance.CheckOpen<ActivityNotifyWin>())
+ if (WindowCenter.Instance.IsOpen<ActivityNotifyWin>())
{
WindowCenter.Instance.CloseImmediately<ActivityNotifyWin>();
}
@@ -136,7 +136,7 @@
{
mainStage = false;
activityNotifies.Clear();
- if (WindowCenter.Instance.CheckOpen<ActivityNotifyWin>())
+ if (WindowCenter.Instance.IsOpen<ActivityNotifyWin>())
{
WindowCenter.Instance.CloseImmediately<ActivityNotifyWin>();
}
@@ -296,7 +296,7 @@
private void NotifyActivity()
{
- if (!WindowCenter.Instance.CheckOpen<ActivityNotifyWin>())
+ if (!WindowCenter.Instance.IsOpen<ActivityNotifyWin>())
{
if (!NewBieCenter.Instance.inGuiding)
{
--
Gitblit v1.8.0