Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/Language/Language.cs

@@ -26,13 +26,13 @@
        var languageInfo = ConfigManager.Instance.GetTemplate<LanguageConfig>(_id);

        if (languageInfo == null)

        {

            DesignDebug.LogFormat("缺少语言表配置,id: {0}", _id);

            DebugEx.LogFormat("缺少语言表配置,id: {0}", _id);

            return string.Empty;

        }



        if (string.IsNullOrEmpty(languageInfo.content))

        {

            DesignDebug.LogFormat("语言内容为空,id: {0}", _id);

            DebugEx.LogFormat("语言内容为空,id: {0}", _id);

        }



        return languageInfo.content;

@@ -47,7 +47,7 @@
        }

        catch (Exception ex)

        {

            DesignDebug.LogFormat("语言内容格式错误,id: {0}", _id);

            DebugEx.LogFormat("语言内容格式错误,id: {0}", _id);

            return content;

        }

    }

@@ -57,13 +57,13 @@
        var languageInfo = ConfigManager.Instance.GetTemplate<PriorLanguageConfig>(_id);

        if (languageInfo == null)

        {

            DesignDebug.LogFormat("缺少语言表配置,id: {0}", _id);

            DebugEx.LogFormat("缺少语言表配置,id: {0}", _id);

            return string.Empty;

        }



        if (string.IsNullOrEmpty(languageInfo.Content))

        {

            DesignDebug.LogFormat("语言内容为空,id: {0}", _id);

            DebugEx.LogFormat("语言内容为空,id: {0}", _id);

        }



        return languageInfo.Content;

@@ -78,7 +78,7 @@
        }

        catch (Exception ex)

        {

            DesignDebug.LogFormat("语言内容格式错误,id: {0}", _id);

            DebugEx.LogFormat("语言内容格式错误,id: {0}", _id);

            return content;

        }

    }