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

client_Hale

2018-08-15 f2f6a288f1df9d5cf2eb07cf0ded09c1a6ce3af2

 System/MainInterfacePanel/HighSettingTip.cs

@@ -44,10 +44,12 @@
        [SerializeField] Button m_FindHostBtn;//仙宝寻主



        [SerializeField] RechargeBtnBehaviour m_RechargetBtnBehaviour;

        [SerializeField] Button m_OSGiftBtn;



        [SerializeField] Button m_LimitedTimePBtn;//限时礼包

        [SerializeField] Button m_ElfFestivalBtn;//仙界盛典



        [SerializeField] Button m_FlashSaleBtn;//限时特惠

        [SerializeField] Button m_AllThePeopleBtn;//全民冲榜

        private bool _bool = true;

        private int swicthCdTime = 0;

        private bool IsFadeOut = true;

@@ -65,7 +67,6 @@
        {

            swicthCdTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1);

            OpenServerActivityStateChange();

            CheckOSGift();

            m_RechargetBtnBehaviour.Init();

            m_HighSettingFadeInFadeOut.Init();

            storeDesBtn.AddListener(() => { storeDesBtn.gameObject.SetActive(false); });

@@ -82,10 +83,11 @@
            m_HappyXBBtn.AddListener(OnClickHappyXBBtn);

            m_FindHostBtn.AddListener(OnClickFindHostBtn);

            m_OpenService.AddListener(OpenService);

            m_OSGiftBtn.AddListener(OSGiftBtn);

            _RuneTaBtn.onClick.AddListener(RuneTaButton);

            m_LimitedTimePBtn.AddListener(OnCliCkLimitedTimePBtn);

            m_ElfFestivalBtn.AddListener(OnClickElfFestivalBtn);

            m_FlashSaleBtn.AddListener(OnClickmFlashSaleBtn);

            m_AllThePeopleBtn.AddListener(OnClickmAllThePeopleBtn);

            if (_bool)

            {

                ColseButton();

@@ -137,9 +139,10 @@
            m_OpenService.RemoveAllListeners();

            m_HappyXBBtn.RemoveAllListeners();

            m_FindHostBtn.RemoveAllListeners();

            m_OSGiftBtn.RemoveAllListeners();

            m_LimitedTimePBtn.RemoveAllListeners();

            _RuneTaBtn.onClick.RemoveAllListeners();

            m_FlashSaleBtn.RemoveAllListeners();

            m_AllThePeopleBtn.RemoveAllListeners();

            CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime;

            FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;

@@ -266,32 +269,17 @@
                        WindowCenter.Instance.Open<FirstRechargeWin>(true);

                    }

                    break;

                //case 2:

                //    WindowCenter.Instance.Open<OpenServerGiftWin>();

                //    break;

                case 3:

                    WindowCenter.Instance.Close<MainInterfaceWin>();

                    WindowCenter.Instance.Open<VipRechargeWin>(false, 0);

                    break;

            }

        }



        private void OSGiftBtn()

        {

            //WindowCenter.Instance.Open<OpenServerGiftWin>();

        }



        void RuneTaButton()//符印塔

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<RuneTowerWin>();

        }

        private void CheckOSGift()

        {

            m_OSGiftBtn.gameObject.SetActive(osGiftModel.activate);

            SwithButtonObj();

        }



        void OpenTreasure()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -325,6 +313,17 @@
            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<FairylandCeremonyWin>();

        }

        void OnClickmFlashSaleBtn()//限时特惠

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false, 4);

        }



        void OnClickmAllThePeopleBtn()//全民冲榜

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false,0);

        }

        public void ShowButton()//向上

        {