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/Vip/FirstTimeRechargeModel.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/System/Vip/FirstTimeRechargeModel.cs b/System/Vip/FirstTimeRechargeModel.cs
index 933a2bb..77a821a 100644
--- a/System/Vip/FirstTimeRechargeModel.cs
+++ b/System/Vip/FirstTimeRechargeModel.cs
@@ -52,7 +52,7 @@
{
if (_window is MainInterfaceWin)
{
- if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))
+ if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))
{
WindowCenter.Instance.CloseImmediately<FirstTimeRechargeWin>();
}
@@ -149,9 +149,9 @@
private void windowBeforeOpenEvent(Window obj)
{
- if ((!WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()) || obj is ChatWin)
+ if ((!WindowCenter.Instance.IsOpen<MainInterfaceWin>() && WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()) || obj is ChatWin)
{
- if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))
+ if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))
{
WindowCenter.Instance.Close<FirstTimeRechargeWin>();
}
@@ -179,7 +179,7 @@
}
else if (IsOk && IsTryOut == 2)
{
- if (WindowCenter.Instance.CheckOpen<FirstChargeTrialWin>())
+ if (WindowCenter.Instance.IsOpen<FirstChargeTrialWin>())
{
WindowCenter.Instance.Close<FirstChargeTrialWin>();
}
@@ -203,9 +203,9 @@
int second = (int)ts.TotalSeconds;
if (CumulativeTime != 0 && PlayerDatas.Instance.baseData.LV <= FirstGoldTimeOut && PlayerDatas.Instance.baseData.coinPointTotal <= 0 && second > 0 /*&& !inDungeon*/ && CumulativeTime - second > 0)
{
- if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()&& !WindowCenter.Instance.CheckOpen<ChatWin>())
+ if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()&& !WindowCenter.Instance.IsOpen<ChatWin>())
{
- if (!WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))
+ if (!WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))
{
WindowCenter.Instance.Open<FirstTimeRechargeWin>();
}
@@ -234,7 +234,7 @@
}
else
{
- if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))
+ if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))
{
WindowCenter.Instance.Close<FirstTimeRechargeWin>();
}
@@ -242,7 +242,7 @@
}
else
{
- if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))
+ if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))
{
WindowCenter.Instance.Close<FirstTimeRechargeWin>();
}
@@ -261,7 +261,7 @@
{
return;
}
- if (!WindowCenter.Instance.CheckOpen<FirstChargeTrialWin>() && IsTryOut == 1)
+ if (!WindowCenter.Instance.IsOpen<FirstChargeTrialWin>() && IsTryOut == 1)
{
WindowCenter.Instance.Open<FirstChargeTrialWin>();
}
--
Gitblit v1.8.0