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

client_Zxw

2018-08-14 b36979b59d5825972f970d09b28e05ac45629132

 System/OpenServerActivity/ImpactRankModel.cs

@@ -648,7 +648,18 @@


        private void OperationEndEvent(Operation type, int state)

        {

            if (type == Operation.FlashSale && state == 0)

            if ((type == Operation.FlashSale || type == Operation.BossReborn

                || type == Operation.ConsumeRebate || type == Operation.GiftPackage

                || type == Operation.MultipRealmPoint)

                && state == 0)

            {

                if (openServerActivityStateChange != null)

                {

                    openServerActivityStateChange();

                }

            }

            if ((type == Operation.MultipleExp)

                && state == 1)

            {

                if (openServerActivityStateChange != null)

                {

@@ -659,7 +670,18 @@


        private void OperationStartEvent(Operation type, int state)

        {

            if (type == Operation.FlashSale && state == 0)

            if ((type == Operation.FlashSale || type == Operation.BossReborn

                || type == Operation.ConsumeRebate || type == Operation.GiftPackage

                || type == Operation.MultipRealmPoint)

                && state == 0)

            {

                if (openServerActivityStateChange != null)

                {

                    openServerActivityStateChange();

                }

            }

            if ((type == Operation.MultipleExp)

                && state == 1)

            {

                if (openServerActivityStateChange != null)

                {

@@ -753,19 +775,6 @@
        public bool IsFlashSaleOpen()

        {

            return flashSaleModel.IsOpen;

        }



        public bool IsFlashSaleTitle()

        {

            if (IsImpactRankOpen() || IsRedEnvelopeOpen() || IsTimeLimitGiftOpen())

            {

                return false;

            }

            if (IsFlashSaleOpen())

            {

                return true;

            }

            return false;

        }



        public bool IsConsumeRebateOpen()