Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/DailyQuest/DailyQuestModel.cs

@@ -146,6 +146,11 @@
            UpdateRedpoints();

        }



        public List<int> GetDailyQuests()

        {

            return new List<int>(dailyQuests.Keys);

        }



        public List<int> GetDailyQuests(DailyQuestCategory _category)

        {

            var quests = new List<int>();

@@ -499,11 +504,6 @@
        private void OnFairyLeagueBattle()

        {

            UpdateDailyActionRedpoint((int)DailyQuestType.FairyLeague);

        }



        public Dictionary<int, DailyQuestData> GetDailyQuestlist()

        {

            return dailyQuests;

        }



        public void UpdateRedpoints()