From ff6b75a63fbb223be742cf02805c608c7c83bd6d Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 17 九月 2018 15:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/OpenServerActivity/FlashSaleBehaviour.cs |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/System/OpenServerActivity/FlashSaleBehaviour.cs b/System/OpenServerActivity/FlashSaleBehaviour.cs
index 5d6d26e..7a8574d 100644
--- a/System/OpenServerActivity/FlashSaleBehaviour.cs
+++ b/System/OpenServerActivity/FlashSaleBehaviour.cs
@@ -20,14 +20,13 @@
         StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
         FlashSaleModel model { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } }
 
-        public void Display(int index, int _id)
+        public void Display(OperationFlashSale.FlashSaleGift gift)
         {
             m_BuyButton.RemoveAllListeners();
             OperationBase operationBase;
             if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase))
             {
                 OperationFlashSale operation = operationBase as OperationFlashSale;
-                var gift = operation.GetFlashSaleGift(index, _id);
                 if (!gift.Equals(default(OperationFlashSale.FlashSaleGift)))
                 {
                     m_OriginalCostIcon.SetIconWithMoneyType(gift.moneyType);
@@ -66,7 +65,7 @@
                     m_BuyButton.gameObject.SetActive(buyCount < gift.limitNum);
                     m_BuyButton.AddListener(() =>
                     {
-                        model.SendBuyFlashSale(index, _id);
+                        model.SendBuyFlashSale(gift);
                     });
                 }
             }

--
Gitblit v1.8.0