|
|
@@ -1,7 +1,6 @@
|
|
|
using System;
|
|
|
using System.Collections.Generic;
|
|
|
using System.IO;
|
|
|
-using System.Linq;
|
|
|
using System.Text;
|
|
|
using System.Threading.Tasks;
|
|
|
using UnityEngine;
|
|
|
@@ -48,7 +47,7 @@ namespace ETModel
|
|
|
|
|
|
base.Dispose();
|
|
|
|
|
|
- //Log.Debug($"destroy assetbundle: {this.Name}");
|
|
|
+ //Log.Debug($"desdroy assetbundle: {this.Name}");
|
|
|
|
|
|
this.AssetBundle?.Unload(true);
|
|
|
}
|
|
|
@@ -250,7 +249,7 @@ namespace ETModel
|
|
|
assetBundleName = assetBundleName.ToLower();
|
|
|
string[] dependencies = ResourcesHelper.GetSortedDependencies(assetBundleName);
|
|
|
|
|
|
- //Log.Debug($"-----------dep load {assetBundleName} dep: {dependencies.ToList().ListToString()}");
|
|
|
+ // Log.Debug($"-----------dep load {assetBundleName} dep: {dependencies.ToList().ListToString()}");
|
|
|
foreach (string dependency in dependencies)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(dependency))
|
|
|
@@ -302,14 +301,14 @@ namespace ETModel
|
|
|
|
|
|
string p = Path.Combine(PathHelper.AppHotfixResPath, assetBundleName);
|
|
|
AssetBundle assetBundle = null;
|
|
|
- if (File.Exists(p))
|
|
|
+ if (!File.Exists(p))
|
|
|
{
|
|
|
- assetBundle = AssetBundle.LoadFromFile(p);
|
|
|
+ p = Path.Combine(PathHelper.AppResPath, assetBundleName);
|
|
|
}
|
|
|
- else
|
|
|
+
|
|
|
+ using (AssetsBundleLoaderAsync assetsBundleLoaderAsync = ComponentFactory.Create<AssetsBundleLoaderAsync>())
|
|
|
{
|
|
|
- p = Path.Combine(PathHelper.AppResPath, assetBundleName);
|
|
|
- assetBundle = AssetBundle.LoadFromFile(p);
|
|
|
+ assetBundle = await assetsBundleLoaderAsync.LoadAsync(p);
|
|
|
}
|
|
|
|
|
|
if (assetBundle == null)
|