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

client_Zxw

2018-08-13 498ec5c5d03765bbd87c3f75cbe68dd0d413baf9

 System/OpenServerActivity/ImpactRankModel.cs

@@ -635,6 +635,8 @@


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



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



        public event Action openServerActivityStateChange;



        public OpenServerActivityCenter()

@@ -715,6 +717,11 @@
                _functionOrder = 4;

                return true;

            }

            if (IsMultipleExpOpen())

            {

                _functionOrder = 5;

                return true;

            }

            return false;

        }



@@ -756,6 +763,11 @@
            return consumeRebateModel.IsOpen;

        }



        public bool IsMultipleExpOpen()

        {

            return multipleExpModel.Open();

        }



        public void ProcessErrorTip()

        {

            SysNotifyMgr.Instance.ShowTip("ActiveOutTime");