Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-21 cb21874c84b59d9ccbcc38c70f350126827ca54b

 Core/GameEngine/Model/ConfigManager.cs

@@ -374,7 +374,7 @@
        }

        else

        {

            path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/", fileName, ".bytes");

            path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/", fileName, ".txt");

        }



        var task = new ConfigTask(typeof(T), AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External, path);