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

client_Hale

2018-09-18 bc49768eaf9757e20bd264dc6183b2497780ee08

 System/MainInterfacePanel/LowSettingTip.cs

@@ -26,6 +26,8 @@


        [SerializeField] Button m_TreasureSoulBtn;//觉醒按钮

        [SerializeField] Button m_GodBeastBtn;//神兽按钮



        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        public void Init()

        {

            _Role1Btn.onClick.AddListener(Role1Button);

@@ -133,8 +135,15 @@
        void Pet1Button()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<PetWin>();

          
            if (fairyGrabBossModel.InActivityTime && !NewBieCenter.Instance.inGuiding)

            {

                WindowCenter.Instance.Open<PetWin>(false, 2);

            }

            else

            {

                WindowCenter.Instance.Open<PetWin>();

            }



            //DesignDebug.Log("宠物按钮");

        }