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

client_Zxw

2018-08-30 61b5058b990da2fe7f4b76e1e61b817d4f511432

 System/FairyAu/FairyApplyWin.cs

@@ -23,6 +23,8 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<FairyModel>());

            }

        }



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

        private void OnRefreshFairyMine()

        {

            if (!PlayerDatas.Instance.fairyData.HasFairy)

@@ -211,6 +213,11 @@


        private void OnExitBtn()

        {

            if (fairyGrabBossModel.InActivityTime)

            {

                SysNotifyMgr.Instance.ShowTip("FairyGrabBossExitError");

                return;

            }

            PlayerFairyData.FairyData fairy = PlayerDatas.Instance.fairyData.fairy;

            if (fairy != null)

            {