From fb4b1ed3c3366f993136e1f9a442bb2dc6d758ab Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 26 九月 2018 22:35:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Vip/VipModel.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/System/Vip/VipModel.cs b/System/Vip/VipModel.cs
index 9374124..345a6f1 100644
--- a/System/Vip/VipModel.cs
+++ b/System/Vip/VipModel.cs
@@ -60,7 +60,7 @@
{
TimeMgr.Instance.UnRegister(TimeMgr.SyntonyType.VipExperirnceOverdue);
m_VipExperienceTime = 0;
- if (WindowCenter.Instance.CheckOpen<GotoChargeWin>())
+ if (WindowCenter.Instance.IsOpen<GotoChargeWin>())
{
WindowCenter.Instance.CloseImmediately<GotoChargeWin>();
}
@@ -117,10 +117,10 @@
{
yield return WaitingForSecondConst.WaitMS1000;
waitingJump = false;
- if (!NewBieCenter.Instance.inGuiding && !WindowCenter.Instance.CheckOpen<LoadingWin>()
+ if (!NewBieCenter.Instance.inGuiding && !WindowCenter.Instance.IsOpen<LoadingWin>()
&& StageManager.Instance.CurrentStage is DungeonStage && !deadModel.playerIsDie)
{
- if (!WindowCenter.Instance.CheckOpen<VipRechargeWin>())
+ if (!WindowCenter.Instance.IsOpen<VipRechargeWin>())
{
WindowJumpMgr.Instance.ClearJumpData();
WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.BaseAndCustom);
@@ -133,15 +133,15 @@
private void OnChargeComplete()
{
m_ChargeReset = true;
- if (WindowCenter.Instance.CheckOpen<RechargeBoxWin>())
+ if (WindowCenter.Instance.IsOpen<RechargeBoxWin>())
{
WindowCenter.Instance.CloseImmediately<RechargeBoxWin>();
}
- if (WindowCenter.Instance.CheckOpen<SupremeRechargeWin>())
+ if (WindowCenter.Instance.IsOpen<SupremeRechargeWin>())
{
WindowCenter.Instance.CloseImmediately<SupremeRechargeWin>();
}
- if (WindowCenter.Instance.CheckOpen<FirstRechargeWin>())
+ if (WindowCenter.Instance.IsOpen<FirstRechargeWin>())
{
WindowCenter.Instance.CloseImmediately<FirstRechargeWin>();
WindowCenter.Instance.Open<MainInterfaceWin>();
@@ -540,7 +540,7 @@
{
vipWinType = type;
var _order = (int)vipWinType;
- if (!WindowCenter.Instance.CheckOpen<VipRechargeWin>())
+ if (!WindowCenter.Instance.IsOpen<VipRechargeWin>())
{
WindowCenter.Instance.Open<VipRechargeWin>(false, _order);
}
@@ -708,7 +708,7 @@
}
m_ChargeReset = false;
beforeCTGTime = DateTime.Now;
- if (!WindowCenter.Instance.CheckOpen<GotoChargeWin>())
+ if (!WindowCenter.Instance.IsOpen<GotoChargeWin>())
{
WindowCenter.Instance.Open<GotoChargeWin>(true);
}
@@ -731,7 +731,7 @@
{
SetViewedRechargeGift();
}
- if (!WindowCenter.Instance.CheckOpen<RechargeBoxWin>())
+ if (!WindowCenter.Instance.IsOpen<RechargeBoxWin>())
{
WindowCenter.Instance.Open<RechargeBoxWin>();
}
@@ -820,11 +820,11 @@
private void CheckOpenFirstRechargeWin()
{
- if (WindowCenter.Instance.CheckOpen<TreasureNewGotWin>())
+ if (WindowCenter.Instance.IsOpen<TreasureNewGotWin>())
{
return;
}
- if (!NewBieCenter.Instance.inGuiding && WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !waitingJump)
+ if (!NewBieCenter.Instance.inGuiding && WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !waitingJump)
{
if (PlayerDatas.Instance.baseData.coinPointTotal > 0 && !firstChargeRewardGet
&& firstRechargeOpen && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
--
Gitblit v1.8.0