Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 Core/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -48,7 +48,8 @@
    public void ReInitBuiltInAsset()

    {

        WindowConfig.Release();

        UnloadAssetBundle("builtin/scriptableobjects",true,false);

        UnloadAssetBundle("builtin/scriptableobjects", true, false);



        var path = AssetVersionUtility.GetBuiltInAssetFilePath("builtin_assetbundle");

        var assetBundle = AssetBundle.LoadFromFile(path);

        if (assetBundle == null)