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/Message/SysNotifyMgr.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Message/SysNotifyMgr.cs b/System/Message/SysNotifyMgr.cs
index aea0408..a5abf42 100644
--- a/System/Message/SysNotifyMgr.cs
+++ b/System/Message/SysNotifyMgr.cs
@@ -75,7 +75,7 @@
void GetSysMsg(string key)
{
///鏍规嵁key浠庣郴缁熶俊鎭〃鍙栧埌娑堟伅绫诲瀷
- SysInfoConfig cfg = ConfigManager.Instance.GetTemplate<SysInfoConfig>(key);
+ SysInfoConfig cfg = Config.Instance.Get<SysInfoConfig>(key);
if (cfg == null)
{
#if UNITY_EDITOR
@@ -121,7 +121,7 @@
public void ShowTip(string key, params object[] msg)
{
- SysInfoConfig cfg = ConfigManager.Instance.GetTemplate<SysInfoConfig>(key);
+ SysInfoConfig cfg = Config.Instance.Get<SysInfoConfig>(key);
if (cfg != null)
{
tipInfoList.Clear();
--
Gitblit v1.8.0