6076 新年盛典

client_Zxw

2019-01-28 01a8ac2b5f20ce9abfebae35b08f189b2241bc83

6076 新年盛典

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -119,7 +119,7 @@


        private void operationEndEvent(Operation arg1, int arg2)

        {

            if (arg1 == Operation.FairyCeremony)

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

            {

                Classify();

            }

@@ -127,7 +127,7 @@


        private void operationStartEvent(Operation arg1, int arg2)

        {

            if (arg1 == Operation.FairyCeremony)

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

            {

                Classify();

            }

@@ -582,9 +582,30 @@
                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                            }



                        }

                        else if (IndexOf == 1)

                        {

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

                            {

                                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 == 2)

                        {

                            var _funcOrder = 0;

                            if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//精彩活动

@@ -609,9 +630,8 @@
                                    }

                                }

                            }



                        }

                        else if (IndexOf == 2)

                        else if (IndexOf == 3)

                        {

                            bool Isopen = impactRankModel.IsInImpactRank;

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

@@ -634,7 +654,7 @@
                                }

                            }

                        }

                        else if (IndexOf == 3)

                        else if (IndexOf == 4)

                        {

                            bool Isopen = OpenServerModel.IsOpen;

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

@@ -656,10 +676,8 @@
                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                            }





                        }

                        else if (IndexOf == 4)

                        else if (IndexOf == 5)

                        {

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

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时抢购

@@ -681,10 +699,8 @@
                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }

                            }





                        }

                        else if (IndexOf == 5)

                        else if (IndexOf == 6)

                        {

                            if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//限时礼包

                            {

@@ -704,11 +720,9 @@
                                    selectCaseRequest.Index = highBtnRecord.Index;

                                    AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);

                                }



                            }



                        }

                        else if (IndexOf == 6)

                        else if (IndexOf == 7)

                        {

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

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

@@ -731,10 +745,6 @@
                                }

                            }

                        }

                        //else if (IndexOf == 7)

                        //{



                        //}

                    }

                }

            }


 System/MainInterfacePanel/HighSettingTip.cs

@@ -53,6 +53,7 @@
        [SerializeField] Button m_FlashRushBtn;//限时抢购

        [SerializeField] Button m_CrossServerBtn;//跨服1V1按钮

        [SerializeField] Button m_OpenServiceBtn;//周狂欢按钮

        [SerializeField] Button m_NewYearBtn;//新年盛典

        private bool _bool = true;

        private int swicthCdTime = 0;

        private bool IsFadeOut = true;

@@ -96,6 +97,7 @@
            m_FlashRushBtn.AddListener(OnClickFlashRushBtn);

            m_CrossServerBtn.AddListener(OnClickCrossServerBtn);

            m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn);

            m_NewYearBtn.AddListener(OnClickNewYearBtn);

            if (_bool)

            {

                ColseButton();

@@ -151,6 +153,7 @@
            _RuneTaBtn.onClick.RemoveAllListeners();

            m_FlashSaleBtn.RemoveAllListeners();

            m_AllThePeopleBtn.RemoveAllListeners();

            m_NewYearBtn.RemoveAllListeners();

            CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime;

            FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;

@@ -390,6 +393,12 @@
            WindowCenter.Instance.Open<AchievementActivityWin>();



        }



        void OnClickNewYearBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<NewYearFairylandCeremonyWin>();

        }

        public void ShowButton()//向上

        {