From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/Activity/ActivityNotifyBehaviour.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Activity/ActivityNotifyBehaviour.cs b/System/Activity/ActivityNotifyBehaviour.cs
index 1c5a340..c2fb2d8 100644
--- a/System/Activity/ActivityNotifyBehaviour.cs
+++ b/System/Activity/ActivityNotifyBehaviour.cs
@@ -67,7 +67,7 @@
}
}
- var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>((int)m_NotifyType);
+ var config = Config.Instance.Get<DailyQuestConfig>((int)m_NotifyType);
if (config != null)
{
switch ((DailyQuestType)m_NotifyType)
@@ -140,7 +140,7 @@
{
m_NotifyWin = _notifyWin;
m_NotifyType = type;
- DailyQuestConfig cfg = ConfigManager.Instance.GetTemplate<DailyQuestConfig>((int)type);
+ DailyQuestConfig cfg = Config.Instance.Get<DailyQuestConfig>((int)type);
confirmBtnText.text = Language.Get("Z1074");
if (cfg != null)
{
--
Gitblit v1.8.0