Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/FairyAu/FairyRequestWin.cs

@@ -40,6 +40,12 @@
            PlayerDatas.Instance.fairyData.OnRefreshApplyList += OnRefreshApplyList;
            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
            OnRefreshApplyList();

            if (applyList.Count > 0)

            {

                CA402_tagCGViewFamilyRequestInfo pak = new CA402_tagCGViewFamilyRequestInfo();

                GameNetSystem.Instance.SendInfo(pak);

            }
        }

        protected override void OnAfterOpen()
@@ -61,7 +67,7 @@
        private void OnRefreshFairyMine()

        {

            if (!PlayerDatas.Instance.fairyData.HasFairy

                || !PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanKick))

                || !PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanCall))

            {

                CloseImmediately();

            }