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

QD-PangDeRong

2018-08-09 1b2a902d635669056b793b654eaaf80e16d6373f

 Core/GameEngine/Model/ConfigManager.cs

@@ -403,11 +403,7 @@
                {

                    if (_task.assetPath == AssetPath.ResourceOut)

                    {

                        var fileInfo = new FileInfo(_task.filePath);

                        var fs = fileInfo.OpenRead();

                        sr = new StreamReader(fs, Encoding.UTF8);

                        var content = sr.ReadToEnd();

                        lines = content.Split(lineStep, StringSplitOptions.None);

                        lines = File.ReadAllLines(_task.filePath,Encoding.UTF8);

                    }

                    else if (_task.assetPath == AssetPath.External)

                    {