refactor : 重构资源清单反序列化逻辑

修复极端情况下Shader变种收集不完整的问题

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,88 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.16] - 2025-09-17
+
+### Improvements
+
+- (#638) 优化了Provider加载机制，引用计数为零时自动挂起！
+
+### Fixed
+
+- (#644) [**严重**] 修复了2.3.15版本，资产量巨大的情况下，编辑器下模拟模式初始化耗时很久的问题。
+
+### Added
+
+- (#639) 新增了文件系统参数：VIRTUAL_DOWNLOAD_MODE 和 VIRTUAL_DOWNLOAD_SPEED 
+
+  编辑器下不需要构建AB，也可以模拟远端资源下载，等同真机运行环境。
+
+  ```csharp
+  class DefaultEditorFIleSystem
+  {
+      /// <summary>
+      /// 模拟虚拟下载模式
+      /// </summary>
+      public bool VirtualDownloadMode { private set; get; } = false;
+  
+      /// <summary>
+      /// 模拟虚拟下载的网速（单位：字节）
+      /// </summary>
+      public int VirtualDownloadSpeed { private set; get; } = 1024;
+  }
+  ```
+
+- (#640) 新增了文件系统参数：VIRTUAL_WEBGL_MODE 
+
+  编辑器下不需要构建AB，也可以模拟小游戏开发环境，等同真机运行环境。
+
+  ```csharp
+  class DefaultEditorFIleSystem
+  {
+      /// <summary>
+      /// 模拟WebGL平台模式
+      /// </summary>
+      public bool VirtualWebGLMode { private set; get; } = false;
+  }
+  ```
+
+- (#642) 新增了文件系统参数：DOWNLOAD_WATCH_DOG_TIME
+
+  监控时间范围内，如果没有接收到任何下载数据，那么直接终止任务！
+
+  ```csharp
+  class DefaultCacheFIleSystem
+  {
+      /// <summary>
+      /// 自定义参数：下载任务的看门狗机制监控时间
+      /// </summary>
+      public int DownloadWatchDogTime { private set; get; } = int.MaxValue;
+  }
+  ```
+
+### Changed
+
+- 下载器参数timeout移除。
+
+  可以使用文件系统的看门狗机制代替。
+
+- (#632) IFilterRule接口变动。
+
+  收集器可以指定搜寻的资源类型，在收集目录资产量巨大的情况下，可以极大加快打包速度！
+
+  ```csharp
+  public interface IFilterRule
+  {
+      /// <summary>
+      /// 搜寻的资源类型
+      /// 说明：使用引擎方法搜索获取所有资源列表
+      /// </summary>
+      string FindAssetType { get; } 
+  }
+  ```
+
+  
+
 ## [2.3.15] - 2025-09-09
 
 **重要**：升级了资源清单版本，不兼容老版本。建议重新提审安装包。
@@ -69,7 +151,9 @@ All notable changes to this package will be documented in this file.
 
 - (#617) 新增资源收集配置参数：SupportExtensionless
 
-  在不需要模糊加载模式的前提下，开启此选项，可以降低运行时内存大小。
+  在不需要模糊加载模式的前提下，关闭此选项，可以降低运行时内存大小。
+
+  该选项默认开启！
 
   ```csharp
   public class CollectCommand

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs

@@ -32,21 +32,14 @@ namespace YooAsset.Editor
 
                 // 开始扫描工作
                 ScanReport report = scanner.RunScanner();
-
-                // 检测报告合法性
                 report.CheckError();
 
-                // 保存扫描结果
+                // 返回扫描结果
-                string saveDirectory = scanner.SaveDirectory;
+                return new ScannerResult(report);
-                if (string.IsNullOrEmpty(saveDirectory))
-                    saveDirectory = "Assets/";
-                string filePath = $"{saveDirectory}/{scanner.ScannerName}_{scanner.ScannerDesc}.json";
-                ScanReportConfig.ExportJsonConfig(filePath, report);
-                return new ScannerResult(filePath, report);
             }
             catch (Exception e)
             {
-                return new ScannerResult(e.StackTrace);
+                return new ScannerResult(e.Message, e.StackTrace);
             }
         }
 

Assets/YooAsset/Editor/AssetArtScanner/ScannerResult.cs

@@ -3,11 +3,6 @@ namespace YooAsset.Editor
 {
     public class ScannerResult
     {
-        /// <summary>
-        /// 生成的报告文件路径
-        /// </summary>
-        public string ReprotFilePath { private set; get; }
-
         /// <summary>
         /// 报告对象
         /// </summary>
@@ -18,6 +13,11 @@ namespace YooAsset.Editor
         /// </summary>
         public string ErrorInfo { private set; get; }
 
+        /// <summary>
+        /// 错误堆栈
+        /// </summary>
+        public string ErrorStack { private set; get; }
+
         /// <summary>
         /// 是否成功
         /// </summary>
@@ -33,15 +33,14 @@ namespace YooAsset.Editor
         }
 
 
-        public ScannerResult(string error)
+        public ScannerResult(string error, string stack)
         {
             ErrorInfo = error;
+            ErrorStack = stack;
         }
-        public ScannerResult(string filePath, ScanReport report)
+        public ScannerResult(ScanReport report)
         {
-            ReprotFilePath = filePath;
             Report = report;
-            ErrorInfo = string.Empty;
         }
 
         /// <summary>
@@ -55,5 +54,19 @@ namespace YooAsset.Editor
                 reproterWindow.ImportSingleReprotFile(Report);
             }
         }
+
+        /// <summary>
+        /// 保存报告文件
+        /// </summary>
+        public void SaveReportFile(string saveDirectory)
+        {
+            if (Report == null)
+                throw new System.Exception("Scan report is invalid !");
+
+            if (string.IsNullOrEmpty(saveDirectory))
+                saveDirectory = "Assets/";
+            string filePath = $"{saveDirectory}/{Report.ReportName}_{Report.ReportDesc}.json";
+            ScanReportConfig.ExportJsonConfig(filePath, Report);
+        }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/BuildResult.cs

@@ -21,6 +21,11 @@ namespace YooAsset.Editor
         /// </summary>
         public string ErrorInfo;
 
+        /// <summary>
+        /// 构建失败的堆栈
+        /// </summary>
+        public string ErrorStack;
+
         /// <summary>
         /// 输出的补丁包目录
         /// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/BuildRunner.cs

@@ -51,6 +51,7 @@ namespace YooAsset.Editor
                     EditorTools.ClearProgressBar();
                     buildResult.FailedTask = task.GetType().Name;
                     buildResult.ErrorInfo = e.ToString();
+                    buildResult.ErrorStack = e.StackTrace;
                     buildResult.Success = false;
                     break;
                 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -139,14 +139,30 @@ namespace YooAsset.Editor
         /// </summary>
         public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
         {
+            bool ignoreStaticCollector = command.IsFlagSet(ECollectFlags.IgnoreStaticCollector);
+            if (ignoreStaticCollector)
+            {
+                if (CollectorType == ECollectorType.StaticAssetCollector)
+                    return new List<CollectAssetInfo>();
+            }
+
+            bool ignoreDependCollector = command.IsFlagSet(ECollectFlags.IgnoreDependCollector);
+            if (ignoreDependCollector)
+            {
+                if (CollectorType == ECollectorType.DependAssetCollector)
+                    return new List<CollectAssetInfo>();
+            }
+
             Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000);
 
             // 收集打包资源路径
             List<string> findAssets = new List<string>();
             if (AssetDatabase.IsValidFolder(CollectPath))
             {
-                string collectDirectory = CollectPath;
+                IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
-                string[] findResult = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
+                string findAssetType = filterRuleInstance.FindAssetType;
+                string searchFolder = CollectPath;
+                string[] findResult = EditorTools.FindAssets(findAssetType, searchFolder);
                 findAssets.AddRange(findResult);
             }
             else
@@ -262,8 +278,8 @@ namespace YooAsset.Editor
         }
         private List<AssetInfo> GetAllDependencies(CollectCommand command, string mainAssetPath)
         {
-            // 注意：模拟构建模式下不需要收集依赖资源
+            bool ignoreGetDependencies = command.IsFlagSet(ECollectFlags.IgnoreGetDependencies);
-            if (command.SimulateBuild)
+            if (ignoreGetDependencies)
                 return new List<AssetInfo>();
 
             string[] depends = command.AssetDependency.GetDependencies(mainAssetPath, true);

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -1028,7 +1028,7 @@ namespace YooAsset.Editor
                 IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(_ignoreRulePopupField.value.ClassName);
                 string packageName = _packageNameTxt.value;
                 var command = new CollectCommand(packageName, ignoreRule);
-                command.SimulateBuild = true;
+                command.SetFlag(ECollectFlags.IgnoreGetDependencies, true);
                 command.UniqueBundleName = _uniqueBundleNameToogle.value;
                 command.EnableAddressable = _enableAddressableToogle.value;
                 command.SupportExtensionless = _supportExtensionlessToogle.value;

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -1,6 +1,26 @@
 
 namespace YooAsset.Editor
 {
+    public enum ECollectFlags
+    {
+        None = 0,
+
+        /// <summary>
+        /// 不收集依赖资源
+        /// </summary>
+        IgnoreGetDependencies = 1 << 0,
+
+        /// <summary>
+        /// 忽略静态收集器
+        /// </summary>
+        IgnoreStaticCollector = 1 << 1,
+
+        /// <summary>
+        /// 忽略依赖收集器
+        /// </summary>
+        IgnoreDependCollector = 1 << 2,
+    }
+
     public class CollectCommand
     {
         /// <summary>
@@ -17,7 +37,20 @@ namespace YooAsset.Editor
         /// <summary>
         /// 模拟构建模式
         /// </summary>
-        public bool SimulateBuild { set; get; }
+        public bool SimulateBuild
+        {
+            set
+            {
+                SetFlag(ECollectFlags.IgnoreGetDependencies, value);
+                SetFlag(ECollectFlags.IgnoreStaticCollector, value);
+                SetFlag(ECollectFlags.IgnoreDependCollector, value);
+            }
+        }
+
+        /// <summary>
+        /// 窗口收集模式
+        /// </summary>
+        public int CollectFlags { set; get; } = 0;
 
         /// <summary>
         /// 资源包名唯一化
@@ -70,5 +103,24 @@ namespace YooAsset.Editor
             PackageName = packageName;
             IgnoreRule = ignoreRule;
         }
+
+        /// <summary>
+        /// 设置标记位
+        /// </summary>
+        public void SetFlag(ECollectFlags flag, bool isOn)
+        {
+            if (isOn)
+                CollectFlags |= (int)flag;  // 开启指定标志位
+            else
+                CollectFlags &= ~(int)flag; // 关闭指定标志位
+        }
+
+        /// <summary>
+        /// 查询标记位
+        /// </summary>
+        public bool IsFlagSet(ECollectFlags flag)
+        {
+            return (CollectFlags & (int)flag) != 0;
+        }
     }
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IFilterRule.cs

@@ -23,7 +23,13 @@ namespace YooAsset.Editor
     public interface IFilterRule
     {
         /// <summary>
-        /// 是否为收集资源
+        /// 搜寻的资源类型
+        /// 说明：使用引擎方法搜索获取所有资源列表
+        /// </summary>
+        string FindAssetType { get; }
+
+        /// <summary>
+        /// 验证搜寻的资源是否为收集资源
         /// </summary>
         /// <returns>如果收集该资源返回TRUE</returns>
         bool IsCollectAsset(FilterRuleData data);

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

@@ -9,6 +9,11 @@ namespace YooAsset.Editor
     [DisplayName("收集所有资源")]
     public class CollectAll : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.All.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             return true;
@@ -18,6 +23,11 @@ namespace YooAsset.Editor
     [DisplayName("收集场景")]
     public class CollectScene : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.Scene.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             string extension = Path.GetExtension(data.AssetPath);
@@ -28,6 +38,11 @@ namespace YooAsset.Editor
     [DisplayName("收集预制体")]
     public class CollectPrefab : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.Prefab.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             return Path.GetExtension(data.AssetPath) == ".prefab";
@@ -37,6 +52,11 @@ namespace YooAsset.Editor
     [DisplayName("收集精灵类型的纹理")]
     public class CollectSprite : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.Sprite.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             var mainAssetType = AssetDatabase.GetMainAssetTypeAtPath(data.AssetPath);
@@ -58,6 +78,11 @@ namespace YooAsset.Editor
     [DisplayName("收集着色器")]
     public class CollectShader : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.Shader.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             return Path.GetExtension(data.AssetPath) == ".shader";
@@ -67,6 +92,11 @@ namespace YooAsset.Editor
     [DisplayName("收集着色器变种集合")]
     public class CollectShaderVariants : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.All.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             return Path.GetExtension(data.AssetPath) == ".shadervariants";

Assets/YooAsset/Editor/EditorDefine.cs

@@ -39,6 +39,7 @@ namespace YooAsset.Editor
         Shader,
         Sprite,
         Texture,
+        RenderTexture,
         VideoClip,
     }
 

Assets/YooAsset/Editor/EditorTools.cs

@@ -169,6 +169,28 @@ namespace YooAsset.Editor
         /// <param name="searchInFolders">指定搜索的文件夹列表</param>
         /// <returns>返回搜集到的资源路径列表</returns>
         public static string[] FindAssets(EAssetSearchType searchType, string[] searchInFolders)
+        {
+            return FindAssets(searchType.ToString(), searchInFolders);
+        }
+
+        /// <summary>
+        /// 搜集资源
+        /// </summary>
+        /// <param name="searchType">搜集的资源类型</param>
+        /// <param name="searchInFolder">指定搜索的文件夹</param>
+        /// <returns>返回搜集到的资源路径列表</returns>
+        public static string[] FindAssets(EAssetSearchType searchType, string searchInFolder)
+        {
+            return FindAssets(searchType.ToString(), new string[] { searchInFolder });
+        }
+
+        /// <summary>
+        /// 搜集资源
+        /// </summary>
+        /// <param name="searchType">搜集的资源类型</param>
+        /// <param name="searchInFolders">指定搜索的文件夹列表</param>
+        /// <returns>返回搜集到的资源路径列表</returns>
+        public static string[] FindAssets(string searchType, string[] searchInFolders)
         {
             // 注意：AssetDatabase.FindAssets()不支持末尾带分隔符的文件夹路径
             for (int i = 0; i < searchInFolders.Length; i++)
@@ -179,7 +201,7 @@ namespace YooAsset.Editor
 
             // 注意：获取指定目录下的所有资源对象（包括子文件夹）
             string[] guids;
-            if (searchType == EAssetSearchType.All)
+            if (string.IsNullOrEmpty(searchType) || searchType == EAssetSearchType.All.ToString())
                 guids = AssetDatabase.FindAssets(string.Empty, searchInFolders);
             else
                 guids = AssetDatabase.FindAssets($"t:{searchType}", searchInFolders);
@@ -206,7 +228,7 @@ namespace YooAsset.Editor
         /// <param name="searchType">搜集的资源类型</param>
         /// <param name="searchInFolder">指定搜索的文件夹</param>
         /// <returns>返回搜集到的资源路径列表</returns>
-        public static string[] FindAssets(EAssetSearchType searchType, string searchInFolder)
+        public static string[] FindAssets(string searchType, string searchInFolder)
         {
             return FindAssets(searchType, new string[] { searchInFolder });
         }

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityVirtualBundleRequestOperation.cs

@@ -0,0 +1,65 @@
+using UnityEngine.Networking;
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class UnityVirtualBundleRequestOperation : UnityWebRequestOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            Download,
+            Done,
+        }
+
+        private readonly PackageBundle _bundle;
+        private readonly int _downloadSpeed;
+        private ESteps _steps = ESteps.None;
+
+        internal UnityVirtualBundleRequestOperation(PackageBundle packageBundle, int downloadSpeed, string url) : base(url)
+        {
+            _bundle = packageBundle;
+            _downloadSpeed = downloadSpeed;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.Download;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.Download)
+            {
+                // 模拟下载进度
+                float progress = 0;
+                if (DownloadedBytes > 0)
+                    progress = DownloadedBytes / _bundle.FileSize;
+                long downloadBytes = (long)((double)_downloadSpeed * Time.deltaTime);
+                
+                Progress = progress;
+                DownloadProgress = progress;
+                DownloadedBytes += downloadBytes;
+                if (DownloadedBytes < _bundle.FileSize)
+                    return;
+
+                Progress = 1f;
+                DownloadProgress = 1f;
+                DownloadedBytes = _bundle.FileSize;
+
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            if (_steps != ESteps.Done)
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = $"Try load bundle {_bundle.BundleName} from remote !";
+            }
+        }
+    }
+}

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityVirtualBundleRequestOperation.cs.meta

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

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs

@@ -90,7 +90,7 @@ namespace YooAsset
         public string CopyBuildinPackageManifestDestRoot { private set; get; }
 
         /// <summary>
-        ///  自定义参数：解密方法类
+        ///  自定义参数：解密服务接口的实例类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
 
@@ -100,7 +100,7 @@ namespace YooAsset
         public IManifestRestoreServices ManifestServices { private set; get; }
 
         /// <summary>
-        /// 自定义参数：拷贝内置文件服务类
+        /// 自定义参数：拷贝内置文件接口的实例类
         /// </summary>
         public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion

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

@@ -57,7 +57,7 @@ namespace YooAsset
 
         #region 自定义参数
         /// <summary>
-        /// 自定义参数：远程服务接口
+        /// 自定义参数：远程服务接口的实例类
         /// </summary>
         public IRemoteServices RemoteServices { private set; get; }
 
@@ -96,6 +96,11 @@ namespace YooAsset
         /// </summary>
         public int DownloadMaxRequestPerFrame { private set; get; } = int.MaxValue;
 
+        /// <summary>
+        /// 自定义参数：下载任务的看门狗机制监控时间
+        /// </summary>
+        public int DownloadWatchDogTime { private set; get; } = int.MaxValue;
+
         /// <summary>
         /// 自定义参数：启用断点续传的最小尺寸
         /// </summary>
@@ -107,7 +112,7 @@ namespace YooAsset
         public List<long> ResumeDownloadResponseCodes { private set; get; } = null;
 
         /// <summary>
-        ///  自定义参数：解密方法类
+        ///  自定义参数：解密服务接口的实例类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
 
@@ -117,7 +122,7 @@ namespace YooAsset
         public IManifestRestoreServices ManifestServices { private set; get; }
 
         /// <summary>
-        /// 自定义参数：拷贝内置文件服务类
+        /// 自定义参数：拷贝内置文件接口的实例类
         /// </summary>
         public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
@@ -252,6 +257,11 @@ namespace YooAsset
                 int convertValue = Convert.ToInt32(value);
                 DownloadMaxRequestPerFrame = Mathf.Clamp(convertValue, 1, int.MaxValue);
             }
+            else if (name == FileSystemParametersDefine.DOWNLOAD_WATCH_DOG_TIME)
+            {
+                int convertValue = Convert.ToInt32(value);
+                DownloadWatchDogTime = Mathf.Clamp(convertValue, 1, int.MaxValue);
+            }
             else if (name == FileSystemParametersDefine.RESUME_DOWNLOAD_MINMUM_SIZE)
             {
                 ResumeDownloadMinimumSize = Convert.ToInt64(value);

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadFileOperation.cs

@@ -17,6 +17,11 @@ namespace YooAsset
         protected readonly PackageBundle _bundle;
         protected readonly string _tempFilePath;
 
+        private bool _watchDogInit = false;
+        private bool _watchDogAborted = false;
+        private ulong _lastDownloadBytes;
+        private double _lastGetDataTime;
+
         /// <summary>
         /// 引用计数
         /// </summary>
@@ -33,6 +38,47 @@ namespace YooAsset
             return $"RefCount : {RefCount}";
         }
 
+        /// <summary>
+        /// 更新看门狗监测
+        /// 说明：监控时间范围内，如果没有接收到任何下载数据，那么直接终止任务！
+        /// </summary>
+        protected void UpdateWatchDog()
+        {
+            if (_fileSystem.DownloadWatchDogTime == int.MaxValue)
+                return;
+
+            if (_watchDogAborted)
+                return;
+
+#if UNITY_2020_3_OR_NEWER
+            double realtimeSinceStartup = UnityEngine.Time.realtimeSinceStartupAsDouble;
+#else
+            double realtimeSinceStartup = UnityEngine.Time.realtimeSinceStartup;
+#endif
+
+            if (_watchDogInit == false)
+            {
+                _watchDogInit = true;
+                _lastDownloadBytes = 0;
+                _lastGetDataTime = realtimeSinceStartup;
+            }
+
+            if (_webRequest.downloadedBytes != _lastDownloadBytes)
+            {
+                _lastDownloadBytes = _webRequest.downloadedBytes;
+                _lastGetDataTime = realtimeSinceStartup;
+            }
+            else
+            {
+                double deltaTime = realtimeSinceStartup - _lastGetDataTime;
+                if (deltaTime > _fileSystem.DownloadWatchDogTime)
+                {
+                    _watchDogAborted = true;
+                    InternalAbort(); //终止网络请求
+                }
+            }
+        }
+
         /// <summary>
         /// 减少引用计数
         /// </summary>

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadLocalFileOperation.cs

@@ -4,7 +4,7 @@ using UnityEngine.Networking;
 
 namespace YooAsset
 {
-    internal class UnityDownloadLocalFileOperation : UnityDownloadFileOperation
+    internal sealed class UnityDownloadLocalFileOperation : UnityDownloadFileOperation
     {
         private VerifyTempFileOperation _verifyOperation;
         private ESteps _steps = ESteps.None;
@@ -42,6 +42,8 @@ namespace YooAsset
                 DownloadProgress = _webRequest.downloadProgress;
                 DownloadedBytes = (long)_webRequest.downloadedBytes;
                 Progress = DownloadProgress;
+
+                UpdateWatchDog();
                 if (_webRequest.isDone == false)
                     return;
 

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadNormalFileOperation.cs

@@ -39,6 +39,8 @@ namespace YooAsset
                 DownloadProgress = _webRequest.downloadProgress;
                 DownloadedBytes = (long)_webRequest.downloadedBytes;
                 Progress = DownloadProgress;
+
+                UpdateWatchDog();
                 if (_webRequest.isDone == false)
                     return;
 

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadResumeFileOperation.cs

@@ -56,6 +56,8 @@ namespace YooAsset
                 DownloadProgress = _webRequest.downloadProgress;
                 DownloadedBytes = _fileOriginLength + (long)_webRequest.downloadedBytes;
                 Progress = DownloadProgress;
+
+                UpdateWatchDog();
                 if (_webRequest.isDone == false)
                     return;
 

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace YooAsset
 {
@@ -7,6 +8,7 @@ namespace YooAsset
     /// </summary>
     internal class DefaultEditorFileSystem : IFileSystem
     {
+        protected readonly Dictionary<string, string> _records = new Dictionary<string, string>(10000);
         protected string _packageRoot;
 
         /// <summary>
@@ -37,15 +39,30 @@ namespace YooAsset
         }
 
         #region 自定义参数
+        /// <summary>
+        /// 模拟WebGL平台模式
+        /// </summary>
+        public bool VirtualWebGLMode { private set; get; } = false;
+
+        /// <summary>
+        /// 模拟虚拟下载模式
+        /// </summary>
+        public bool VirtualDownloadMode { private set; get; } = false;
+
+        /// <summary>
+        /// 模拟虚拟下载的网速（单位：字节）
+        /// </summary>
+        public int VirtualDownloadSpeed { private set; get; } = 1024;
+
         /// <summary>
         /// 异步模拟加载最小帧数
         /// </summary>
-        public int _asyncSimulateMinFrame = 1;
+        public int AsyncSimulateMinFrame { private set; get; } = 1;
 
         /// <summary>
         /// 异步模拟加载最大帧数
         /// </summary>
-        public int _asyncSimulateMaxFrame = 1;
+        public int AsyncSimulateMaxFrame { private set; get; } = 1;
         #endregion
 
         public DefaultEditorFileSystem()
@@ -73,7 +90,10 @@ namespace YooAsset
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            throw new System.NotImplementedException();
+            string mainURL = bundle.BundleName;
+            options.SetURL(mainURL, mainURL);
+            var downloader = new DownloadVirtualBundleOperation(this, bundle, options);
+            return downloader;
         }
         public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
         {
@@ -92,13 +112,25 @@ namespace YooAsset
 
         public virtual void SetParameter(string name, object value)
         {
-            if (name == FileSystemParametersDefine.ASYNC_SIMULATE_MIN_FRAME)
+            if (name == FileSystemParametersDefine.VIRTUAL_WEBGL_MODE)
             {
-                _asyncSimulateMinFrame = Convert.ToInt32(value);
+                VirtualWebGLMode = Convert.ToBoolean(value);
+            }
+            else if (name == FileSystemParametersDefine.VIRTUAL_DOWNLOAD_MODE)
+            {
+                VirtualDownloadMode = Convert.ToBoolean(value);
+            }
+            else if (name == FileSystemParametersDefine.VIRTUAL_DOWNLOAD_SPEED)
+            {
+                VirtualDownloadSpeed = Convert.ToInt32(value);
+            }
+            else if (name == FileSystemParametersDefine.ASYNC_SIMULATE_MIN_FRAME)
+            {
+                AsyncSimulateMinFrame = Convert.ToInt32(value);
             }
             else if (name == FileSystemParametersDefine.ASYNC_SIMULATE_MAX_FRAME)
             {
-                _asyncSimulateMaxFrame = Convert.ToInt32(value);
+                AsyncSimulateMaxFrame = Convert.ToInt32(value);
             }
             else
             {
@@ -124,11 +156,21 @@ namespace YooAsset
         }
         public virtual bool Exists(PackageBundle bundle)
         {
-            return true;
+            if (VirtualDownloadMode)
+            {
+                return _records.ContainsKey(bundle.BundleGUID);
+            }
+            else
+            {
+                return true;
+            }
         }
         public virtual bool NeedDownload(PackageBundle bundle)
         {
-            return false;
+            if (Belong(bundle) == false)
+                return false;
+
+            return Exists(bundle) == false;
         }
         public virtual bool NeedUnpack(PackageBundle bundle)
         {
@@ -165,6 +207,11 @@ namespace YooAsset
         }
 
         #region 内部方法
+        public void RecordDownloadFile(PackageBundle bundle)
+        {
+            if (_records.ContainsKey(bundle.BundleGUID) == false)
+                _records.Add(bundle.BundleGUID, bundle.BundleName);
+        }
         public string GetEditorPackageVersionFilePath()
         {
             string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
@@ -182,12 +229,12 @@ namespace YooAsset
         }
         public int GetAsyncSimulateFrame()
         {
-            if (_asyncSimulateMinFrame > _asyncSimulateMaxFrame)
+            if (AsyncSimulateMinFrame > AsyncSimulateMaxFrame)
             {
-                _asyncSimulateMinFrame = _asyncSimulateMaxFrame;
+                AsyncSimulateMinFrame = AsyncSimulateMaxFrame;
             }
 
-            return UnityEngine.Random.Range(_asyncSimulateMinFrame, _asyncSimulateMaxFrame + 1);
+            return UnityEngine.Random.Range(AsyncSimulateMinFrame, AsyncSimulateMaxFrame + 1);
         }
         #endregion
     }

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

@@ -6,6 +6,7 @@ namespace YooAsset
         protected enum ESteps
         {
             None,
+            CheckExist,
             DownloadFile,
             LoadAssetBundle,
             CheckResult,
@@ -14,6 +15,7 @@ namespace YooAsset
 
         private readonly DefaultEditorFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
+        protected FSDownloadFileOperation _downloadFileOp;
         private int _asyncSimulateFrame;
         private ESteps _steps = ESteps.None;
 
@@ -24,26 +26,74 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.DownloadFile;
+            _steps = ESteps.CheckExist;
+            _asyncSimulateFrame = _fileSystem.GetAsyncSimulateFrame();
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckExist)
+            {
+                if (_fileSystem.Exists(_bundle))
+                {
+                    DownloadProgress = 1f;
+                    DownloadedBytes = _bundle.FileSize;
+                    _steps = ESteps.LoadAssetBundle;
+                }
+                else
+                {
+                    _steps = ESteps.DownloadFile;
+                }
+            }
+
             if (_steps == ESteps.DownloadFile)
             {
-                _asyncSimulateFrame = _fileSystem.GetAsyncSimulateFrame();
+                if (_downloadFileOp == null)
-                DownloadProgress = 1f;
+                {
-                DownloadedBytes = _bundle.FileSize;
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
-                _steps = ESteps.LoadAssetBundle;
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
+                    _downloadFileOp.StartOperation();
+                    AddChildOperation(_downloadFileOp);
+                }
+
+                if (IsWaitForAsyncComplete)
+                    _downloadFileOp.WaitForAsyncComplete();
+
+                _downloadFileOp.UpdateOperation();
+                DownloadProgress = _downloadFileOp.DownloadProgress;
+                DownloadedBytes = _downloadFileOp.DownloadedBytes;
+                if (_downloadFileOp.IsDone == false)
+                    return;
+
+                if (_downloadFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadAssetBundle;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _downloadFileOp.Error;
+                }
             }
 
             if (_steps == ESteps.LoadAssetBundle)
             {
                 if (IsWaitForAsyncComplete)
                 {
-                    _steps = ESteps.CheckResult;
+                    if (_fileSystem.VirtualWebGLMode)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Virtual WebGL Mode only support asyn load method !";
+                        YooLogger.Error(Error);
+                    }
+                    else
+                    {
+                        _steps = ESteps.CheckResult;
+                    }
                 }
                 else
                 {

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/DownloadVirutalBundleOperation.cs

@@ -0,0 +1,156 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class DownloadVirtualBundleOperation : FSDownloadFileOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CheckExists,
+            CreateRequest,
+            CheckRequest,
+            TryAgain,
+            Done,
+        }
+
+        // 下载参数
+        protected readonly DefaultEditorFileSystem _fileSystem;
+        protected readonly DownloadFileOptions _options;
+        protected UnityVirtualBundleRequestOperation _unityDownloadFileOp;
+
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
+        private ESteps _steps = ESteps.None;
+
+
+        internal DownloadVirtualBundleOperation(DefaultEditorFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle)
+        {
+            _fileSystem = fileSystem;
+            _options = options;
+            _failedTryAgain = options.FailedTryAgain;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CheckExists;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 检测文件是否存在
+            if (_steps == ESteps.CheckExists)
+            {
+                if (_fileSystem.Exists(Bundle))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                if (_options.IsValid() == false)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Download file options is invalid !";
+                    Debug.Log(Error);
+                    return;
+                }
+
+                string url = GetRequestURL();
+                int speed = _fileSystem.VirtualDownloadSpeed;
+                _unityDownloadFileOp = new UnityVirtualBundleRequestOperation(Bundle, speed, url);
+                _unityDownloadFileOp.StartOperation();
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                if (IsWaitForAsyncComplete)
+                    _unityDownloadFileOp.WaitForAsyncComplete();
+
+                // 因为并发数量限制，下载器可能被挂起！
+                if (_unityDownloadFileOp.Status == EOperationStatus.None)
+                    return;
+
+                _unityDownloadFileOp.UpdateOperation();
+                Progress = _unityDownloadFileOp.Progress;
+                DownloadedBytes = _unityDownloadFileOp.DownloadedBytes;
+                DownloadProgress = _unityDownloadFileOp.DownloadProgress;
+                if (_unityDownloadFileOp.IsDone == false)
+                    return;
+
+                if (_unityDownloadFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _fileSystem.RecordDownloadFile(Bundle);
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    if (IsWaitForAsyncComplete == false && _failedTryAgain > 0)
+                    {
+                        _steps = ESteps.TryAgain;
+                        YooLogger.Warning($"Failed download : {_unityDownloadFileOp.URL} Try again !");
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = _unityDownloadFileOp.Error;
+                        YooLogger.Error(Error);
+                    }
+                }
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    _tryAgainTimer = 0f;
+                    _failedTryAgain--;
+                    Progress = 0f;
+                    DownloadProgress = 0f;
+                    DownloadedBytes = 0;
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取网络请求地址
+        /// </summary>
+        protected string GetRequestURL()
+        {
+            // 轮流返回请求地址
+            _requestCount++;
+            if (_requestCount % 2 == 0)
+                return _options.FallbackURL;
+            else
+                return _options.MainURL;
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/DownloadVirutalBundleOperation.cs.meta

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

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/DefaultWebRemoteFileSystem.cs

@@ -44,12 +44,12 @@ namespace YooAsset
         public bool DisableUnityWebCache { private set; get; } = false;
 
         /// <summary>
-        /// 自定义参数：跨域下载服务接口
+        /// 自定义参数：远程服务接口的实例类（支持跨域下载）
         /// </summary>
         public IRemoteServices RemoteServices { private set; get; }
 
         /// <summary>
-        ///  自定义参数：解密方法类
+        ///  自定义参数：解密服务接口的实例类
         /// </summary>
         public IWebDecryptionServices DecryptionServices { private set; get; }
 

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -58,7 +58,7 @@ namespace YooAsset
         public bool DisableUnityWebCache { private set; get; } = false;
 
         /// <summary>
-        ///  自定义参数：解密方法类
+        ///  自定义参数：解密服务接口的实例类
         /// </summary>
         public IWebDecryptionServices DecryptionServices { private set; get; }
 

Assets/YooAsset/Runtime/FileSystem/FileSystemParametersDefine.cs

@@ -15,8 +15,12 @@ namespace YooAsset
         public const string DISABLE_ONDEMAND_DOWNLOAD = "DISABLE_ONDEMAND_DOWNLOAD";
         public const string DOWNLOAD_MAX_CONCURRENCY = "DOWNLOAD_MAX_CONCURRENCY";
         public const string DOWNLOAD_MAX_REQUEST_PER_FRAME = "DOWNLOAD_MAX_REQUEST_PER_FRAME";
+        public const string DOWNLOAD_WATCH_DOG_TIME = "DOWNLOAD_WATCH_DOG_TIME";
         public const string RESUME_DOWNLOAD_MINMUM_SIZE = "RESUME_DOWNLOAD_MINMUM_SIZE";
         public const string RESUME_DOWNLOAD_RESPONSE_CODES = "RESUME_DOWNLOAD_RESPONSE_CODES";
+        public const string VIRTUAL_WEBGL_MODE = "VIRTUAL_WEBGL_MODE";
+        public const string VIRTUAL_DOWNLOAD_MODE = "VIRTUAL_DOWNLOAD_MODE";
+        public const string VIRTUAL_DOWNLOAD_SPEED = "VIRTUAL_DOWNLOAD_SPEED";
         public const string ASYNC_SIMULATE_MIN_FRAME = "ASYNC_SIMULATE_MIN_FRAME";
         public const string ASYNC_SIMULATE_MAX_FRAME = "ASYNC_SIMULATE_MAX_FRAME";
         public const string COPY_BUILDIN_PACKAGE_MANIFEST = "COPY_BUILDIN_PACKAGE_MANIFEST";

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -36,6 +36,9 @@ namespace YooAsset
         {
             get
             {
+                if (_watch == null)
+                    return false;
+
                 // NOTE : 单次调用开销约1微秒
                 return _watch.ElapsedMilliseconds - _frameTime >= MaxTimeSlice;
             }

Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs

@@ -83,6 +83,7 @@ namespace YooAsset
             {
                 if (_loadBundleOp == null)
                 {
+                    // 统计计数增加
                     _resManager.BundleLoadingCounter++;
                     _loadBundleOp = LoadBundleInfo.LoadBundleFile();
                     _loadBundleOp.StartOperation();
@@ -163,11 +164,12 @@ namespace YooAsset
         {
             IsDestroyed = true;
 
-            // Check fatal
+            // 注意：正在加载中的任务不可以销毁
+            if (_steps == ESteps.LoadBundleFile)
+                throw new Exception($"Bundle file loader is not done : {LoadBundleInfo.Bundle.BundleName}");
+
             if (RefCount > 0)
                 throw new Exception($"Bundle file loader ref is not zero : {LoadBundleInfo.Bundle.BundleName}");
-            if (IsDone == false)
-                throw new Exception($"Bundle file loader is not done : {LoadBundleInfo.Bundle.BundleName}");
 
             if (Result != null)
                 Result.UnloadBundleFile();
@@ -178,7 +180,8 @@ namespace YooAsset
         /// </summary>
         public bool CanDestroyLoader()
         {
-            if (IsDone == false)
+            // 注意：正在加载中的任务不可以销毁
+            if (_steps == ESteps.LoadBundleFile)
                 return false;
 
             if (RefCount > 0)

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

@@ -67,6 +67,16 @@ namespace YooAsset
         /// </summary>
         public bool IsDestroyed { private set; get; } = false;
 
+        /// <summary>
+        /// 加载任务是否进行中
+        /// </summary>
+        private bool IsLoading
+        {
+            get
+            {
+                return _steps == ESteps.WaitBundleLoader || _steps == ESteps.ProcessBundleResult;
+            }
+        }
 
         private ESteps _steps = ESteps.None;
         protected readonly ResourceManager _resManager;
@@ -109,6 +119,13 @@ namespace YooAsset
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            // 注意：未在加载中的任务可以挂起！
+            if (IsLoading == false)
+            {
+                if (RefCount <= 0)
+                    return;
+            }
+
             if (_steps == ESteps.StartBundleLoader)
             {
                 foreach (var bundleLoader in _bundleLoaders)
@@ -192,8 +209,9 @@ namespace YooAsset
             // 检测是否为正常销毁
             if (IsDone == false)
             {
-                Error = "User abort !";
+                _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
+                Error = "User abort !";
             }
 
             // 减少引用计数
@@ -208,8 +226,8 @@ namespace YooAsset
         /// </summary>
         public bool CanDestroyProvider()
         {
-            // 注意：在进行资源加载过程时不可以销毁
+            // 注意：正在加载中的任务不可以销毁
-            if (_steps == ESteps.ProcessBundleResult)
+            if (IsLoading)
                 return false;
 
             if (_resManager.UseWeakReferenceHandle)

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -119,86 +119,13 @@ namespace YooAsset
         /// </summary>
         public static PackageManifest DeserializeFromJson(string jsonContent)
         {
-            return JsonUtility.FromJson<PackageManifest>(jsonContent);
+            var manifest = JsonUtility.FromJson<PackageManifest>(jsonContent);
-        }
 
-        /// <summary>
+            // 初始化资源包
-        /// 反序列化（二进制文件）
+            for (int i = 0; i < manifest.BundleList.Count; i++)
-        /// </summary>
-        public static PackageManifest DeserializeFromBinary(byte[] binaryData, IManifestRestoreServices services)
-        {
-            // 创建缓存器
-            BufferReader buffer;
-            if (services != null)
             {
-                var resultBytes = services.RestoreManifest(binaryData);
+                var packageBundle = manifest.BundleList[i];
-                buffer = new BufferReader(resultBytes);
+                packageBundle.InitBundle(manifest);
-            }
-            else
-            {
-                buffer = new BufferReader(binaryData);
-            }
-
-            // 读取文件标记
-            uint fileSign = buffer.ReadUInt32();
-            if (fileSign != ManifestDefine.FileSign)
-                throw new Exception("Invalid manifest file !");
-
-            // 读取文件版本
-            string fileVersion = buffer.ReadUTF8();
-            if (fileVersion != ManifestDefine.FileVersion)
-                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}");
-
-            PackageManifest manifest = new PackageManifest();
-            {
-                // 读取文件头信息
-                manifest.FileVersion = fileVersion;
-                manifest.EnableAddressable = buffer.ReadBool();
-                manifest.SupportExtensionless = buffer.ReadBool();
-                manifest.LocationToLower = buffer.ReadBool();
-                manifest.IncludeAssetGUID = buffer.ReadBool();
-                manifest.OutputNameStyle = buffer.ReadInt32();
-                manifest.BuildBundleType = buffer.ReadInt32();
-                manifest.BuildPipeline = buffer.ReadUTF8();
-                manifest.PackageName = buffer.ReadUTF8();
-                manifest.PackageVersion = buffer.ReadUTF8();
-                manifest.PackageNote = buffer.ReadUTF8();
-
-                // 检测配置
-                if (manifest.EnableAddressable && manifest.LocationToLower)
-                    throw new Exception("Addressable not support location to lower !");
-
-                // 读取资源列表
-                int packageAssetCount = buffer.ReadInt32();
-                CreateAssetCollection(manifest, packageAssetCount);
-                for (int i = 0; i < packageAssetCount; i++)
-                {
-                    var packageAsset = new PackageAsset();
-                    packageAsset.Address = buffer.ReadUTF8();
-                    packageAsset.AssetPath = buffer.ReadUTF8();
-                    packageAsset.AssetGUID = buffer.ReadUTF8();
-                    packageAsset.AssetTags = buffer.ReadUTF8Array();
-                    packageAsset.BundleID = buffer.ReadInt32();
-                    packageAsset.DependBundleIDs = buffer.ReadInt32Array();
-                    FillAssetCollection(manifest, packageAsset);
-                }
-
-                // 读取资源包列表
-                int packageBundleCount = buffer.ReadInt32();
-                CreateBundleCollection(manifest, packageBundleCount);
-                for (int i = 0; i < packageBundleCount; i++)
-                {
-                    var packageBundle = new PackageBundle();
-                    packageBundle.BundleName = buffer.ReadUTF8();
-                    packageBundle.UnityCRC = buffer.ReadUInt32();
-                    packageBundle.FileHash = buffer.ReadUTF8();
-                    packageBundle.FileCRC = buffer.ReadUInt32();
-                    packageBundle.FileSize = buffer.ReadInt64();
-                    packageBundle.Encrypted = buffer.ReadBool();
-                    packageBundle.Tags = buffer.ReadUTF8Array();
-                    packageBundle.DependBundleIDs = buffer.ReadInt32Array();
-                    FillBundleCollection(manifest, packageBundle);
-                }
             }
 
             // 初始化资源清单
@@ -206,8 +133,20 @@ namespace YooAsset
             return manifest;
         }
 
+        /// <summary>
+        /// 反序列化（二进制文件）
+        /// </summary>
+        public static PackageManifest DeserializeFromBinary(byte[] binaryData, IManifestRestoreServices services)
+        {
+            DeserializeManifestOperation operation = new DeserializeManifestOperation(services, binaryData);
+            operation.StartOperation();
+            operation.WaitForAsyncComplete();
+            return operation.Manifest;
+        }
 
-        #region 解析资源清单辅助方法
+        /// <summary>
+        /// 初始化资源清单
+        /// </summary>
         public static void InitManifest(PackageManifest manifest)
         {
             // 填充资源包内包含的主资源列表
@@ -237,108 +176,6 @@ namespace YooAsset
             }
         }
 
-        public static void CreateAssetCollection(PackageManifest manifest, int assetCount)
-        {
-            manifest.AssetList = new List<PackageAsset>(assetCount);
-            manifest.AssetDic = new Dictionary<string, PackageAsset>(assetCount);
-
-            if (manifest.EnableAddressable)
-            {
-                manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 3);
-            }
-            else
-            {
-                if (manifest.LocationToLower)
-                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2, StringComparer.OrdinalIgnoreCase);
-                else
-                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2);
-            }
-
-            if (manifest.IncludeAssetGUID)
-                manifest.AssetPathMapping2 = new Dictionary<string, string>(assetCount);
-            else
-                manifest.AssetPathMapping2 = new Dictionary<string, string>();
-        }
-        public static void FillAssetCollection(PackageManifest manifest, PackageAsset packageAsset)
-        {
-            // 添加到列表集合
-            manifest.AssetList.Add(packageAsset);
-
-            // 注意：我们不允许原始路径存在重名
-            string assetPath = packageAsset.AssetPath;
-            if (manifest.AssetDic.ContainsKey(assetPath))
-                throw new System.Exception($"AssetPath have existed : {assetPath}");
-            else
-                manifest.AssetDic.Add(assetPath, packageAsset);
-
-            // 填充AssetPathMapping1
-            {
-                string location = packageAsset.AssetPath;
-
-                // 添加原生路径的映射
-                if (manifest.AssetPathMapping1.ContainsKey(location))
-                    throw new System.Exception($"Location have existed : {location}");
-                else
-                    manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-
-                // 添加无后缀名路径的映射
-                if (manifest.SupportExtensionless)
-                {
-                    string locationWithoutExtension = Path.ChangeExtension(location, null);
-                    if (ReferenceEquals(location, locationWithoutExtension) == false)
-                    {
-                        if (manifest.AssetPathMapping1.ContainsKey(locationWithoutExtension))
-                            YooLogger.Warning($"Location have existed : {locationWithoutExtension}");
-                        else
-                            manifest.AssetPathMapping1.Add(locationWithoutExtension, packageAsset.AssetPath);
-                    }
-                }
-            }
-
-            // 添加可寻址地址
-            if (manifest.EnableAddressable)
-            {
-                string location = packageAsset.Address;
-                if (string.IsNullOrEmpty(location) == false)
-                {
-                    if (manifest.AssetPathMapping1.ContainsKey(location))
-                        throw new System.Exception($"Location have existed : {location}");
-                    else
-                        manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-                }
-            }
-
-            // 填充AssetPathMapping2
-            if (manifest.IncludeAssetGUID)
-            {
-                if (manifest.AssetPathMapping2.ContainsKey(packageAsset.AssetGUID))
-                    throw new System.Exception($"AssetGUID have existed : {packageAsset.AssetGUID}");
-                else
-                    manifest.AssetPathMapping2.Add(packageAsset.AssetGUID, packageAsset.AssetPath);
-            }
-        }
-
-        public static void CreateBundleCollection(PackageManifest manifest, int bundleCount)
-        {
-            manifest.BundleList = new List<PackageBundle>(bundleCount);
-            manifest.BundleDic1 = new Dictionary<string, PackageBundle>(bundleCount);
-            manifest.BundleDic2 = new Dictionary<string, PackageBundle>(bundleCount);
-            manifest.BundleDic3 = new Dictionary<string, PackageBundle>(bundleCount);
-        }
-        public static void FillBundleCollection(PackageManifest manifest, PackageBundle packageBundle)
-        {
-            // 初始化资源包
-            packageBundle.InitBundle(manifest);
-
-            // 添加到列表集合
-            manifest.BundleList.Add(packageBundle);
-
-            manifest.BundleDic1.Add(packageBundle.BundleName, packageBundle);
-            manifest.BundleDic2.Add(packageBundle.FileName, packageBundle);
-            manifest.BundleDic3.Add(packageBundle.BundleGUID, packageBundle);
-        }
-        #endregion
-
         /// <summary>
         /// 获取资源文件的后缀名
         /// </summary>

Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs

@@ -117,7 +117,7 @@ namespace YooAsset
                 {
                     _packageAssetCount = _buffer.ReadInt32();
                     _progressTotalValue = _packageAssetCount;
-                    ManifestTools.CreateAssetCollection(Manifest, _packageAssetCount);
+                    CreateAssetCollection(Manifest, _packageAssetCount);
                     _steps = ESteps.DeserializeAssetList;
                 }
                 if (_steps == ESteps.DeserializeAssetList)
@@ -131,7 +131,7 @@ namespace YooAsset
                         packageAsset.AssetTags = _buffer.ReadUTF8Array();
                         packageAsset.BundleID = _buffer.ReadInt32();
                         packageAsset.DependBundleIDs = _buffer.ReadInt32Array();
-                        ManifestTools.FillAssetCollection(Manifest, packageAsset);
+                        FillAssetCollection(Manifest, packageAsset);
 
                         _packageAssetCount--;
                         Progress = 1f - _packageAssetCount / _progressTotalValue;
@@ -149,7 +149,7 @@ namespace YooAsset
                 {
                     _packageBundleCount = _buffer.ReadInt32();
                     _progressTotalValue = _packageBundleCount;
-                    ManifestTools.CreateBundleCollection(Manifest, _packageBundleCount);
+                    CreateBundleCollection(Manifest, _packageBundleCount);
                     _steps = ESteps.DeserializeBundleList;
                 }
                 if (_steps == ESteps.DeserializeBundleList)
@@ -165,7 +165,7 @@ namespace YooAsset
                         packageBundle.Encrypted = _buffer.ReadBool();
                         packageBundle.Tags = _buffer.ReadUTF8Array();
                         packageBundle.DependBundleIDs = _buffer.ReadInt32Array();
-                        ManifestTools.FillBundleCollection(Manifest, packageBundle);
+                        FillBundleCollection(Manifest, packageBundle);
 
                         _packageBundleCount--;
                         Progress = 1f - _packageBundleCount / _progressTotalValue;
@@ -194,5 +194,117 @@ namespace YooAsset
                 Error = e.Message;
             }
         }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+
+        private void CreateAssetCollection(PackageManifest manifest, int assetCount)
+        {
+            manifest.AssetList = new List<PackageAsset>(assetCount);
+            manifest.AssetDic = new Dictionary<string, PackageAsset>(assetCount);
+
+            if (manifest.EnableAddressable)
+            {
+                manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 3);
+            }
+            else
+            {
+                if (manifest.LocationToLower)
+                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2, StringComparer.OrdinalIgnoreCase);
+                else
+                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2);
+            }
+
+            if (manifest.IncludeAssetGUID)
+                manifest.AssetPathMapping2 = new Dictionary<string, string>(assetCount);
+            else
+                manifest.AssetPathMapping2 = new Dictionary<string, string>();
+        }
+        private void FillAssetCollection(PackageManifest manifest, PackageAsset packageAsset)
+        {
+            // 添加到列表集合
+            manifest.AssetList.Add(packageAsset);
+
+            // 注意：我们不允许原始路径存在重名
+            string assetPath = packageAsset.AssetPath;
+            if (manifest.AssetDic.ContainsKey(assetPath))
+                throw new System.Exception($"AssetPath have existed : {assetPath}");
+            else
+                manifest.AssetDic.Add(assetPath, packageAsset);
+
+            // 填充AssetPathMapping1
+            {
+                string location = packageAsset.AssetPath;
+
+                // 添加原生路径的映射
+                if (manifest.AssetPathMapping1.ContainsKey(location))
+                    throw new System.Exception($"Location have existed : {location}");
+                else
+                    manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
+
+                // 添加无后缀名路径的映射
+                if (manifest.SupportExtensionless)
+                {
+                    string locationWithoutExtension = Path.ChangeExtension(location, null);
+                    if (ReferenceEquals(location, locationWithoutExtension) == false)
+                    {
+                        if (manifest.AssetPathMapping1.ContainsKey(locationWithoutExtension))
+                            YooLogger.Warning($"Location have existed : {locationWithoutExtension}");
+                        else
+                            manifest.AssetPathMapping1.Add(locationWithoutExtension, packageAsset.AssetPath);
+                    }
+                }
+            }
+
+            // 填充AssetPathMapping2
+            if (manifest.IncludeAssetGUID)
+            {
+                if (manifest.AssetPathMapping2.ContainsKey(packageAsset.AssetGUID))
+                    throw new System.Exception($"AssetGUID have existed : {packageAsset.AssetGUID}");
+                else
+                    manifest.AssetPathMapping2.Add(packageAsset.AssetGUID, packageAsset.AssetPath);
+            }
+
+            // 添加可寻址地址
+            if (manifest.EnableAddressable)
+            {
+                string location = packageAsset.Address;
+                if (string.IsNullOrEmpty(location) == false)
+                {
+                    if (manifest.AssetPathMapping1.ContainsKey(location))
+                        throw new System.Exception($"Location have existed : {location}");
+                    else
+                        manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
+                }
+            }
+        }
+
+        private void CreateBundleCollection(PackageManifest manifest, int bundleCount)
+        {
+            manifest.BundleList = new List<PackageBundle>(bundleCount);
+            manifest.BundleDic1 = new Dictionary<string, PackageBundle>(bundleCount);
+            manifest.BundleDic2 = new Dictionary<string, PackageBundle>(bundleCount);
+            manifest.BundleDic3 = new Dictionary<string, PackageBundle>(bundleCount);
+        }
+        private void FillBundleCollection(PackageManifest manifest, PackageBundle packageBundle)
+        {
+            // 初始化资源包
+            packageBundle.InitBundle(manifest);
+
+            // 添加到列表集合
+            manifest.BundleList.Add(packageBundle);
+
+            manifest.BundleDic1.Add(packageBundle.BundleName, packageBundle);
+            manifest.BundleDic2.Add(packageBundle.FileName, packageBundle);
+            manifest.BundleDic3.Add(packageBundle.BundleGUID, packageBundle);
+        }
     }
 }

Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs

@@ -101,8 +101,7 @@ namespace YooAsset
         /// </summary>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -121,8 +120,7 @@ namespace YooAsset
         /// <param name="tag">资源标签</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -141,8 +139,7 @@ namespace YooAsset
         /// <param name="tags">资源标签列表</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -161,8 +158,7 @@ namespace YooAsset
         /// <param name="location">资源定位地址</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -185,8 +181,7 @@ namespace YooAsset
         /// <param name="locations">资源定位地址列表</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -966,8 +966,7 @@ namespace YooAsset
         /// </summary>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             return _playModeImpl.CreateResourceDownloaderByAll(downloadingMaxNumber, failedTryAgain);
@@ -979,8 +978,7 @@ namespace YooAsset
         /// <param name="tag">资源标签</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             return _playModeImpl.CreateResourceDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain);
@@ -992,8 +990,7 @@ namespace YooAsset
         /// <param name="tags">资源标签列表</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             return _playModeImpl.CreateResourceDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain);
@@ -1006,15 +1003,14 @@ namespace YooAsset
         /// <param name="recursiveDownload">下载资源对象所属资源包内所有资源对象依赖的资源包</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             var assetInfo = ConvertLocationToAssetInfo(location, null);
             AssetInfo[] assetInfos = new AssetInfo[] { assetInfo };
             return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain);
         }
-        public ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+        public ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain)
         {
             return CreateBundleDownloader(location, false, downloadingMaxNumber, failedTryAgain);
         }
@@ -1026,8 +1022,7 @@ namespace YooAsset
         /// <param name="recursiveDownload">下载资源对象所属资源包内所有资源对象依赖的资源包</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
@@ -1038,7 +1033,7 @@ namespace YooAsset
             }
             return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos.ToArray(), recursiveDownload, downloadingMaxNumber, failedTryAgain);
         }
-        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain)
         {
             return CreateBundleDownloader(locations, false, downloadingMaxNumber, failedTryAgain);
         }
@@ -1050,14 +1045,13 @@ namespace YooAsset
         /// <param name="recursiveDownload">下载资源对象所属资源包内所有资源对象依赖的资源包</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             AssetInfo[] assetInfos = new AssetInfo[] { assetInfo };
             return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain);
         }
-        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, int downloadingMaxNumber, int failedTryAgain)
         {
             return CreateBundleDownloader(assetInfo, false, downloadingMaxNumber, failedTryAgain);
         }
@@ -1069,13 +1063,12 @@ namespace YooAsset
         /// <param name="recursiveDownload">下载资源对象所属资源包内所有资源对象依赖的资源包</param>
         /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
         /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
-        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
             return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain);
         }
-        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+        public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain)
         {
             return CreateBundleDownloader(assetInfos, false, downloadingMaxNumber, failedTryAgain);
         }

Assets/YooAsset/Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -106,6 +106,9 @@ public static class ShaderVariantCollector
 
         if (_steps == ESteps.CollectSleeping)
         {
+            if (ShaderUtil.anythingCompiling)
+                return;
+
             if (_elapsedTime.ElapsedMilliseconds > SleepMilliseconds)
             {
                 DestroyAllSpheres();

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/TaptapFileSystem.cs

@@ -8,10 +8,20 @@ using TapTapMiniGame;
 
 public static class TaptapFileSystemCreater
 {
-    public static FileSystemParameters CreateFileSystemParameters(string packageRoot)
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices)
     {
         string fileSystemClass = $"{nameof(TaptapFileSystem)},YooAsset.MiniGame";
         var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+        return fileSystemParams;
+    }
+
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot, IRemoteServices remoteServices, IWebDecryptionServices decryptionServices)
+    {
+        string fileSystemClass = $"{nameof(TaptapFileSystem)},YooAsset.MiniGame";
+        var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
+        fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
         return fileSystemParams;
     }
 }

Assets/YooAsset/Samples~/Space Shooter/GameSetting/AssetBundleCollectorSetting.asset

@@ -35,7 +35,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackSeparately
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectPrefab
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Samples/Space Shooter/GameRes/Entity
@@ -43,7 +43,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackSeparately
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectPrefab
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Samples/Space Shooter/GameRes/Audio
@@ -101,7 +101,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackSeparately
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectScene
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Samples/Space Shooter/GameRes/SceneArt
@@ -122,7 +122,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackSeparately
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectPrefab
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Samples/Space Shooter/GameRes/UIPanelArt
@@ -146,7 +146,7 @@ MonoBehaviour:
         CollectorType: 1
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectSprite
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Samples/Space Shooter/GameRes/UISpriteAtlas

Assets/YooAsset/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.tuyoogame.yooasset",
     "displayName": "YooAsset",
-    "version": "2.3.15",
+    "version": "2.3.16",
     "unity": "2019.4",
     "description": "unity3d resources management system.",
     "author": {