Merge branch '3442运营活动修改'

client_linchunjie

2018-09-17 db0192c0e911dc86d828ec650e995282e6eacdf2

 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);

                    });

                }

            }