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

client_linchunjie

2019-01-28 e0872807ff52affb0cf7dec2796481ef3fcffe40

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -55,6 +55,7 @@
        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

        CrossServerOneVsOneRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>()); } }

        OpenServiceAchievementModel OpenServerModel { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }

        SpringFestivalModel springFestival { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }

        public void Init()

        {

            if (LatencyTimeList.Count <= 0)

@@ -84,6 +85,7 @@
            impactRankModel.inImpactRankUpdate += InImpactRankUpdate;

            OpenServerModel.IsOpenEvent += IsOpenEvent;

            OpenServerModel.IsPreviewTimeUpdate += IsOpenEvent;

            OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;

        }



        public void Unit()

@@ -100,6 +102,12 @@
            impactRankModel.inImpactRankUpdate -= InImpactRankUpdate;

            OpenServerModel.IsOpenEvent -= IsOpenEvent;

            OpenServerModel.IsPreviewTimeUpdate -= IsOpenEvent;

            OperationTimeHepler.Instance.operationAdvanceEvent -= OperationAdvanceEvent;

        }



        private void OperationAdvanceEvent(Operation obj)

        {

            Classify();

        }



        private void IsOpenEvent()

@@ -119,18 +127,13 @@


        private void operationEndEvent(Operation arg1, int arg2)

        {

            if (arg1 == Operation.FairyCeremony || arg1== Operation.NewYearFairyCeremony)

            {

                Classify();

            }

            Classify();

        }



        private void operationStartEvent(Operation arg1, int arg2)

        {

            if (arg1 == Operation.FairyCeremony || arg1 == Operation.NewYearFairyCeremony)

            {

                Classify();

            }

            Classify();

          
        }



        private void UpdateRedpoint(int redPointID)

@@ -656,8 +659,9 @@
                        }

                        else if (IndexOf == 4)

                        {

                            bool Isopen = OpenServerModel.IsOpen;

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7天寻礼

                            bool Isopen = OpenServerModel.IsOpenFeatures();

                            bool _isOpen = springFestival.IsOpenFeatures();

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && (Isopen || _isOpen))//7天寻礼

                            {

                                if (AnimationFadeOutDicLow.Count < 6)//------第二层

                                {