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

client_Wu Xijin

2019-01-10 5a013c8de1078aca92a6a301f403e8ca78eeef3b

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

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -54,6 +54,7 @@
        ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }

        CrossServerOneVsOneRewardModel m_CrossServerRewardModel;

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

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

        public void Init()

        {

            if (LatencyTimeList.Count <= 0)

@@ -81,6 +82,7 @@
            OperationTimeHepler.Instance.operationEndEvent += operationEndEvent;

            limitedTimePackageItemModel.UpdateLimitedTimePackageItem += UpdateLimitedTimePackageItem;

            impactRankModel.inImpactRankUpdate += InImpactRankUpdate;

            OpenServerModel.IsOpenEvent += IsOpenEvent;

        }



        public void Unit()

@@ -95,6 +97,12 @@
            OperationTimeHepler.Instance.operationEndEvent -= operationEndEvent;

            limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem;

            impactRankModel.inImpactRankUpdate -= InImpactRankUpdate;

            OpenServerModel.IsOpenEvent -= IsOpenEvent;

        }



        private void IsOpenEvent()

        {

            Classify();

        }



        private void InImpactRankUpdate()

@@ -707,6 +715,29 @@
                                }

                            }

                        }

                        else if (IndexOf == 7)

                        {

                            bool Isopen = OpenServerModel.IsOpen;

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

                            {

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

                                {

                                    SelectCaseRequest selectCaseRequest = new SelectCaseRequest();

                                    selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);

                                    selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;

                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                                else//------第三层

                                {

                                    SelectCaseRequest selectCaseRequest = new SelectCaseRequest();

                                    selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);

                                    selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;

                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                            }

                        }

                    }

                }

            }


 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -64,6 +64,8 @@
    public Dictionary<int, WeekPartyActionClass> WeekPartyActionDic = new Dictionary<int, WeekPartyActionClass>();//活动模板信息

    public Dictionary<int, Redpoint> RedPointDic = new Dictionary<int, Redpoint>();//红点

    public event Action WeekPartyUpdate;//活动信息变更

    private const int Redpoint_key = 214;//周狂欢红点

    public Redpoint redPointStre = new Redpoint(2, Redpoint_key);

    private const int Redpoint_key1 = 21401;//周狂欢红点

    public Redpoint redPointStre1 = new Redpoint(214, Redpoint_key1);

    private int _SelectedNow = 0;

@@ -468,7 +470,7 @@
    public void  GetIsOpen()

    {

        var time1 = TimeDayBeginAndOver[0];

        var time2 = TimeDayBeginAndOver[0];

        var time2 = TimeDayBeginAndOver[1];

        if (TimeDayBeginAndOver.Length <= 0 || time1 == null || time2 == null)

        {

            return;