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

Client_PangDeRong

2018-09-01 379663dd5e7c0da4025fc6867dfb13f11a3bc946

 System/DailyQuest/DailyQuestModel.cs

@@ -122,6 +122,8 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionStateChange;

            PlayerDatas.Instance.PlayerDataRefreshEvent += OnPlayerDataRefresh;

            fairyModel.guardSkyCompleteEvent += GuardSkyCompleteEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyInfo;

        }



        public override void UnInit()

@@ -131,6 +133,8 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange;

            PlayerDatas.Instance.PlayerDataRefreshEvent -= OnPlayerDataRefresh;

            fairyModel.guardSkyCompleteEvent -= GuardSkyCompleteEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyInfo;

        }



        public void OnPlayerLoginOk()

@@ -219,6 +223,10 @@
                        (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));

                case DailyQuestType.RuneTowerSweep:

                    return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;

                case DailyQuestType.GuardSky:

                    var _dailyGuardSkyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

                    bool _isOpen = _dailyGuardSkyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyGuardSkyConfig.UnLockFuncID);

                    return fairyModel.SatisfyGuardSkyFairyLv() && _isOpen;

                default:

                    var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

                    return dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(dailyConfig.UnLockFuncID);

@@ -490,6 +498,11 @@
            UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);

        }



        private void OnRefreshFairyInfo()

        {

            UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);

        }



        private void OnPlayerDataRefresh(PlayerDataRefresh _refreshType, int _value)

        {

            switch (_refreshType)