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/MainInterfacePanel/FeatureNoticeModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeModel.cs b/System/MainInterfacePanel/FeatureNoticeModel.cs
index 1b28179..eb7263c 100644
--- a/System/MainInterfacePanel/FeatureNoticeModel.cs
+++ b/System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -239,8 +239,8 @@
{
yield return new WaitForSeconds(0.7f);
var inDungeon = IsDungeon();
- var IsOpenMaininterface = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
- var IsOpenOffLineOnHook = WindowCenter.Instance.CheckOpen<OffLineOnHookWin>();
+ var IsOpenMaininterface = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
+ var IsOpenOffLineOnHook = WindowCenter.Instance.IsOpen<OffLineOnHookWin>();
var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();
var IsLoading = StageManager.Instance.isLoading;
if (NewBieCenter.Instance.inGuiding || treasureModel.newGotShowing || inDungeon || !IsOpenMaininterface
@@ -260,11 +260,11 @@
}
string strKey = "FeatureNotice" + functionForecastConfig.FrameLevel + PlayerDatas.Instance.baseData.PlayerID;
int type = LocalSave.GetInt(strKey);
- bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
+ bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.FrameLevel && type == 0)
{
LocalSave.SetInt(strKey, functionForecastConfig.FrameLevel);
- var IsOpenFeatureNotice = WindowCenter.Instance.CheckOpen<FeatureNoticeWin>();
+ var IsOpenFeatureNotice = WindowCenter.Instance.IsOpen<FeatureNoticeWin>();
if (!IsOpenFeatureNotice)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
--
Gitblit v1.8.0