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

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 Core/GameEngine/Model/ConfigManager.cs

@@ -428,7 +428,7 @@
                catch (Exception ex)

                {

                    _task.state = TaskState.ReadFileFailure;

                    DesignDebug.Log(ex);

                    DebugEx.Log(ex);

                }

                finally

                {

@@ -487,7 +487,7 @@
                catch (Exception ex)

                {

                    _task.state = TaskState.ParseFailure;

                    DesignDebug.Log(ex);

                    DebugEx.Log(ex);

                }

                finally

                {

@@ -613,7 +613,7 @@
        }

        catch (Exception ex)

        {

            DesignDebug.Log(ex);

            DebugEx.Log(ex);

        }

        finally

        {

@@ -633,7 +633,7 @@
        var token = typeof(T).MetadataToken;

        if (configDictionary.ContainsKey(token) == false)

        {

            DesignDebug.LogErrorFormat("not find the config:{0}", token);

            DebugEx.LogErrorFormat("not find the config:{0}", token);

            return null;

        }



@@ -641,7 +641,7 @@
        var dic = configDictionary[token];

        if (!dic.ContainsKey(_dwTemplateID))

        {

            DesignDebug.LogFormat("not find the config:{0},<color=#ff0000ff>ID:{1}</color>", typeof(T).Name, _dwTemplateID);

            DebugEx.LogFormat("not find the config:{0},<color=#ff0000ff>ID:{1}</color>", typeof(T).Name, _dwTemplateID);

        }

        else

        {

@@ -690,7 +690,7 @@
        var token = typeof(T).MetadataToken;

        if (!configDictionary.ContainsKey(token))

        {

            DesignDebug.LogErrorFormat("not find the dic of config: {0}", typeof(T).Name);

            DebugEx.LogErrorFormat("not find the dic of config: {0}", typeof(T).Name);

            return null;

        }



@@ -703,7 +703,7 @@
        var token = typeof(T).MetadataToken;

        if (!configDictionary.ContainsKey(token))

        {

            DesignDebug.LogErrorFormat("not find the dic of config: {0}", typeof(T).Name);

            DebugEx.LogErrorFormat("not find the dic of config: {0}", typeof(T).Name);

            return null;

        }