From 6f8ed2e37f8762fb3501a671d0dca40bcd68edae Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 21 十月 2018 10:26:29 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Editor/Tool/ExcelParseTool.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Assets/Editor/Tool/ExcelParseTool.cs b/Assets/Editor/Tool/ExcelParseTool.cs
index 3f1c570..d1b7dfe 100644
--- a/Assets/Editor/Tool/ExcelParseTool.cs
+++ b/Assets/Editor/Tool/ExcelParseTool.cs
@@ -51,11 +51,11 @@
if (GUILayout.Button("瑙ｆ瀽"))
{
m_Englishs.Clear();
- ConfigManager.Instance.SyncLoadConfigs();
+ Config.Instance.SyncLoadConfigs();
m_FitterKeys.Clear();
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<LanguageConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<SysInfoConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<IconConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<LanguageConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<SysInfoConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<IconConfig>());
FindEnglishLabel();
}
@@ -84,11 +84,11 @@
{
DebugEx.LogError(e.ToString());
}
- ConfigManager.Instance.SyncLoadConfigs();
+ Config.Instance.SyncLoadConfigs();
m_FitterKeys.Clear();
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<LanguageConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<SysInfoConfig>());
- m_FitterKeys.AddRange(ConfigManager.Instance.GetAllKeys<IconConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<LanguageConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<SysInfoConfig>());
+ m_FitterKeys.AddRange(Config.Instance.GetAllKeys<IconConfig>());
FindEnglishLabel(true);
}
}
--
Gitblit v1.8.0