Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 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);
        }
    }