Merge 9e2030c83d into cdaa45e163

Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultIgnoreRule.cs

@@ -33,14 +33,6 @@ namespace YooAsset.Editor
             if (AssetDatabase.IsValidFolder(assetInfo.AssetPath))
                 return true;
 
-            // 忽略编辑器图标资源
-            if (assetInfo.AssetPath.Contains("/Gizmos/"))
-                return true;
-
-            // 忽略编辑器专属资源
-            if (assetInfo.AssetPath.Contains("/Editor/") || assetInfo.AssetPath.Contains("/Editor Resources/"))
-                return true;
-
             // 忽略编辑器下的类型资源
             if (assetInfo.AssetType == typeof(LightingDataAsset))
                 return true;

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSDownloadFileOperation.cs

@@ -94,9 +94,6 @@ namespace YooAsset
             // 等待验证完成
             if (_steps == ESteps.CheckVerifyTempFile)
             {
-                if (IsWaitForAsyncComplete)
-                    _verifyOperation.WaitForAsyncComplete();
-
                 if (_verifyOperation.IsDone == false)
                     return;
 
@@ -157,6 +154,9 @@ namespace YooAsset
 
             while (true)
             {
+                if (_verifyOperation != null)
+                    _verifyOperation.WaitForAsyncComplete();
+
                 // 注意：如果是导入或解压本地文件，执行等待完毕
                 if (isReuqestLocalFile)
                 {
@@ -305,9 +305,6 @@ namespace YooAsset
             // 等待验证完成
             if (_steps == ESteps.CheckVerifyTempFile)
             {
-                if (IsWaitForAsyncComplete)
-                    _verifyOperation.WaitForAsyncComplete();
-
                 if (_verifyOperation.IsDone == false)
                     return;
 
@@ -367,6 +364,9 @@ namespace YooAsset
 
             while (true)
             {
+                if (_verifyOperation != null)
+                    _verifyOperation.WaitForAsyncComplete();
+
                 // 注意：如果是导入或解压本地文件，执行等待完毕
                 if (isReuqestLocalFile)
                 {

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs

@@ -58,9 +58,6 @@ namespace YooAsset
                     _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
                 }
 
-                if (IsWaitForAsyncComplete)
-                    _downloadFileOp.WaitForAsyncComplete();
-
                 DownloadProgress = _downloadFileOp.DownloadProgress;
                 DownloadedBytes = _downloadFileOp.DownloadedBytes;
                 if (_downloadFileOp.IsDone == false)
@@ -201,6 +198,9 @@ namespace YooAsset
         {
             while (true)
             {
+                if (_downloadFileOp != null)
+                    _downloadFileOp.WaitForAsyncComplete();
+
                 if (ExecuteWhileDone())
                 {
                     if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
@@ -274,9 +274,6 @@ namespace YooAsset
                     _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
                 }
 
-                if (IsWaitForAsyncComplete)
-                    _downloadFileOp.WaitForAsyncComplete();
-
                 DownloadProgress = _downloadFileOp.DownloadProgress;
                 DownloadedBytes = _downloadFileOp.DownloadedBytes;
                 if (_downloadFileOp.IsDone == false)
@@ -316,6 +313,9 @@ namespace YooAsset
         {
             while (true)
             {
+                if (_downloadFileOp != null)
+                    _downloadFileOp.WaitForAsyncComplete();
+
                 if (ExecuteWhileDone())
                 {
                     if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs

@@ -16,7 +16,6 @@ namespace YooAsset
             DownloadProgress = 1f;
             DownloadedBytes = _bundle.FileSize;
             Status = EOperationStatus.Succeed;
-            Result = new VirtualBundle(_fileSystem, _bundle);
         }
         internal override void InternalOnUpdate()
         {

Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs

@@ -147,7 +147,7 @@ namespace YooAsset
 
                 // 当执行次数用完时
                 _whileFrame--;
-                if (_whileFrame <= 0)
+                if (_whileFrame == 0)
                 {
                     Status = EOperationStatus.Failed;
                     Error = $"Operation {this.GetType().Name} failed to wait for async complete !";

Assets/YooAsset/Runtime/ResourceManager/Bundle.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a9ca0d0d29eb5294b9c6926c6a09e76b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Runtime/ResourceManager/Bundle/VirtualBundle.cs

@@ -1,15 +0,0 @@
-
-namespace YooAsset
-{
-    internal class VirtualBundle
-    {
-        private readonly IFileSystem _fileSystem;
-        private readonly PackageBundle _packageBundle;
-        
-        internal VirtualBundle(IFileSystem fileSystem, PackageBundle packageBundle)
-        {
-            _fileSystem = fileSystem;
-            _packageBundle = packageBundle;
-        }
-    }
-}

Assets/YooAsset/Runtime/ResourceManager/Bundle/VirtualBundle.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 822bb85f05144d842977dda341174db2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Runtime/ResourceManager/Loader/LoadBundleFileOperation.cs

@@ -69,9 +69,6 @@ namespace YooAsset
                 if (_loadBundleOp == null)
                     _loadBundleOp = BundleFileInfo.LoadBundleFile();
 
-                if (IsWaitForAsyncComplete)
-                    _loadBundleOp.WaitForAsyncComplete();
-
                 DownloadProgress = _loadBundleOp.DownloadProgress;
                 DownloadedBytes = _loadBundleOp.DownloadedBytes;
                 if (_loadBundleOp.IsDone == false)
@@ -79,18 +76,9 @@ namespace YooAsset
 
                 if (_loadBundleOp.Status == EOperationStatus.Succeed)
                 {
-                    if (_loadBundleOp.Result == null)
+                    _steps = ESteps.Done;
-                    {
+                    Result = _loadBundleOp.Result;
-                        _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
-                        Status = EOperationStatus.Failed;
-                        Error = $"The bundle loader result is null ! {BundleFileInfo.Bundle.BundleName}";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Result = _loadBundleOp.Result;
-                        Status = EOperationStatus.Succeed;
-                    }
                 }
                 else
                 {
@@ -104,6 +92,9 @@ namespace YooAsset
         {
             while (true)
             {
+                if (_loadBundleOp != null)
+                    _loadBundleOp.WaitForAsyncComplete();
+
                 if (ExecuteWhileDone())
                 {
                     _steps = ESteps.Done;

Assets/YooAsset/Runtime/ResourceManager/Loader/LoadDependFileOperation.cs

@@ -36,14 +36,6 @@ namespace YooAsset
 
             if (_steps == ESteps.CheckDepend)
             {
-                if (IsWaitForAsyncComplete)
-                {
-                    foreach (var loader in Depends)
-                    {
-                        loader.WaitForAsyncComplete();
-                    }
-                }
-
                 foreach (var loader in Depends)
                 {
                     if (loader.IsDone == false)
@@ -81,6 +73,11 @@ namespace YooAsset
         {
             while (true)
             {
+                foreach (var loader in Depends)
+                {
+                    loader.WaitForAsyncComplete();
+                }
+
                 if (ExecuteWhileDone())
                 {
                     _steps = ESteps.Done;

Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs

@@ -96,7 +96,6 @@ namespace YooAsset
             {
                 if (LoadDependBundleFileOp != null)
                     LoadDependBundleFileOp.WaitForAsyncComplete();
-
                 if (LoadBundleFileOp != null)
                     LoadBundleFileOp.WaitForAsyncComplete();
 

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -176,16 +176,6 @@ namespace YooAsset
                 }
 #endif
             }
-
-            // 检测文件系统参数
-            if (_playMode == EPlayMode.WebPlayMode)
-            {
-                var webPlayModeParams = parameters as WebPlayModeParameters;
-                var fileSystemClassName = webPlayModeParams.WebFileSystemParameters.FileSystemClass;
-                if (fileSystemClassName == typeof(DefaultCacheFileSystem).FullName
-                    || fileSystemClassName == typeof(DefaultBuildinFileSystem).FullName)
-                    throw new Exception($"{fileSystemClassName} not support {nameof(EPlayMode.WebPlayMode)}");
-            }
         }
         private void InitializeOperation_Completed(AsyncOperationBase op)
         {