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

client_Hale

2018-08-13 cf2e49d50152a7dad144d44aea8c5f2cb6cb28c6

 System/OpenServerActivity/ImpactRankModel.cs

@@ -633,6 +633,10 @@
        OSTimeLimitGiftModel timeLimitGiftModel { get { return ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>(); } }

        FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } }



        ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }



        MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }



        public event Action openServerActivityStateChange;



        public OpenServerActivityCenter()

@@ -693,6 +697,11 @@
                _functionOrder = 0;

                return true;

            }

            if (IsConsumeRebateOpen())

            {

                _functionOrder = 1;

                return true;

            }

            if (IsRedEnvelopeOpen())

            {

                _functionOrder = 2;

@@ -706,6 +715,11 @@
            if (IsFlashSaleOpen())

            {

                _functionOrder = 4;

                return true;

            }

            if (IsMultipleExpOpen())

            {

                _functionOrder = 5;

                return true;

            }

            return false;

@@ -744,6 +758,16 @@
            return false;

        }



        public bool IsConsumeRebateOpen()

        {

            return consumeRebateModel.IsOpen;

        }



        public bool IsMultipleExpOpen()

        {

            return multipleExpModel.Open();

        }



        public void ProcessErrorTip()

        {

            SysNotifyMgr.Instance.ShowTip("ActiveOutTime");