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

client_linchunjie

2018-08-20 5e5551e8e7630f816a68c7bbe554a7e0bfa8705f

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -51,6 +51,7 @@
        TreasureFindHostModel hostModel { get { return ModelCenter.Instance.GetModel<TreasureFindHostModel>(); } }

        OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }

        LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }

        ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }

        public void Init()

        {

            if (LatencyTimeList.Count <= 0)

@@ -77,6 +78,7 @@
            OperationTimeHepler.Instance.operationStartEvent += operationStartEvent;

            OperationTimeHepler.Instance.operationEndEvent += operationEndEvent;

            limitedTimePackageItemModel.UpdateLimitedTimePackageItem += UpdateLimitedTimePackageItem;

            impactRankModel.inImpactRankUpdate += InImpactRankUpdate;

        }



        public void Unit()

@@ -90,6 +92,12 @@
            OperationTimeHepler.Instance.operationStartEvent -= operationStartEvent;

            OperationTimeHepler.Instance.operationEndEvent -= operationEndEvent;

            limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem;

            impactRankModel.inImpactRankUpdate -= InImpactRankUpdate;

        }



        private void InImpactRankUpdate()

        {

            Classify();

        }



        private void UpdateLimitedTimePackageItem()

@@ -99,7 +107,7 @@


        private void operationEndEvent(Operation arg1, int arg2)

        {

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

            if (arg1 == Operation.FairyCeremony)

            {

                Classify();

            }

@@ -107,7 +115,7 @@


        private void operationStartEvent(Operation arg1, int arg2)

        {

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

            if (arg1 == Operation.FairyCeremony)

            {

                Classify();

            }

@@ -378,7 +386,6 @@
            PositionReduction();

            SetGroupTop();

            SetGroupLow();

            //  SetGroupThree();

            SetfatherNodeTop();

            SetfatherNodeLow();

            SetfatherNodeThree();

@@ -450,7 +457,7 @@
                        {

                            if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)

                            {

                                if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.Simple)

                                if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)

                                {

                                    m_GroupIndex_Low.GetChild(i).GetComponent<HighBtnRecord>().IsNagaaki = true;

                                    highBtnRecord.IsNagaaki = true;

@@ -493,7 +500,7 @@
                        {

                            if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)

                            {

                                if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.Simple)

                                if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)

                                {

                                    m_GroupIndex_Low.GetChild(i).GetComponent<HighBtnRecord>().IsNagaaki = true;

                                    highBtnRecord.IsNagaaki = true;

@@ -555,7 +562,8 @@
                        }

                        else if (IndexOf == 1)

                        {

                            if (ModelCenter.Instance.GetModel<OSGiftModel>().activate)//超值礼包

                            var _funcOrder = 0;

                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//开服活动

                            {

                                if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))

                                {

@@ -581,22 +589,8 @@
                        }

                        else if (IndexOf == 2)

                        {

                            var _funcOrder = 0;

                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//开服活动

                            {

                                if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))

                                {

                                    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 if (IndexOf == 3)

                        {

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))

                            bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4);

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时特惠

                            {

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

                                {

@@ -615,7 +609,51 @@
                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                            }



                        }

                        else if (IndexOf == 3)

                        {

                            bool Isopen = impactRankModel.IsInImpactRank;

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//全民冲榜

                            {

                                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);

                                }

                            }

                        }

                        else if (IndexOf == 4)

                        {

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))//精灵盛典

                            {

                                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);

                                }

                            }

                        }

                    }

                }