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

Client_PangDeRong

2018-09-01 379663dd5e7c0da4025fc6867dfb13f11a3bc946

 System/FairyAu/FairyModel.cs

@@ -184,6 +184,10 @@
            fairyStoreLimit = int.Parse(config.Numerical2);

            config = Config.Instance.Get<FuncConfigConfig>("FamilyPartyDeskNpcID");

            fairyFeastDeskNpc = int.Parse(config.Numerical1);

            config = Config.Instance.Get<FuncConfigConfig>("SWRHFamilyLV");

            guardSkyOpenFairyLv = int.Parse(config.Numerical1);

            config = Config.Instance.Get<FuncConfigConfig>("TechFamilyLV");

            fairyMethodToLimit = int.Parse(config.Numerical1);

        }

        #endregion



@@ -498,6 +502,18 @@
            get;private set;

        }



        public int guardSkyOpenFairyLv { get; private set; }



        public bool SatisfyGuardSkyFairyLv()

        {

            var fairyData = PlayerDatas.Instance.fairyData;

            if (!fairyData.HasFairy || fairyData.fairy == null)

            {

                return false;

            }

            return fairyData.fairy.FamilyLV >= guardSkyOpenFairyLv;

        }



        public event Action guardSkyCompleteEvent;

        public void UpdateGuardSky(bool _hasJoin)

        {

@@ -652,6 +668,37 @@
        }

        #endregion



        #region 仙盟心法开启

        public int fairyMethodToLimit { get; private set; }

        public bool fairyMethodToOpen

        {

            get

            {

                if (PlayerDatas.Instance.fairyData.HasFairy)

                {

                    var fairy = PlayerDatas.Instance.fairyData.fairy;

                    if (fairy != null && fairy.FamilyLV >= fairyMethodToLimit)

                    {

                        return true;

                    }

                }

                return false;

            }

        }



        public void ProcessMethodToErrorTip()

        {

            if (!PlayerDatas.Instance.fairyData.HasFairy)

            {

                SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

            }

            else if (PlayerDatas.Instance.fairyData.fairy.FamilyLV < fairyMethodToLimit)

            {

                SysNotifyMgr.Instance.ShowTip("FairyMethodToLimit", fairyMethodToLimit);

            }

        }

        #endregion



        public bool InFairyLeagueDungeon

        {

            get