Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

 System/MainInterfacePanel/HighSettingTip.cs

@@ -20,12 +20,10 @@
        [SerializeField] Button _ShoppingBtn;//商城按钮

        [SerializeField] Button _RechargeBtn;//充值按钮

        [SerializeField] Button _WelfareBtn;//福利按钮

        [SerializeField] Button _TreasureBtn;//寻宝按钮

        [SerializeField] Button m_OpenService;//开服活动按钮

        [SerializeField] Button _RuneTaBtn;//符印按钮



        [SerializeField] Image m_OpenServerTitle;





        [SerializeField] Transform m_HighSettingTip;//判定



@@ -38,7 +36,6 @@
        [SerializeField] Button storeDesBtn;  //商城活动描述信息



        [SerializeField] HighSettingFadeInFadeOut m_HighSettingFadeInFadeOut;

        [SerializeField] Button m_Treasure;//法宝入口



        [SerializeField] Button m_HappyXBBtn;//寻宝入口

        [SerializeField] Button m_FindHostBtn;//仙宝寻主

@@ -79,11 +76,9 @@
            m_LootPrecious.AddListener(LootPreciousButton);

            _MarketBtn.AddListener(MarketButton);

            _ShoppingBtn.AddListener(ShoppingButton);

            _TreasureBtn.AddListener(TreasureButton);

            _WelfareBtn.AddListener(WelfareButton);

            _DaTreasureBtn.AddListener(DaTreasureButton);

            _RechargeBtn.AddListener(RechargeButton);

            m_Treasure.AddListener(OpenTreasure);

            _ShowBtn.AddListener(ShowButton);

            _ColseBtn.AddListener(ColseButton);

            m_HappyXBBtn.AddListener(OnClickHappyXBBtn);

@@ -139,11 +134,9 @@
            m_LootPrecious.RemoveAllListeners();

            _MarketBtn.RemoveAllListeners();

            _ShoppingBtn.RemoveAllListeners();

            _TreasureBtn.RemoveAllListeners();

            _WelfareBtn.RemoveAllListeners();

            _DaTreasureBtn.RemoveAllListeners();

            _RechargeBtn.RemoveAllListeners();

            m_Treasure.RemoveAllListeners();

            _ShowBtn.RemoveAllListeners();

            _ColseBtn.RemoveAllListeners();

            m_OpenService.RemoveAllListeners();

@@ -209,7 +202,6 @@
        {

            int _order = 0;

            m_OpenService.gameObject.SetActive(OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _order));

            //m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");

        }



        private void OnMainHighTipCdTime()

@@ -243,10 +235,6 @@
            }

        }



        void TreasureButton()//寻宝按钮

        {



        }

        void WelfareButton()//福利按钮

        {

            WelfareCenter.Instance.OpenWelfare();

@@ -297,35 +285,6 @@
        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

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

        }

        void OpenTreasure()

        {

            var _model = ModelCenter.Instance.GetModel<TreasureModel>();

            if (!_model.SatisfyEntranceOpen())

            {

                _model.DisplayEntranceLimitHint();

                return;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (_model.IsRequireUnlockAnim(TreasureCategory.Human) != 0)

            {

                _model.currentCategory = TreasureCategory.Human;

            }

            else if (_model.IsRequireUnlockAnim(TreasureCategory.Demon) != 0)

            {

                _model.currentCategory = TreasureCategory.Demon;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

                == RedPointState.Simple)

            {

                _model.currentCategory = TreasureCategory.Human;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Demon - 1])

                == RedPointState.Simple)

            {

                _model.currentCategory = TreasureCategory.Demon;

            }

            WindowCenter.Instance.Open<TreasureSelectWin>();

        }



        void OnClickHappyXBBtn()//寻宝

@@ -434,19 +393,15 @@
                CoroutineMgr.Instance.OnMainStopCorUP();

            }

        }



        public void ShowButtonNow()//向上（立刻出现）

        {



            _ColseBtn.gameObject.SetActive(true);

            _ShowBtn.gameObject.SetActive(false);

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                m_HighSettingFadeInFadeOut.PositionNow();//立刻出现

            }

            //if (!mainModel.IsRedPointShowPanel())

            //{

            //    CoroutineMgr.Instance.OnMainStartCorUp(swicthCdTime);

            //}

        }



        private void RefreshOSCEffect()