From 096bc211e02f3e010ada28ad5b67a687307382b7 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 21 十一月 2018 16:54:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index bf92b7b..42d7e94 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -564,6 +564,9 @@
case 17:
WindowCenter.Instance.Open<AccumulateRechargeWin>(true);
break;
+ case 18:
+ WindowCenter.Instance.Open<MysticalPurchaseWin>(true);
+ break;
}
}
@@ -585,24 +588,11 @@
private void CloseOtherWin()
{
- WindowCenter.Instance.CloseImmediately<ImpactRankWin>();
- WindowCenter.Instance.CloseImmediately<OpenServerRedEnvelopeWin>();
- WindowCenter.Instance.CloseImmediately<OSTimeLimitGiftWin>();
- WindowCenter.Instance.CloseImmediately<FlashSaleWin>();
- WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();
- WindowCenter.Instance.CloseImmediately<MultipleExpWin>();
- WindowCenter.Instance.CloseImmediately<NPracticePointWin>();
- WindowCenter.Instance.CloseImmediately<BossRebornWin>();
- WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>();
- WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();
- WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();
- WindowCenter.Instance.CloseImmediately<VipInvestWin>();
- WindowCenter.Instance.CloseImmediately<FairyLeagueNoticeWin>();
- WindowCenter.Instance.CloseImmediately<FairyGrabBossNoticeWin>();
- WindowCenter.Instance.CloseImmediately<FlashRushToBuyWin>();
- WindowCenter.Instance.CloseImmediately<WishingPoolWin>();
- WindowCenter.Instance.CloseImmediately<WheelOfFortuneWin>();
- WindowCenter.Instance.CloseImmediately<AccumulateRechargeWin>();
+ var children = WindowConfig.Get().FindChildWindows("OpenServerActivityWin");
+ foreach (var window in children)
+ {
+ WindowCenter.Instance.Close(window);
+ }
}
private int Compare(int order_x, int order_y)
--
Gitblit v1.8.0