From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 System/DailyQuest/DailyQuestModel.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index deea82a..294b00a 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/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()

--
Gitblit v1.8.0