Merge branch '3442运营活动修改'

client_linchunjie

2018-09-17 db0192c0e911dc86d828ec650e995282e6eacdf2

 System/OpenServerActivity/FlashSaleModel.cs

@@ -11,6 +11,7 @@
        {

            OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;

            OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;

            OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;

            TimeMgr.Instance.OnDayEvent += OnDayEvent;

            OpenServerActivityCenter.Instance.Register(4, this);

        }

@@ -28,6 +29,7 @@
        {

            OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;

            OperationTimeHepler.Instance.operationEndEvent -= OperationEndEvent;

            OperationTimeHepler.Instance.operationAdvanceEvent -= OperationAdvanceEvent;

            TimeMgr.Instance.OnDayEvent -= OnDayEvent;

        }



@@ -36,6 +38,17 @@
            if (type == Operation.FlashSale && state == 0)

            {

                UpdateRedpoint();

                if (onStateUpate != null)

                {

                    onStateUpate(4);

                }

            }

        }



        private void OperationAdvanceEvent(Operation type)

        {

            if (type == Operation.FlashSale)

            {

                if (onStateUpate != null)

                {

                    onStateUpate(4);

@@ -73,19 +86,7 @@
        {

            get

            {

                OperationBase operationBase;

                OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase);

                return operationBase != null && operationBase.SatisfyOpenCondition() && operationBase.InTime(TimeUtility.ServerNow);

            }

        }



        public bool InAdvanceOpen

        {

            get

            {

                OperationBase operationBase;

                OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase);

                return operationBase != null && operationBase.SatisfyOpenCondition() && operationBase.InAdvanceTime(TimeUtility.ServerNow);

                return OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.FlashSale);

            }

        }



@@ -97,7 +98,15 @@
            }

        }



        public void SendBuyFlashSale(int index, int id)

        public bool IsAdvance

        {

            get

            {

                return OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.FlashSale);

            }

        }



        public void SendBuyFlashSale(OperationFlashSale.FlashSaleGift gift)

        {

            OperationBase operationBase;

            if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase))

@@ -105,6 +114,7 @@
                OperationFlashSale operation = operationBase as OperationFlashSale;

                if (operation.InAdvanceTime(TimeUtility.ServerNow))

                {

                    SysNotifyMgr.Instance.ShowTip("InOperationTimeError");

                    return;

                }

                if (!operation.InTime(TimeUtility.ServerNow))

@@ -112,7 +122,6 @@
                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

                    return;

                }

                var gift = operation.GetFlashSaleGift(index, id);

                if (!gift.Equals(default(OperationFlashSale.FlashSaleGift)))

                {

                    var buyInfo = storeModel.GetBuyShopLimit((uint)gift.id);

@@ -183,10 +192,9 @@
            if (operationBase != null && operationBase.InTime(TimeUtility.ServerNow))

            {

                OperationFlashSale operation = operationBase as OperationFlashSale;

                var index = operation.IndexOfFlashShop();

                if (index != -1 && index < operation.flashShops.Count)

                OperationFlashSale.FlashSale flashShop;

                if (operation.TryGetFlashSale(TimeUtility.ServerNow, out flashShop))

                {

                    var flashShop = operation.flashShops[index];

                    for (int i = 0; i < flashShop.gifts.Length; i++)

                    {

                        var gift = flashShop.gifts[i];