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

client_Wu Xijin

2019-05-06 0bb7ed8522de978fa796ec473073f1a40243438a

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

 Core/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -23,13 +23,13 @@
        var assetBundle = AssetBundle.LoadFromFile(path);

        if (assetBundle == null)

        {

            DebugEx.LogError("AssetBundleManifest的包文件为空或者加载出错.");

            DebugEx.LogErrorFormat("AssetBundleManifest的包文件为空或者加载出错.  Path:{0}", path);

        }



        var manifest = assetBundle.LoadAsset<AssetBundleManifest>(ResourcesPath.AssetDependentFileAssetName);

        if (manifest == null)

        {

            DebugEx.LogError("AssetBundleManifest文件为空或者加载出错.");

            DebugEx.LogErrorFormat("AssetBundleManifest的包文件为空或者加载出错.  Path:{0}", path);

        }



        var bundles = manifest.GetAllAssetBundles();

@@ -55,13 +55,13 @@
        var assetBundle = AssetBundle.LoadFromFile(path);

        if (assetBundle == null)

        {

            DebugEx.LogError("AssetBundleManifest的包文件为空或者加载出错.");

            DebugEx.LogErrorFormat("AssetBundleManifest的包文件为空或者加载出错.  Path:{0}", path);

        }



        var manifest = assetBundle.LoadAsset<AssetBundleManifest>(ResourcesPath.AssetDependentFileAssetName);

        if (manifest == null)

        {

            DebugEx.LogError("AssetBundleManifest文件为空或者加载出错.");

            DebugEx.LogErrorFormat("AssetBundleManifest的包文件为空或者加载出错.  Path:{0}", path);

        }



        for (int i = m_AssetBundleInfoList.Count - 1; i >= 0; i--)

@@ -122,14 +122,14 @@


        if (_assetBundle == null)

        {

            DebugEx.LogError("AssetBundleManifest的包文件为空或者加载出错.");

            DebugEx.LogErrorFormat("AssetBundleManifest的包文件为空或者加载出错.  Path:{0}", path);

            yield break;

        }



        AssetBundleManifest _assetBundleManifest = _assetBundle.LoadAsset<AssetBundleManifest>(ResourcesPath.AssetDependentFileAssetName);

        if (_assetBundleManifest == null)

        {

            DebugEx.LogError("AssetBundleManifest文件为空或者加载出错.");

            DebugEx.LogErrorFormat("AssetBundleManifest的包文件为空或者加载出错.  Path:{0}", path);

            yield break;

        }