Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-18 2bdca925498c2b06de803cd6ec1704faef8eec30

 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