From 2bdca925498c2b06de803cd6ec1704faef8eec30 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 十月 2018 15:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

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

diff --git a/System/OpenServerActivity/OpenServerActivityNotifyWin.cs b/System/OpenServerActivity/OpenServerActivityNotifyWin.cs
index 758d631..011a4a4 100644
--- a/System/OpenServerActivity/OpenServerActivityNotifyWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityNotifyWin.cs
@@ -41,8 +41,13 @@
 
         private void CheckFlashRushToBuy()
         {
+            OperationFlashRushToBuy.FlashSaleShop saleShop = null;
             if(activityNotifyModel.flashSaleShops.Count > 0)
             {
+                saleShop = activityNotifyModel.flashSaleShops[activityNotifyModel.flashSaleShops.Count - 1];
+            }
+            if (saleShop != null && !activityNotifyModel.closeflashSaleShops.Contains(saleShop))
+            {
                 flashRushToBuyNotify.gameObject.SetActive(true);
             }
             else

--
Gitblit v1.8.0