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

client_Hale

2018-09-18 bc49768eaf9757e20bd264dc6183b2497780ee08

 System/Pet/PetWin.cs

@@ -15,6 +15,7 @@
    {

        [SerializeField] FunctionButton PetPanelBtn;//灵宠面板按钮

        [SerializeField] FunctionButton EvolveTrainWinBtn;//灵宠培养面板按钮

        [SerializeField] FunctionButton m_FairyGrabBoss;

        [SerializeField] FunctionButtonGroup FuncBtnGroup;

        [SerializeField] Button _CloseBtn;

        [SerializeField] Button _LeftBtn;

@@ -62,7 +63,7 @@
            base.OnActived();





            if (!WindowJumpMgr.Instance.IsJumpState)//是否进行跳转

            if (!WindowJumpMgr.Instance.IsJumpState && functionOrder < 2)//是否进行跳转

            {

                if (mountModel.IsHorsePanelState() > petmodel.IsPetPanelRedPointState())

                {

@@ -80,6 +81,7 @@
            EvolveTrainWinBtn.AddListener(OnClickEvolveTrainWin);

            _LeftBtn.AddListener(OnClickLeftBtn);

            _RightBtn.AddListener(OnClickRightBtn);

            m_FairyGrabBoss.AddListener(FairyGrabBoss);

        }





@@ -91,6 +93,20 @@
        private void OnClickLeftBtn()

        {

            FuncBtnGroup.TriggerLast();

        }



        private void FairyGrabBoss()
        {
            CloseChild();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<FairyGrabBossWin>();

            }

            else

            {

                WindowCenter.Instance.Open<FairyGrabBossWin>(true);

            }

            functionOrder = m_FairyGrabBoss.order;
        }



        private void OnClickPetPanel()

@@ -132,6 +148,7 @@
            {

                WindowCenter.Instance.CloseImmediately<MountWin>();

            }

            WindowCenter.Instance.CloseImmediately<FairyGrabBossWin>();

        }

    }

}