测试通过

Author: mister91jiao

Assets/BundleMaster/BundleMasterRuntime/AssetComponent.cs

@@ -216,10 +216,13 @@ public static async ETTask<T> LoadAsync<T>(string assetPath, string bundlePackag
             {
                 await loadHandler.LoadAsync();
                 AssetBundleRequest loadAssetAsync = loadHandler.FileAssetBundle.LoadAssetAsync<T>(assetPath);
+                ETTask tcs = ETTask.Create(true);
                 loadAssetAsync.completed += operation =>
                 {
                     loadHandler.Asset = loadAssetAsync.asset;
+                    tcs.SetResult();
                 };
+                await tcs;
             }
             coroutineLock.Dispose();
             return (T)loadHandler.Asset;
@@ -297,10 +300,13 @@ public static ETTask<T> LoadAsync<T>(out LoadHandler handler, string assetPath,
             {
                 await loadHandler.LoadAsync();
                 AssetBundleRequest loadAssetAsync = loadHandler.FileAssetBundle.LoadAssetAsync(assetPath);
+                ETTask tcs = ETTask.Create(true);
                 loadAssetAsync.completed += operation =>
                 {
                     loadHandler.Asset = loadAssetAsync.asset;
+                    tcs.SetResult();
                 };
+                await tcs;
             }
             coroutineLock.Dispose();
             return loadHandler.Asset;

Assets/BundleMaster/BundleMasterRuntime/AssetComponentConfig.cs

@@ -25,7 +25,7 @@ public class AssetComponentConfig
         /// <summary>
         /// 资源服务器的地址 http://192.168.50.157/BundleData/
         /// </summary>
-        public static string BundleServerUrl = "https://www.download.cutale.cn/TestBundle/0.0.1/";
+        public static string BundleServerUrl = "https://www.download.cutale.cn/TestBundle/0.0.2/";
 
         /// <summary>
         /// 默认加载的Bundle名

Assets/BundleMaster/BundleMasterRuntime/AssetComponentUpdate.cs

@@ -420,6 +420,8 @@ public static async ETTask DownLoadUpdate(UpdateBundleDataInfo updateBundleDataI
                     downLoadTaskQueue.Enqueue(downLoadTask);
                 }
             }
+            //最初开始的下载任务数量
+            int firstDownLoadTask = 0;
             //开启下载
             for (int i = 0; i < AssetComponentConfig.MaxDownLoadCount; i++)
             {
@@ -429,14 +431,19 @@ public static async ETTask DownLoadUpdate(UpdateBundleDataInfo updateBundleDataI
                     {
                         //downLoadTaskQueue.Dequeue().DownLoad().Coroutine();
                         downLoadTaskQueue.Dequeue().ThreadDownLoad().Coroutine();
+                        firstDownLoadTask++;
                         break;
                     }
                 }
             }
             //将下载进度更新添加到帧循环
             DownLoadAction += updateBundleDataInfo.UpdateProgressAndSpeedCallBack;
+            //说明没有ab需要更新
+            if (firstDownLoadTask == 0)
+            {
+                downLoading.SetResult();
+            }
             await downLoading;
-            
             //下载完成关闭CRCLog文件
             foreach (StreamWriter sw in updateBundleDataInfo.PackageCRCFile.Values)
             {

Assets/BundleMaster/BundleMasterRuntime/LoadHandler.cs

@@ -165,7 +165,7 @@ internal async ETTask LoadAsync()
                 LoadAsyncLoader(LoadDependGroups[i], tcs).Coroutine();
             }
             await tcs;
-            if (LoadState != LoadState.Finish)
+            if (LoadState == LoadState.Finish)
             {
                 AssetLogHelper.Log("此资源异步加载时触发了强制加载: " + AssetPath);
             }

Assets/Resources/BMConfig.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7d36208e8b0045f7ab3a61f1ab8f60c6, type: 3}
   m_Name: BMConfig
   m_EditorClassIdentifier: 
-  AssetLoadMode: 1
+  AssetLoadMode: 2
   MaxDownLoadCount: 8
   ReDownLoadCount: 4

Assets/StreamingAssets/AllBundle/VersionLogs.txt

@@ -1,4 +1,4 @@
-2023/1/18 5:47:40|1|False
+2023/1/24 7:57:01|1|False
 allbundle_assets_bundles_atlas_uispriteatlas_spriteatlas.bundle|958304|1676091697
 allbundle_assets_bundles_car_mp4.bundle|4053642|2455607307
 allbundle_assets_bundles_groupbundle.bundle|1636610|1099937232

Assets/StreamingAssets/SubBundle/VersionLogs.txt

@@ -1,4 +1,4 @@
-2023/1/18 5:47:43|1|False
+2023/1/24 7:57:04|1|False
 shader_subbundle|235729|39961991
 subbundle_assets_bundles_subbundleassets_mister91jiao_prefab.bundle|1716247|3680700019
 subbundle_assets_bundles_subbundleassets_subui_copy_prefab.bundle|4217380|1530244085

BuildBundles/AllBundle/VersionLogs.txt

@@ -1,4 +1,4 @@
-2023/1/18 5:47:40|1|False
+2023/1/24 7:57:01|1|False
 allbundle_assets_bundles_atlas_uispriteatlas_spriteatlas.bundle|958304|1676091697
 allbundle_assets_bundles_car_mp4.bundle|4053642|2455607307
 allbundle_assets_bundles_groupbundle.bundle|1636610|1099937232

BuildBundles/SubBundle/VersionLogs.txt

@@ -1,4 +1,4 @@
-2023/1/18 5:47:43|1|False
+2023/1/24 7:57:04|1|False
 shader_subbundle|235729|39961991
 subbundle_assets_bundles_subbundleassets_mister91jiao_prefab.bundle|1716247|3680700019
 subbundle_assets_bundles_subbundleassets_subui_copy_prefab.bundle|4217380|1530244085

HotfixBundles/AllBundle/CRCLog.txt

@@ -1,12 +1 @@
 
-allbundle_assets_bundles_loginui_prefab.bundle|3244467617|2023/1/18 6:21:49
-allbundle_assets_bundles_resetui_prefab.bundle|3689768748|2023/1/18 6:21:49
-allbundle_assets_bundles_subui_prefab.bundle|3400842303|2023/1/18 6:21:49
-allbundle_assets_bundles_subbundleassets_subui_copy_prefab.bundle|1662491636|2023/1/18 6:21:49
-allbundle_assets_bundles_subbundleassets_mister91jiao_prefab.bundle|2031352474|2023/1/18 6:21:49
-allbundle_assets_res_ui.bundle|3294171982|2023/1/18 6:21:49
-shader_allbundle|468004778|2023/1/18 6:21:49
-allbundle_assets_bundles_groupbundle.bundle|1099937232|2023/1/18 6:21:49
-allbundle_assets_bundles_atlas_uispriteatlas_spriteatlas.bundle|1676091697|2023/1/18 6:21:49
-allbundle_assets_scenes_game_unity.bundle|319310462|2023/1/18 6:21:49
-allbundle_assets_bundles_car_mp4.bundle|2455607307|2023/1/18 6:21:49