From bd19eadbee8a0d3ec67c36a166a8cca4f87f454e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 15 十月 2018 14:44:33 +0800
Subject: [PATCH] Merge branch 'master' into UserCenter

---
 System/OpenServerActivity/OpenServerActivityWin.cs |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 44aea99..b0ee292 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -574,6 +574,16 @@
                         WindowCenter.Instance.Open<FairyGrabBossNoticeWin>(true);
                     }
                     break;
+                case 14:
+                    if (windowState == WindowState.Opened)
+                    {
+                        WindowCenter.Instance.OpenWithoutAnimation<FlashRushToBuyWin>();
+                    }
+                    else
+                    {
+                        WindowCenter.Instance.Open<FlashRushToBuyWin>(true);
+                    }
+                    break;
             }
         }
 
@@ -609,6 +619,7 @@
             WindowCenter.Instance.CloseImmediately<VipInvestWin>();
             WindowCenter.Instance.CloseImmediately<FairyLeagueNoticeWin>();
             WindowCenter.Instance.CloseImmediately<FairyGrabBossNoticeWin>();
+            WindowCenter.Instance.CloseImmediately<FlashRushToBuyWin>();
         }
 
         private int Compare(int order_x, int order_y)

--
Gitblit v1.8.0