Update CHANGELOG.md

重构相关代码，使用通用逻辑

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,104 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.15] - 2025-09-09
+
+**重要**：升级了资源清单版本，不兼容老版本。建议重新提审安装包。
+
+### Improvements
+
+- 重构了UniTask扩展库的目录结构和说明文档。
+- 重构了内置文件系统类的加载和拷贝逻辑，解决在一些特殊机型上遇到的偶发性拷贝失败问题。
+- 增加了生成内置清单文件的窗口工具，详情见扩展工程里CreateBuildinCatalog目录。
+- 优化了异步操作系统的繁忙检测机制。
+- (#621) 资源配置页面可以展示DependCollector和StaticCollector包含的文件列表内容。
+- (#627) 优化了资源清单部分字段类型，CRC字段从字符串类型调整为整形，可以降低清单尺寸。
+
+### Fixed
+
+- 修复了构建页面扩展类缺少指定属性报错的问题。
+- (#611)  修复了资源扫描器配置页面，修改备注信息后会丢失焦点的问题。
+- (#622)  修复了纯鸿蒙系统读取内置加密文件失败的问题。
+- (#620)  修复了LINUX系统URL地址转换失败的问题。
+- (#631)  修复了NET 4.x程序集库Math.Clamp导致的编译错误。
+
+### Added
+
+- 新增了支持支付宝小游戏的文件系统扩展类。
+
+- 新增了支持Taptap小游戏的文件系统扩展类。
+
+- 新增了资源系统初始化参数：UseWeakReferenceHandle 
+
+  目前处于预览版，可以在引擎设置页面开启宏：YOOASSET_EXPERIMENTAL
+
+  ```csharp
+  /// <summary>
+  /// 启用弱引用资源句柄
+  /// </summary>
+  public bool UseWeakReferenceHandle = false;
+  ```
+
+- 内置文件系统和缓存文件系统新增初始化参数：FILE_VERIFY_MAX_CONCURRENCY 
+
+  ```csharp
+  /// <summary>
+  /// 自定义参数：初始化的时候缓存文件校验最大并发数
+  /// </summary>
+  public int FileVerifyMaxConcurrency { private set; get; }
+  ```
+
+- (#623)  内置构建管线新增构建参数：StripUnityVersion 
+
+  ```csharp
+  /// <summary>
+  /// 从文件头里剥离Unity版本信息
+  /// </summary>
+  public bool StripUnityVersion = false;
+  ```
+
+- 可编程构建管线新增构建参数：TrackSpriteAtlasDependencies
+
+  ```csharp
+  /// <summary>
+  /// 自动建立资源对象对图集的依赖关系
+  /// </summary>
+  public bool TrackSpriteAtlasDependencies = false;
+  ```
+
+- (#617) 新增资源收集配置参数：SupportExtensionless
+
+  在不需要模糊加载模式的前提下，开启此选项，可以降低运行时内存大小。
+
+  ```csharp
+  public class CollectCommand
+  {
+      /// <summary>
+      /// 支持无后缀名的资源定位地址
+      /// </summary>
+      public bool SupportExtensionless { set; get; }  
+  }
+  ```
+
+- (#625) 异步操作系统类新增监听方法。
+
+  ```csharp
+  class OperationSystem
+  {
+      /// <summary>
+      /// 监听任务开始
+      /// </summary>
+      public static void RegisterStartCallback(Action<string, AsyncOperationBase> callback);
+          
+      /// <summary>
+      /// 监听任务结束
+      /// </summary>
+      public static void RegisterFinishCallback(Action<string, AsyncOperationBase> callback);
+  }
+  ```
+
+  
+
 ## [2.3.14] - 2025-07-23
 
 **重要**：**所有下载相关的超时参数（timeout）已更新判定逻辑**

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -13,6 +13,11 @@ namespace YooAsset.Editor
         /// </summary>
         private readonly Dictionary<string, BuildBundleInfo> _bundleInfoDic = new Dictionary<string, BuildBundleInfo>(10000);
 
+        /// <summary>
+        /// 图集资源集合
+        /// </summary>
+        public readonly List<BuildAssetInfo> SpriteAtlasAssetList = new List<BuildAssetInfo>(10000);
+
         /// <summary>
         /// 未被依赖的资源列表
         /// </summary>
@@ -60,6 +65,12 @@ namespace YooAsset.Editor
                 newBundleInfo.PackAsset(assetInfo);
                 _bundleInfoDic.Add(bundleName, newBundleInfo);
             }
+
+            // 统计所有的精灵图集
+            if (assetInfo.AssetInfo.IsSpriteAtlas())
+            {
+                SpriteAtlasAssetList.Add(assetInfo);
+            }
         }
 
         /// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
 
 namespace YooAsset.Editor
 {
@@ -301,18 +302,40 @@ namespace YooAsset.Editor
         #region YOOASSET_LEGACY_DEPENDENCY
         private void ProcessBuiltinBundleDependency(BuildContext context, PackageManifest manifest)
         {
+            // 注意：初始化资源清单建立引用关系
+            ManifestTools.InitManifest(manifest);
+
             // 注意：如果是可编程构建管线，需要补充内置资源包
             // 注意：该步骤依赖前面的操作！
             var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
+
             if (buildResultContext != null)
             {
-                // 注意：初始化资源清单建立引用关系
+                ProcessBuiltinBundleReference(manifest, buildResultContext.BuiltinShadersBundleName);
-                ManifestTools.InitManifest(manifest);
+                ProcessBuiltinBundleReference(manifest, buildResultContext.MonoScriptsBundleName);
-                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
+
-                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
+                var buildParametersContext = context.TryGetContextObject<BuildParametersContext>();
+                var buildParameters = buildParametersContext.Parameters;
+                if (buildParameters is ScriptableBuildParameters scriptableBuildParameters)
+                {
+                    if (scriptableBuildParameters.TrackSpriteAtlasDependencies)
+                    {
+                        // 注意：检测是否开启图集模式
+                        // 说明：需要记录主资源对象对图集的依赖关系！
+                        if (EditorSettings.spritePackerMode != SpritePackerMode.Disabled)
+                        {
+                            var buildMapContext = context.GetContextObject<BuildMapContext>();
+                            foreach (var spriteAtlasAsset in buildMapContext.SpriteAtlasAssetList)
+                            {
+                                string spriteAtlasBundleName = spriteAtlasAsset.BundleName;
+                                ProcessBuiltinBundleReference(manifest, spriteAtlasBundleName);
+                            }
+                        }
+                    }
+                }
             }
         }
-        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
+        private void ProcessBuiltinBundleReference(PackageManifest manifest, string builtinBundleName)
         {
             if (string.IsNullOrEmpty(builtinBundleName))
                 return;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs

@@ -29,6 +29,11 @@ namespace YooAsset.Editor
         /// </summary>
         public bool IgnoreTypeTreeChanges = true;
 
+        /// <summary>
+        /// 自动建立资源对象对图集的依赖关系
+        /// </summary>
+        public bool TrackSpriteAtlasDependencies = false;
+
 
         /// <summary>
         /// 生成代码防裁剪配置

Assets/YooAsset/Editor/Common/AssetInfo.cs

@@ -62,6 +62,17 @@ namespace YooAsset.Editor
                 return false;
         }
 
+        /// <summary>
+        /// 是否为图集资源
+        /// </summary>
+        public bool IsSpriteAtlas()
+        {
+            if (AssetType == typeof(UnityEngine.U2D.SpriteAtlas))
+                return true;
+            else
+                return false;
+        }
+
         public int CompareTo(AssetInfo other)
         {
             return this.AssetPath.CompareTo(other.AssetPath);

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

@@ -172,7 +172,7 @@ namespace YooAsset
             else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
             {
                 int convertValue = Convert.ToInt32(value);
-                FileVerifyMaxConcurrency = Math.Clamp(convertValue, 1, int.MaxValue);
+                FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {

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

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEngine;
 
 namespace YooAsset
 {
@@ -231,7 +232,7 @@ namespace YooAsset
             else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
             {
                 int convertValue = Convert.ToInt32(value);
-                FileVerifyMaxConcurrency = Math.Clamp(convertValue, 1, int.MaxValue);
+                FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
@@ -244,12 +245,12 @@ namespace YooAsset
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
             {
                 int convertValue = Convert.ToInt32(value);
-                DownloadMaxConcurrency = Math.Clamp(convertValue, 1, int.MaxValue);
+                DownloadMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
             }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_REQUEST_PER_FRAME)
             {
                 int convertValue = Convert.ToInt32(value);
-                DownloadMaxRequestPerFrame = Math.Clamp(convertValue, 1, int.MaxValue);
+                DownloadMaxRequestPerFrame = Mathf.Clamp(convertValue, 1, int.MaxValue);
             }
             else if (name == FileSystemParametersDefine.RESUME_DOWNLOAD_MINMUM_SIZE)
             {

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

@@ -14,8 +14,8 @@ namespace YooAsset
         private readonly DefaultWebRemoteFileSystem _fileSystem;
         private readonly string _packageVersion;
         private readonly int _timeout;
-        private RequestWebRemotePackageHashOperation _requestWebPackageHashOp;
+        private RequestWebPackageHashOperation _requestWebPackageHashOp;
-        private LoadWebRemotePackageManifestOperation _loadWebPackageManifestOp;
+        private LoadWebPackageManifestOperation _loadWebPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -38,7 +38,7 @@ namespace YooAsset
             {
                 if (_requestWebPackageHashOp == null)
                 {
-                    _requestWebPackageHashOp = new RequestWebRemotePackageHashOperation(_fileSystem, _packageVersion, _timeout);
+                    _requestWebPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
                     _requestWebPackageHashOp.StartOperation();
                     AddChildOperation(_requestWebPackageHashOp);
                 }
@@ -64,7 +64,10 @@ namespace YooAsset
                 if (_loadWebPackageManifestOp == null)
                 {
                     string packageHash = _requestWebPackageHashOp.PackageHash;
-                    _loadWebPackageManifestOp = new LoadWebRemotePackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+                    string packageName = _fileSystem.PackageName;
+                    var manifestServices = _fileSystem.ManifestServices;
+                    var remoteServices = _fileSystem.RemoteServices;
+                    _loadWebPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
                     _loadWebPackageManifestOp.StartOperation();
                     AddChildOperation(_loadWebPackageManifestOp);
                 }

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

@@ -13,7 +13,7 @@ namespace YooAsset
         private readonly DefaultWebRemoteFileSystem _fileSystem;
         private readonly bool _appendTimeTicks;
         private readonly int _timeout;
-        private RequestWebRemotePackageVersionOperation _requestWebPackageVersionOp;
+        private RequestWebPackageVersionOperation _requestWebPackageVersionOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -36,7 +36,7 @@ namespace YooAsset
             {
                 if (_requestWebPackageVersionOp == null)
                 {
-                    _requestWebPackageVersionOp = new RequestWebRemotePackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+                    _requestWebPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
                     _requestWebPackageVersionOp.StartOperation();
                     AddChildOperation(_requestWebPackageVersionOp);
                 }

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs

@@ -1,131 +0,0 @@
-
-namespace YooAsset
-{
-    internal class LoadWebRemotePackageManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            RequestFileData,
-            VerifyFileData,
-            LoadManifest,
-            Done,
-        }
-
-        private readonly DefaultWebRemoteFileSystem _fileSystem;
-        private readonly string _packageVersion;
-        private readonly string _packageHash;
-        private readonly int _timeout;
-        private UnityWebDataRequestOperation _webDataRequestOp;
-        private DeserializeManifestOperation _deserializer;
-        private int _requestCount = 0;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 包裹清单
-        /// </summary>
-        public PackageManifest Manifest { private set; get; }
-
-
-        internal LoadWebRemotePackageManifestOperation(DefaultWebRemoteFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
-        {
-            _fileSystem = fileSystem;
-            _packageVersion = packageVersion;
-            _packageHash = packageHash;
-            _timeout = timeout;
-        }
-        internal override void InternalStart()
-        {
-            _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadWebRemotePackageManifestOperation));
-            _steps = ESteps.RequestFileData;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.RequestFileData)
-            {
-                if (_webDataRequestOp == null)
-                {
-                    string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
-                    string url = GetWebRequestURL(fileName);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
-                    _webDataRequestOp.StartOperation();
-                    AddChildOperation(_webDataRequestOp);
-                }
-
-                _webDataRequestOp.UpdateOperation();
-                if (_webDataRequestOp.IsDone == false)
-                    return;
-
-                if (_webDataRequestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.VerifyFileData;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _webDataRequestOp.Error;
-                    WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadWebRemotePackageManifestOperation));
-                }
-            }
-
-            if (_steps == ESteps.VerifyFileData)
-            {
-                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
-                {
-                    _steps = ESteps.LoadManifest;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Failed to verify web remote package manifest file!";
-                }
-            }
-
-            if (_steps == ESteps.LoadManifest)
-            {
-                if (_deserializer == null)
-                {
-                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
-                    _deserializer.StartOperation();
-                    AddChildOperation(_deserializer);
-                }
-
-                _deserializer.UpdateOperation();
-                Progress = _deserializer.Progress;
-                if (_deserializer.IsDone == false)
-                    return;
-
-                if (_deserializer.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.Done;
-                    Manifest = _deserializer.Manifest;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _deserializer.Error;
-                }
-            }
-        }
-        internal override string InternalGetDesc()
-        {
-            return $"PackageVersion : {_packageVersion} PackageHash : {_packageHash}";
-        }
-
-        private string GetWebRequestURL(string fileName)
-        {
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-            else
-                return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageHashOperation.cs

@@ -1,92 +0,0 @@
-
-namespace YooAsset
-{
-    internal class RequestWebRemotePackageHashOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            RequestPackageHash,
-            Done,
-        }
-
-        private readonly DefaultWebRemoteFileSystem _fileSystem;
-        private readonly string _packageVersion;
-        private readonly int _timeout;
-        private UnityWebTextRequestOperation _webTextRequestOp;
-        private int _requestCount = 0;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 包裹哈希值
-        /// </summary>
-        public string PackageHash { private set; get; }
-
-
-        public RequestWebRemotePackageHashOperation(DefaultWebRemoteFileSystem fileSystem, string packageVersion, int timeout)
-        {
-            _fileSystem = fileSystem;
-            _packageVersion = packageVersion;
-            _timeout = timeout;
-        }
-        internal override void InternalStart()
-        {
-            _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWebRemotePackageHashOperation));
-            _steps = ESteps.RequestPackageHash;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.RequestPackageHash)
-            {
-                if (_webTextRequestOp == null)
-                {
-                    string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
-                    string url = GetWebRequestURL(fileName);
-                    _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                    _webTextRequestOp.StartOperation();
-                    AddChildOperation(_webTextRequestOp);
-                }
-
-                _webTextRequestOp.UpdateOperation();
-                Progress = _webTextRequestOp.Progress;
-                if (_webTextRequestOp.IsDone == false)
-                    return;
-
-                if (_webTextRequestOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageHash = _webTextRequestOp.Result;
-                    if (string.IsNullOrEmpty(PackageHash))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Web remote package hash file content is empty !";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _webTextRequestOp.Error;
-                    WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWebRemotePackageHashOperation));
-                }
-            }
-        }
-
-        private string GetWebRequestURL(string fileName)
-        {
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-            else
-                return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/RequestWebRemotePackageVersionOperation.cs

@@ -1,100 +0,0 @@
-
-namespace YooAsset
-{
-    internal class RequestWebRemotePackageVersionOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            RequestPackageVersion,
-            Done,
-        }
-
-        private readonly DefaultWebRemoteFileSystem _fileSystem;
-        private readonly bool _appendTimeTicks;
-        private readonly int _timeout;
-        private UnityWebTextRequestOperation _webTextRequestOp;
-        private int _requestCount = 0;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 包裹版本
-        /// </summary>
-        public string PackageVersion { private set; get; }
-
-
-        internal RequestWebRemotePackageVersionOperation(DefaultWebRemoteFileSystem fileSystem, bool appendTimeTicks, int timeout)
-        {
-            _fileSystem = fileSystem;
-            _appendTimeTicks = appendTimeTicks;
-            _timeout = timeout;
-        }
-        internal override void InternalStart()
-        {
-            _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWebRemotePackageVersionOperation));
-            _steps = ESteps.RequestPackageVersion;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.RequestPackageVersion)
-            {
-                if (_webTextRequestOp == null)
-                {
-                    string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
-                    string url = GetWebRequestURL(fileName);
-                    _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                    _webTextRequestOp.StartOperation();
-                    AddChildOperation(_webTextRequestOp);
-                }
-
-                _webTextRequestOp.UpdateOperation();
-                Progress = _webTextRequestOp.Progress;
-                if (_webTextRequestOp.IsDone == false)
-                    return;
-
-                if (_webTextRequestOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageVersion = _webTextRequestOp.Result;
-                    if (string.IsNullOrEmpty(PackageVersion))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Web remote package version file content is empty !";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _webTextRequestOp.Error;
-                    WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWebRemotePackageVersionOperation));
-                }
-            }
-        }
-
-        private string GetWebRequestURL(string fileName)
-        {
-            string url;
-
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-            else
-                url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-
-            // 在URL末尾添加时间戳
-            if (_appendTimeTicks)
-                return $"{url}?{System.DateTime.UtcNow.Ticks}";
-            else
-                return url;
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/WebGame.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97923f5987c469a4898718033af09e99
+guid: 1ca8ffceab2965e4c8892f62efa86e90
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation.meta

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

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/LoadWebPackageManifestOperation.cs

@@ -1,7 +1,6 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
+using YooAsset;
-using YooAsset;
 
-internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
+internal class LoadWebPackageManifestOperation : AsyncOperationBase
 {
     private enum ESteps
     {
@@ -12,7 +11,9 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
         Done,
     }
 
-    private readonly TiktokFileSystem _fileSystem;
+    private readonly IManifestRestoreServices _manifestServices;
+    private readonly IRemoteServices _remoteServices;
+    private readonly string _packageName;
     private readonly string _packageVersion;
     private readonly string _packageHash;
     private readonly int _timeout;
@@ -27,16 +28,19 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
     public PackageManifest Manifest { private set; get; }
 
 
-    internal LoadTiktokPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
+    internal LoadWebPackageManifestOperation(IManifestRestoreServices manifestServices, IRemoteServices remoteServices,
+        string packageName, string packageVersion, string packageHash, int timeout)
     {
-        _fileSystem = fileSystem;
+        _manifestServices = manifestServices;
+        _remoteServices = remoteServices;
+        _packageName = packageName;
         _packageVersion = packageVersion;
         _packageHash = packageHash;
         _timeout = timeout;
     }
     internal override void InternalStart()
     {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation));
+        _requestCount = WebRequestCounter.GetRequestFailedCount(_packageName, nameof(LoadWebPackageManifestOperation));
         _steps = ESteps.RequestFileData;
     }
     internal override void InternalUpdate()
@@ -48,7 +52,7 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
         {
             if (_webDataRequestOp == null)
             {
-                string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
+                string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
                 string url = GetRequestURL(fileName);
                 _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
                 _webDataRequestOp.StartOperation();
@@ -69,14 +73,13 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
                 Error = _webDataRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation));
+                WebRequestCounter.RecordRequestFailed(_packageName, nameof(LoadWebPackageManifestOperation));
             }
         }
 
         if (_steps == ESteps.VerifyFileData)
         {
-            string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
+            if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
-            if (fileHash == _packageHash)
             {
                 _steps = ESteps.LoadManifest;
             }
@@ -84,7 +87,7 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
             {
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
-                Error = "Failed to verify package manifest file!";
+                Error = "Failed to verify web package manifest file!";
             }
         }
 
@@ -92,7 +95,7 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
         {
             if (_deserializer == null)
             {
-                _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
+                _deserializer = new DeserializeManifestOperation(_manifestServices, _webDataRequestOp.Result);
                 _deserializer.StartOperation();
                 AddChildOperation(_deserializer);
             }
@@ -116,14 +119,17 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
             }
         }
     }
+    internal override string InternalGetDesc()
+    {
+        return $"PackageVersion : {_packageVersion} PackageHash : {_packageHash}";
+    }
 
     private string GetRequestURL(string fileName)
     {
         // 轮流返回请求地址
         if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
+            return _remoteServices.GetRemoteMainURL(fileName);
         else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
+            return _remoteServices.GetRemoteFallbackURL(fileName);
     }
 }
-#endif

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/LoadWebPackageManifestOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9a38597f546a46a429b24abd595c76e4
+guid: eb2ed9a86dbe88c42a3715b90df0e266
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/RequestWebPackageHashOperation.cs

@@ -1,7 +1,6 @@
-#if UNITY_WEBGL && UNITY_ALIMINIGAME
+using YooAsset;
-using YooAsset;
 
-internal class RequestAlipayPackageHashOperation : AsyncOperationBase
+internal class RequestWebPackageHashOperation : AsyncOperationBase
 {
     private enum ESteps
     {
@@ -10,7 +9,8 @@ internal class RequestAlipayPackageHashOperation : AsyncOperationBase
         Done,
     }
 
-    private readonly AlipayFileSystem _fileSystem;
+    private readonly IRemoteServices _remoteServices;
+    private readonly string _packageName;
     private readonly string _packageVersion;
     private readonly int _timeout;
     private UnityWebTextRequestOperation _webTextRequestOp;
@@ -23,15 +23,16 @@ internal class RequestAlipayPackageHashOperation : AsyncOperationBase
     public string PackageHash { private set; get; }
 
 
-    public RequestAlipayPackageHashOperation(AlipayFileSystem fileSystem, string packageVersion, int timeout)
+    public RequestWebPackageHashOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
     {
-        _fileSystem = fileSystem;
+        _remoteServices = remoteServices;
+        _packageName = packageName;
         _packageVersion = packageVersion;
         _timeout = timeout;
     }
     internal override void InternalStart()
     {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestAlipayPackageHashOperation));
+        _requestCount = WebRequestCounter.GetRequestFailedCount(_packageName, nameof(RequestWebPackageHashOperation));
         _steps = ESteps.RequestPackageHash;
     }
     internal override void InternalUpdate()
@@ -43,7 +44,7 @@ internal class RequestAlipayPackageHashOperation : AsyncOperationBase
         {
             if (_webTextRequestOp == null)
             {
-                string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
+                string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
                 string url = GetRequestURL(fileName);
                 _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
                 _webTextRequestOp.StartOperation();
@@ -75,7 +76,7 @@ internal class RequestAlipayPackageHashOperation : AsyncOperationBase
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
                 Error = _webTextRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestAlipayPackageHashOperation));
+                WebRequestCounter.RecordRequestFailed(_packageName, nameof(RequestWebPackageHashOperation));
             }
         }
     }
@@ -84,9 +85,8 @@ internal class RequestAlipayPackageHashOperation : AsyncOperationBase
     {
         // 轮流返回请求地址
         if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
+            return _remoteServices.GetRemoteMainURL(fileName);
         else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
+            return _remoteServices.GetRemoteFallbackURL(fileName);
     }
 }
-#endif

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/RequestWebPackageHashOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8ac57bde14f2e1a4e9323751a7157ed7
+guid: 9c7603967834be04e9307b6d4eec2666
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/RequestWebPackageVersionOperation.cs

@@ -1,7 +1,6 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
+using YooAsset;
-using YooAsset;
 
-internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
+internal class RequestWebPackageVersionOperation : AsyncOperationBase
 {
     private enum ESteps
     {
@@ -10,7 +9,8 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
         Done,
     }
 
-    private readonly TiktokFileSystem _fileSystem;
+    private readonly IRemoteServices _remoteServices;
+    private readonly string _packageName;
     private readonly bool _appendTimeTicks;
     private readonly int _timeout;
     private UnityWebTextRequestOperation _webTextRequestOp;
@@ -23,15 +23,16 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
     public string PackageVersion { private set; get; }
 
 
-    public RequestTiktokPackageVersionOperation(TiktokFileSystem fileSystem, bool appendTimeTicks, int timeout)
+    public RequestWebPackageVersionOperation(IRemoteServices remoteServices, string packageName, bool appendTimeTicks, int timeout)
     {
-        _fileSystem = fileSystem;
+        _remoteServices = remoteServices;
+        _packageName = packageName;
         _appendTimeTicks = appendTimeTicks;
         _timeout = timeout;
     }
     internal override void InternalStart()
     {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation));
+        _requestCount = WebRequestCounter.GetRequestFailedCount(_packageName, nameof(RequestWebPackageVersionOperation));
         _steps = ESteps.RequestPackageVersion;
     }
     internal override void InternalUpdate()
@@ -43,7 +44,7 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
         {
             if (_webTextRequestOp == null)
             {
-                string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
+                string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
                 string url = GetRequestURL(fileName);
                 _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
                 _webTextRequestOp.StartOperation();
@@ -75,7 +76,7 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
                 Error = _webTextRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation));
+                WebRequestCounter.RecordRequestFailed(_packageName, nameof(RequestWebPackageVersionOperation));
             }
         }
     }
@@ -86,9 +87,9 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
 
         // 轮流返回请求地址
         if (_requestCount % 2 == 0)
-            url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
+            url = _remoteServices.GetRemoteMainURL(fileName);
         else
-            url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
+            url = _remoteServices.GetRemoteFallbackURL(fileName);
 
         // 在URL末尾添加时间戳
         if (_appendTimeTicks)
@@ -97,4 +98,3 @@ internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
             return url;
     }
 }
-#endif

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/RequestWebPackageVersionOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c802e6ad51754e144bb4e08942da9592
+guid: ae045c2050b3e8a4d91fb0585bdfb2c0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -47,6 +47,15 @@ namespace YooAsset
         /// WebGL平台强制同步加载资源对象
         /// </summary>
         public bool WebGLForceSyncLoadAsset = false;
+
+#if YOOASSET_EXPERIMENTAL
+        /// <summary>
+        /// 启用弱引用资源句柄
+        /// </summary>
+        public bool UseWeakReferenceHandle = false;
+#else
+        internal bool UseWeakReferenceHandle = false;
+#endif
     }
 
     /// <summary>

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

@@ -17,7 +17,7 @@ namespace YooAsset
                 AddChildOperation(_loadAllAssetsOp);
 
 #if UNITY_WEBGL
-                if (_resManager.WebGLForceSyncLoadAsset())
+                if (_resManager.WebGLForceSyncLoadAsset)
                     _loadAllAssetsOp.WaitForAsyncComplete();
 #endif
             }

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

@@ -17,7 +17,7 @@ namespace YooAsset
                 AddChildOperation(_loadAssetOp);
 
 #if UNITY_WEBGL
-                if (_resManager.WebGLForceSyncLoadAsset())
+                if (_resManager.WebGLForceSyncLoadAsset)
                     _loadAssetOp.WaitForAsyncComplete();
 #endif
             }

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System;
 
 namespace YooAsset
 {
@@ -72,6 +73,7 @@ namespace YooAsset
         private readonly LoadBundleFileOperation _mainBundleLoader;
         private readonly List<LoadBundleFileOperation> _bundleLoaders = new List<LoadBundleFileOperation>(10);
         private readonly HashSet<HandleBase> _handles = new HashSet<HandleBase>();
+        private readonly LinkedList<WeakReference<HandleBase>> _weakReferences = new LinkedList<WeakReference<HandleBase>>();
 
         public ProviderOperation(ResourceManager manager, string providerGUID, AssetInfo assetInfo)
         {
@@ -210,6 +212,11 @@ namespace YooAsset
             if (_steps == ESteps.ProcessBundleResult)
                 return false;
 
+            if (_resManager.UseWeakReferenceHandle)
+            {
+                TryCleanupWeakReference();
+            }
+
             return RefCount <= 0;
         }
 
@@ -222,7 +229,15 @@ namespace YooAsset
             RefCount++;
 
             HandleBase handle = HandleFactory.CreateHandle(this, typeof(T));
-            _handles.Add(handle);
+            if (_resManager.UseWeakReferenceHandle)
+            {
+                var weakRef = new WeakReference<HandleBase>(handle);
+                _weakReferences.AddLast(weakRef);
+            }
+            else
+            {
+                _handles.Add(handle);
+            }
             return handle as T;
         }
 
@@ -234,8 +249,16 @@ namespace YooAsset
             if (RefCount <= 0)
                 throw new System.Exception("Should never get here !");
 
-            if (_handles.Remove(handle) == false)
+            if (_resManager.UseWeakReferenceHandle)
-                throw new System.Exception("Should never get here !");
+            {
+                if (RemoveWeakReference(handle) == false)
+                    throw new System.Exception("Should never get here !");
+            }
+            else
+            {
+                if (_handles.Remove(handle) == false)
+                    throw new System.Exception("Should never get here !");
+            }
 
             // 引用计数减少
             RefCount--;
@@ -246,10 +269,24 @@ namespace YooAsset
         /// </summary>
         public void ReleaseAllHandles()
         {
-            List<HandleBase> tempers = _handles.ToList();
+            if (_resManager.UseWeakReferenceHandle)
-            foreach (var handle in tempers)
             {
-                handle.Release();
+                List<WeakReference<HandleBase>> tempers = _weakReferences.ToList();
+                foreach (var weakRef in tempers)
+                {
+                    if (weakRef.TryGetTarget(out HandleBase target))
+                    {
+                        target.Release();
+                    }
+                }
+            }
+            else
+            {
+                List<HandleBase> tempers = _handles.ToList();
+                foreach (var handle in tempers)
+                {
+                    handle.Release();
+                }
             }
         }
 
@@ -264,12 +301,29 @@ namespace YooAsset
 
             // 注意：创建临时列表是为了防止外部逻辑在回调函数内创建或者释放资源句柄。
             // 注意：回调方法如果发生异常，会阻断列表里的后续回调方法！
-            List<HandleBase> tempers = _handles.ToList();
+            if (_resManager.UseWeakReferenceHandle)
-            foreach (var hande in tempers)
             {
-                if (hande.IsValid)
+                List<WeakReference<HandleBase>> tempers = _weakReferences.ToList();
+                foreach (var weakRef in tempers)
                 {
-                    hande.InvokeCallback();
+                    if (weakRef.TryGetTarget(out HandleBase target))
+                    {
+                        if (target.IsValid)
+                        {
+                            target.InvokeCallback();
+                        }
+                    }
+                }
+            }
+            else
+            {
+                List<HandleBase> tempers = _handles.ToList();
+                foreach (var handle in tempers)
+                {
+                    if (handle.IsValid)
+                    {
+                        handle.InvokeCallback();
+                    }
                 }
             }
         }
@@ -294,6 +348,50 @@ namespace YooAsset
             return status;
         }
 
+        /// <summary>
+        /// 移除指定句柄的弱引用对象
+        /// </summary>
+        private bool RemoveWeakReference(HandleBase handle)
+        {
+            bool removed = false;
+            var currentNode = _weakReferences.First;
+            while (currentNode != null)
+            {
+                var nextNode = currentNode.Next;
+                if (currentNode.Value.TryGetTarget(out HandleBase target))
+                {
+                    if (ReferenceEquals(target, handle))
+                    {
+                        _weakReferences.Remove(currentNode);
+                        removed = true;
+                        break;
+                    }
+                }
+                currentNode = nextNode;
+            }
+            return removed;
+        }
+
+        /// <summary>
+        /// 清理所有失效的弱引用
+        /// </summary>
+        private void TryCleanupWeakReference()
+        {
+            var currentNode = _weakReferences.First;
+            while (currentNode != null)
+            {
+                var nextNode = currentNode.Next;
+                if (currentNode.Value.TryGetTarget(out HandleBase target) == false)
+                {
+                    _weakReferences.Remove(currentNode);
+
+                    // 引用计数减少
+                    RefCount--;
+                }
+                currentNode = nextNode;
+            }
+        }
+
         #region 调试信息
         /// <summary>
         /// 出生的场景

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

@@ -17,7 +17,7 @@ namespace YooAsset
                 AddChildOperation(_loadSubAssetsOp);
 
 #if UNITY_WEBGL
-                if (_resManager.WebGLForceSyncLoadAsset())
+                if (_resManager.WebGLForceSyncLoadAsset)
                     _loadSubAssetsOp.WaitForAsyncComplete();
 #endif
             }

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

@@ -15,7 +15,10 @@ namespace YooAsset
         private long _sceneCreateIndex = 0;
         private IBundleQuery _bundleQuery;
         private int _bundleLoadingMaxConcurrency;
-        private bool _webGLForceSyncLoadAsset;
+
+        // 开发者配置选项
+        public bool WebGLForceSyncLoadAsset { private set; get; }
+        public bool UseWeakReferenceHandle { private set; get; }
 
         /// <summary>
         /// 所属包裹
@@ -44,7 +47,8 @@ namespace YooAsset
         public void Initialize(InitializeParameters parameters, IBundleQuery bundleServices)
         {
             _bundleLoadingMaxConcurrency = parameters.BundleLoadingMaxConcurrency;
-            _webGLForceSyncLoadAsset = parameters.WebGLForceSyncLoadAsset;
+            WebGLForceSyncLoadAsset = parameters.WebGLForceSyncLoadAsset;
+            UseWeakReferenceHandle = parameters.UseWeakReferenceHandle;
             _bundleQuery = bundleServices;
             SceneManager.sceneUnloaded += OnSceneUnloaded;
         }
@@ -331,10 +335,6 @@ namespace YooAsset
         {
             return BundleLoadingCounter >= _bundleLoadingMaxConcurrency;
         }
-        internal bool WebGLForceSyncLoadAsset()
-        {
-            return _webGLForceSyncLoadAsset;
-        }
 
         private LoadBundleFileOperation CreateBundleFileLoaderInternal(BundleInfo bundleInfo)
         {

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

@@ -182,10 +182,10 @@ internal class AlipayFileSystem : IFileSystem
 
         if (string.IsNullOrEmpty(_aliCacheRoot))
         {
-            throw new System.Exception("请配置支付宝小游戏的缓存根目录！");
+            throw new System.Exception("请配置小游戏的缓存根目录！");
         }
 
-        // 注意：CDN服务未启用的情况下，使用支付宝WEB服务器
+        // 注意：CDN服务未启用的情况下，使用WEB服务器
         if (RemoteServices == null)
         {
             string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);

Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSLoadPackageManifestOperation.cs

@@ -14,8 +14,8 @@ internal class APFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
     private readonly AlipayFileSystem _fileSystem;
     private readonly string _packageVersion;
     private readonly int _timeout;
-    private RequestAlipayPackageHashOperation _requestPackageHashOp;
+    private RequestWebPackageHashOperation _requestPackageHashOp;
-    private LoadAlipayPackageManifestOperation _loadPackageManifestOp;
+    private LoadWebPackageManifestOperation _loadPackageManifestOp;
     private ESteps _steps = ESteps.None;
 
 
@@ -38,7 +38,7 @@ internal class APFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
         {
             if (_requestPackageHashOp == null)
             {
-                _requestPackageHashOp = new RequestAlipayPackageHashOperation(_fileSystem, _packageVersion, _timeout);
+                _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
                 _requestPackageHashOp.StartOperation();
                 AddChildOperation(_requestPackageHashOp);
             }
@@ -64,7 +64,10 @@ internal class APFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
             if (_loadPackageManifestOp == null)
             {
                 string packageHash = _requestPackageHashOp.PackageHash;
-                _loadPackageManifestOp = new LoadAlipayPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+                string packageName = _fileSystem.PackageName;
+                var manifestServices = _fileSystem.ManifestServices;
+                var remoteServices = _fileSystem.RemoteServices;
+                _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
                 _loadPackageManifestOp.StartOperation();
                 AddChildOperation(_loadPackageManifestOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSRequestPackageVersionOperation.cs

@@ -13,7 +13,7 @@ internal class APFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
     private readonly AlipayFileSystem _fileSystem;
     private readonly bool _appendTimeTicks;
     private readonly int _timeout;
-    private RequestAlipayPackageVersionOperation _requestWebPackageVersionOp;
+    private RequestWebPackageVersionOperation _requestWebPackageVersionOp;
     private ESteps _steps = ESteps.None;
 
 
@@ -36,7 +36,7 @@ internal class APFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
         {
             if (_requestWebPackageVersionOp == null)
             {
-                _requestWebPackageVersionOp = new RequestAlipayPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+                _requestWebPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
                 _requestWebPackageVersionOp.StartOperation();
                 AddChildOperation(_requestWebPackageVersionOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs

@@ -1,129 +0,0 @@
-#if UNITY_WEBGL && UNITY_ALIMINIGAME
-using YooAsset;
-
-internal class LoadAlipayPackageManifestOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RequestFileData,
-        VerifyFileData,
-        LoadManifest,
-        Done,
-    }
-
-    private readonly AlipayFileSystem _fileSystem;
-    private readonly string _packageVersion;
-    private readonly string _packageHash;
-    private readonly int _timeout;
-    private UnityWebDataRequestOperation _webDataRequestOp;
-    private DeserializeManifestOperation _deserializer;
-    private int _requestCount = 0;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 包裹清单
-    /// </summary>
-    public PackageManifest Manifest { private set; get; }
-
-
-    internal LoadAlipayPackageManifestOperation(AlipayFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
-    {
-        _fileSystem = fileSystem;
-        _packageVersion = packageVersion;
-        _packageHash = packageHash;
-        _timeout = timeout;
-    }
-    internal override void InternalStart()
-    {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadAlipayPackageManifestOperation));
-        _steps = ESteps.RequestFileData;
-    }
-    internal override void InternalUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RequestFileData)
-        {
-            if (_webDataRequestOp == null)
-            {
-                string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
-                string url = GetRequestURL(fileName);
-                _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
-                _webDataRequestOp.StartOperation();
-                AddChildOperation(_webDataRequestOp);
-            }
-
-            _webDataRequestOp.UpdateOperation();
-            Progress = _webDataRequestOp.Progress;
-            if (_webDataRequestOp.IsDone == false)
-                return;
-
-            if (_webDataRequestOp.Status == EOperationStatus.Succeed)
-            {
-                _steps = ESteps.VerifyFileData;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _webDataRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadAlipayPackageManifestOperation));
-            }
-        }
-
-        if (_steps == ESteps.VerifyFileData)
-        {
-            string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
-            if (fileHash == _packageHash)
-            {
-                _steps = ESteps.LoadManifest;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Failed to verify package manifest file!";
-            }
-        }
-
-        if (_steps == ESteps.LoadManifest)
-        {
-            if (_deserializer == null)
-            {
-                _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
-                _deserializer.StartOperation();
-                AddChildOperation(_deserializer);
-            }
-
-            _deserializer.UpdateOperation();
-            Progress = _deserializer.Progress;
-            if (_deserializer.IsDone == false)
-                return;
-
-            if (_deserializer.Status == EOperationStatus.Succeed)
-            {
-                _steps = ESteps.Done;
-                Manifest = _deserializer.Manifest;
-                Status = EOperationStatus.Succeed;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _deserializer.Error;
-            }
-        }
-    }
-
-    private string GetRequestURL(string fileName)
-    {
-        // 轮流返回请求地址
-        if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-        else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-    }
-}
-#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs

@@ -1,100 +0,0 @@
-#if UNITY_WEBGL && UNITY_ALIMINIGAME
-using YooAsset;
-
-internal class RequestAlipayPackageVersionOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RequestPackageVersion,
-        Done,
-    }
-
-    private readonly AlipayFileSystem _fileSystem;
-    private readonly bool _appendTimeTicks;
-    private readonly int _timeout;
-    private UnityWebTextRequestOperation _webTextRequestOp;
-    private int _requestCount = 0;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 包裹版本
-    /// </summary>
-    public string PackageVersion { private set; get; }
-
-
-    public RequestAlipayPackageVersionOperation(AlipayFileSystem fileSystem, bool appendTimeTicks, int timeout)
-    {
-        _fileSystem = fileSystem;
-        _appendTimeTicks = appendTimeTicks;
-        _timeout = timeout;
-    }
-    internal override void InternalStart()
-    {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestAlipayPackageVersionOperation));
-        _steps = ESteps.RequestPackageVersion;
-    }
-    internal override void InternalUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RequestPackageVersion)
-        {
-            if (_webTextRequestOp == null)
-            {
-                string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
-                string url = GetRequestURL(fileName);
-                _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                _webTextRequestOp.StartOperation();
-                AddChildOperation(_webTextRequestOp);
-            }
-
-            _webTextRequestOp.UpdateOperation();
-            Progress = _webTextRequestOp.Progress;
-            if (_webTextRequestOp.IsDone == false)
-                return;
-
-            if (_webTextRequestOp.Status == EOperationStatus.Succeed)
-            {
-                PackageVersion = _webTextRequestOp.Result;
-                if (string.IsNullOrEmpty(PackageVersion))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Web package version file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _webTextRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestAlipayPackageVersionOperation));
-            }
-        }
-    }
-
-    private string GetRequestURL(string fileName)
-    {
-        string url;
-
-        // 轮流返回请求地址
-        if (_requestCount % 2 == 0)
-            url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-        else
-            url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-
-        // 在URL末尾添加时间戳
-        if (_appendTimeTicks)
-            return $"{url}?{System.DateTime.UtcNow.Ticks}";
-        else
-            return url;
-    }
-}
-#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/GooglePlayFileSystem/GooglePlayFileSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2e26d6ba3f3c6cd48bc22d40f1857f89
+guid: 3a09145cd500f3f42b2a17524f0dd3f2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/BundleResult.meta

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

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

@@ -0,0 +1,67 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using System.IO;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using TapTapMiniGame;
+
+namespace YooAsset
+{
+    internal class TPAssetBundleResult : BundleResult
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+
+        public TPAssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle)
+        {
+            _fileSystem = fileSystem;
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+        }
+
+        public override void UnloadBundleFile()
+        {
+            if (_assetBundle != null)
+            {
+                if (_packageBundle.Encrypted)
+                    _assetBundle.Unload(true);
+                else
+                    _assetBundle.TapUnload(true);
+            }
+        }
+        public override string GetBundleFilePath()
+        {
+            return _fileSystem.GetBundleFilePath(_packageBundle);
+        }
+        public override byte[] ReadBundleFileData()
+        {
+            return _fileSystem.ReadBundleFileData(_packageBundle);
+        }
+        public override string ReadBundleFileText()
+        {
+            return _fileSystem.ReadBundleFileText(_packageBundle);
+        }
+
+        public override FSLoadAssetOperation LoadAssetAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAssetOperation(_packageBundle, _assetBundle, assetInfo);
+            return operation;
+        }
+        public override FSLoadAllAssetsOperation LoadAllAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAllAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            return operation;
+        }
+        public override FSLoadSubAssetsOperation LoadSubAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadSubAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            return operation;
+        }
+        public override FSLoadSceneOperation LoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad)
+        {
+            var operation = new AssetBundleLoadSceneOperation(assetInfo, loadParams, suspendLoad);
+            return operation;
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/BundleResult/TPAssetBundleResult.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f2a5bb0106a45e540a43a05b72a75bcd
+guid: e914b1b35e8a6ae48bdfe71a0614ab0a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation.meta

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

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

@@ -0,0 +1,111 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using UnityEngine;
+using YooAsset;
+
+internal class TPFSDownloadFileOperation : FSDownloadFileOperation
+{
+    protected enum ESteps
+    {
+        None,
+        CreateRequest,
+        CheckRequest,
+        TryAgain,
+        Done,
+    }
+
+    private readonly TaptapFileSystem _fileSystem;
+    private readonly DownloadFileOptions _options;
+    private UnityWebCacheRequestOperation _webCacheRequestOp;
+    private int _requestCount = 0;
+    private float _tryAgainTimer;
+    private int _failedTryAgain;
+    private ESteps _steps = ESteps.None;
+
+    internal TPFSDownloadFileOperation(TaptapFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle)
+    {
+        _fileSystem = fileSystem;
+        _options = options;
+    }
+    internal override void InternalStart()
+    {
+        _steps = ESteps.CreateRequest;
+    }
+    internal override void InternalUpdate()
+    {
+        // 创建下载器
+        if (_steps == ESteps.CreateRequest)
+        {
+            string url = GetRequestURL();
+            _webCacheRequestOp = new UnityWebCacheRequestOperation(url);
+            _webCacheRequestOp.StartOperation();
+            AddChildOperation(_webCacheRequestOp);
+            _steps = ESteps.CheckRequest;
+        }
+
+        // 检测下载结果
+        if (_steps == ESteps.CheckRequest)
+        {
+            _webCacheRequestOp.UpdateOperation();
+            Progress = _webCacheRequestOp.Progress;
+            DownloadProgress = _webCacheRequestOp.DownloadProgress;
+            DownloadedBytes = _webCacheRequestOp.DownloadedBytes;
+            if (_webCacheRequestOp.IsDone == false)
+                return;
+
+            if (_webCacheRequestOp.Status == EOperationStatus.Succeed)
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+
+                //TODO 需要验证插件请求器的下载进度
+                DownloadProgress = 1f;
+                DownloadedBytes = Bundle.FileSize;
+                Progress = 1f;
+            }
+            else
+            {
+                if (_failedTryAgain > 0)
+                {
+                    _steps = ESteps.TryAgain;
+                    YooLogger.Warning($"Failed download : {_webCacheRequestOp.URL} Try again !");
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _webCacheRequestOp.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;
+            }
+        }
+    }
+
+    /// <summary>
+    /// 获取网络请求地址
+    /// </summary>
+    private string GetRequestURL()
+    {
+        // 轮流返回请求地址
+        _requestCount++;
+        if (_requestCount % 2 == 0)
+            return _options.FallbackURL;
+        else
+            return _options.MainURL;
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/TPFSDownloadFileOperation.cs.meta

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

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

@@ -0,0 +1,20 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using YooAsset;
+
+internal partial class TPFSInitializeOperation : FSInitializeFileSystemOperation
+{
+    private readonly TaptapFileSystem _fileSystem;
+
+    public TPFSInitializeOperation(TaptapFileSystem fileSystem)
+    {
+        _fileSystem = fileSystem;
+    }
+    internal override void InternalStart()
+    {
+        Status = EOperationStatus.Succeed;
+    }
+    internal override void InternalUpdate()
+    {
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/TPFSInitializeOperation.cs.meta

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

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

@@ -0,0 +1,88 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using YooAsset;
+
+internal class TPFSLoadBundleOperation : FSLoadBundleOperation
+{
+    private enum ESteps
+    {
+        None,
+        LoadAssetBundle,
+        Done,
+    }
+
+    private readonly TaptapFileSystem _fileSystem;
+    private readonly PackageBundle _bundle;
+    private LoadWebAssetBundleOperation _loadWebAssetBundleOp;
+    private ESteps _steps = ESteps.None;
+
+    internal TPFSLoadBundleOperation(TaptapFileSystem fileSystem, PackageBundle bundle)
+    {
+        _fileSystem = fileSystem;
+        _bundle = bundle;
+    }
+    internal override void InternalStart()
+    {
+        _steps = ESteps.LoadAssetBundle;
+    }
+    internal override void InternalUpdate()
+    {
+        if (_steps == ESteps.None || _steps == ESteps.Done)
+            return;
+
+        if (_steps == ESteps.LoadAssetBundle)
+        {
+            if (_loadWebAssetBundleOp == null)
+            {
+                string mainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
+                string fallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
+                DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
+                options.SetURL(mainURL, fallbackURL);
+
+                if (_bundle.Encrypted)
+                {
+                    _loadWebAssetBundleOp = new LoadWebEncryptAssetBundleOperation(_bundle, options, _fileSystem.DecryptionServices);
+                    _loadWebAssetBundleOp.StartOperation();
+                    AddChildOperation(_loadWebAssetBundleOp);
+                }
+                else
+                {
+                    _loadWebAssetBundleOp = new LoadTaptapAssetBundleOperation(_bundle, options);
+                    _loadWebAssetBundleOp.StartOperation();
+                    AddChildOperation(_loadWebAssetBundleOp);
+                }
+            }
+
+            _loadWebAssetBundleOp.UpdateOperation();
+            Progress = _loadWebAssetBundleOp.Progress;
+            DownloadProgress = _loadWebAssetBundleOp.DownloadProgress;
+            DownloadedBytes = _loadWebAssetBundleOp.DownloadedBytes;
+            if (_loadWebAssetBundleOp.IsDone == false)
+                return;
+
+            if (_loadWebAssetBundleOp.Status == EOperationStatus.Succeed)
+            {
+                var assetBundle = _loadWebAssetBundleOp.Result;
+                _steps = ESteps.Done;
+                Result = new TPAssetBundleResult(_fileSystem, _bundle, assetBundle);
+                Status = EOperationStatus.Succeed;
+            }
+            else
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = _loadWebAssetBundleOp.Error;
+            }
+        }
+    }
+    internal override void InternalWaitForAsyncComplete()
+    {
+        if (_steps != ESteps.Done)
+        {
+            _steps = ESteps.Done;
+            Status = EOperationStatus.Failed;
+            Error = "WebGL platform not support sync load method !";
+            UnityEngine.Debug.LogError(Error);
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/TPFSLoadBundleOperation.cs.meta

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

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

@@ -0,0 +1,95 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using YooAsset;
+
+internal class TPFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
+{
+    private enum ESteps
+    {
+        None,
+        RequestPackageHash,
+        LoadPackageManifest,
+        Done,
+    }
+
+    private readonly TaptapFileSystem _fileSystem;
+    private readonly string _packageVersion;
+    private readonly int _timeout;
+    private RequestWebPackageHashOperation _requestPackageHashOp;
+    private LoadWebPackageManifestOperation _loadPackageManifestOp;
+    private ESteps _steps = ESteps.None;
+
+
+    public TPFSLoadPackageManifestOperation(TaptapFileSystem fileSystem, string packageVersion, int timeout)
+    {
+        _fileSystem = fileSystem;
+        _packageVersion = packageVersion;
+        _timeout = timeout;
+    }
+    internal override void InternalStart()
+    {
+        _steps = ESteps.RequestPackageHash;
+    }
+    internal override void InternalUpdate()
+    {
+        if (_steps == ESteps.None || _steps == ESteps.Done)
+            return;
+
+        if (_steps == ESteps.RequestPackageHash)
+        {
+            if (_requestPackageHashOp == null)
+            {
+                _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
+                _requestPackageHashOp.StartOperation();
+                AddChildOperation(_requestPackageHashOp);
+            }
+
+            _requestPackageHashOp.UpdateOperation();
+            if (_requestPackageHashOp.IsDone == false)
+                return;
+
+            if (_requestPackageHashOp.Status == EOperationStatus.Succeed)
+            {
+                _steps = ESteps.LoadPackageManifest;
+            }
+            else
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = _requestPackageHashOp.Error;
+            }
+        }
+
+        if (_steps == ESteps.LoadPackageManifest)
+        {
+            if (_loadPackageManifestOp == null)
+            {
+                string packageHash = _requestPackageHashOp.PackageHash;
+                string packageName = _fileSystem.PackageName;
+                var manifestServices = _fileSystem.ManifestServices;
+                var remoteServices = _fileSystem.RemoteServices;
+                _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
+                _loadPackageManifestOp.StartOperation();
+                AddChildOperation(_loadPackageManifestOp);
+            }
+
+            _loadPackageManifestOp.UpdateOperation();
+            Progress = _loadPackageManifestOp.Progress;
+            if (_loadPackageManifestOp.IsDone == false)
+                return;
+
+            if (_loadPackageManifestOp.Status == EOperationStatus.Succeed)
+            {
+                _steps = ESteps.Done;
+                Manifest = _loadPackageManifestOp.Manifest;
+                Status = EOperationStatus.Succeed;
+            }
+            else
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = _loadPackageManifestOp.Error;
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/TPFSLoadPackageManifestOperation.cs.meta

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

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

@@ -0,0 +1,64 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using YooAsset;
+
+internal class TPFSRequestPackageVersionOperation : FSRequestPackageVersionOperation
+{
+    private enum ESteps
+    {
+        None,
+        RequestPackageVersion,
+        Done,
+    }
+
+    private readonly TaptapFileSystem _fileSystem;
+    private readonly bool _appendTimeTicks;
+    private readonly int _timeout;
+    private RequestWebPackageVersionOperation _requestWebPackageVersionOp;
+    private ESteps _steps = ESteps.None;
+
+
+    internal TPFSRequestPackageVersionOperation(TaptapFileSystem fileSystem, bool appendTimeTicks, int timeout)
+    {
+        _fileSystem = fileSystem;
+        _appendTimeTicks = appendTimeTicks;
+        _timeout = timeout;
+    }
+    internal override void InternalStart()
+    {
+        _steps = ESteps.RequestPackageVersion;
+    }
+    internal override void InternalUpdate()
+    {
+        if (_steps == ESteps.None || _steps == ESteps.Done)
+            return;
+
+        if (_steps == ESteps.RequestPackageVersion)
+        {
+            if (_requestWebPackageVersionOp == null)
+            {
+                _requestWebPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
+                _requestWebPackageVersionOp.StartOperation();
+                AddChildOperation(_requestWebPackageVersionOp);
+            }
+
+            _requestWebPackageVersionOp.UpdateOperation();
+            Progress = _requestWebPackageVersionOp.Progress;
+            if (_requestWebPackageVersionOp.IsDone == false)
+                return;
+
+            if (_requestWebPackageVersionOp.Status == EOperationStatus.Succeed)
+            {
+                _steps = ESteps.Done;
+                PackageVersion = _requestWebPackageVersionOp.PackageVersion;
+                Status = EOperationStatus.Succeed;
+            }
+            else
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = _requestWebPackageVersionOp.Error;
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/TPFSRequestPackageVersionOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/internal.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9be3163f53935514d9e64e09686db957
+guid: e4ea0eed64f86c54c82153463d3773bf
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/internal/LoadTaptapAssetBundleOperation.cs

@@ -0,0 +1,114 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class LoadTaptapAssetBundleOperation : LoadWebAssetBundleOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            CheckRequest,
+            TryAgain,
+            Done,
+        }
+
+        private readonly PackageBundle _bundle;
+        private readonly DownloadFileOptions _options;
+        private UnityTaptapAssetBundleRequestOperation _unityAssetBundleRequestOp;
+        
+        private int _requestCount = 0;
+        private float _tryAgainTimer;
+        private int _failedTryAgain;
+        private ESteps _steps = ESteps.None;
+
+
+        internal LoadTaptapAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options)
+        {
+            _bundle = bundle;
+            _options = options;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                string url = GetRequestURL();
+                _unityAssetBundleRequestOp = new UnityTaptapAssetBundleRequestOperation(_bundle, url);
+                _unityAssetBundleRequestOp.StartOperation();
+                AddChildOperation(_unityAssetBundleRequestOp);
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                _unityAssetBundleRequestOp.UpdateOperation();
+                Progress = _unityAssetBundleRequestOp.Progress;
+                DownloadProgress = _unityAssetBundleRequestOp.DownloadProgress;
+                DownloadedBytes = _unityAssetBundleRequestOp.DownloadedBytes;
+                if (_unityAssetBundleRequestOp.IsDone == false)
+                    return;
+
+                if (_unityAssetBundleRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                    Result = _unityAssetBundleRequestOp.Result;
+                }
+                else
+                {
+                    if (_failedTryAgain > 0)
+                    {
+                        _steps = ESteps.TryAgain;
+                        YooLogger.Warning($"Failed download : {_unityAssetBundleRequestOp.URL} Try again !");
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = _unityAssetBundleRequestOp.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;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取网络请求地址
+        /// </summary>
+        private string GetRequestURL()
+        {
+            // 轮流返回请求地址
+            _requestCount++;
+            if (_requestCount % 2 == 0)
+                return _options.FallbackURL;
+            else
+                return _options.MainURL;
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/internal/LoadTaptapAssetBundleOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/internal/UnityTaptapAssetBundleRequestOperation.cs

@@ -0,0 +1,95 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using UnityEngine.Networking;
+using UnityEngine;
+using TapTapMiniGame;
+
+namespace YooAsset
+{
+    internal class UnityTaptapAssetBundleRequestOperation : UnityWebRequestOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            Done,
+        }
+
+        private readonly PackageBundle _packageBundle;
+        private UnityWebRequestAsyncOperation _requestOperation;
+        private ESteps _steps = ESteps.None;
+
+        /// <summary>
+        /// 请求结果
+        /// </summary>
+        public AssetBundle Result { private set; get; }
+
+        internal UnityTaptapAssetBundleRequestOperation(PackageBundle bundle, string url) : base(url)
+        {
+            _packageBundle = bundle;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.CreateRequest)
+            {
+                CreateWebRequest();
+                _steps = ESteps.Download;
+            }
+
+            if (_steps == ESteps.Download)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = _requestOperation.progress;
+                if (_requestOperation.isDone == false)
+                    return;
+
+                if (CheckRequestResult())
+                {
+                    var downloadHanlder = (DownloadHandlerTapAssetBundle)_webRequest.downloadHandler;
+                    AssetBundle assetBundle = downloadHanlder.assetBundle;
+                    if (assetBundle == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"URL : {_requestURL} Download handler asset bundle object is null !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Result = assetBundle;
+                        Status = EOperationStatus.Succeed;
+
+                        //TODO 需要验证插件请求器的下载进度
+                        DownloadProgress = 1f;
+                        DownloadedBytes = _packageBundle.FileSize;
+                        Progress = 1f;
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                }
+
+                // 注意：最终释放请求器
+                DisposeRequest();
+            }
+        }
+
+        private void CreateWebRequest()
+        {
+            _webRequest = TapAssetBundle.GetAssetBundle(_requestURL);
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _requestOperation = _webRequest.SendWebRequest();
+        }
+    }
+}
+#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TaptapFileSystem/Operation/internal/UnityTaptapAssetBundleRequestOperation.cs.meta

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

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

@@ -0,0 +1,271 @@
+#if UNITY_WEBGL && TAPMINIGAME
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEngine;
+using YooAsset;
+using TapTapMiniGame;
+
+public static class TaptapFileSystemCreater
+{
+    public static FileSystemParameters CreateFileSystemParameters(string packageRoot)
+    {
+        string fileSystemClass = $"{nameof(TaptapFileSystem)},YooAsset.MiniGame";
+        var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
+        return fileSystemParams;
+    }
+}
+
+/// <summary>
+/// TapTap小游戏
+/// 参考：https://developer.taptap.cn/minigameapidoc/dev/engine/unity-adaptation/guide/
+/// </summary>
+internal class TaptapFileSystem : IFileSystem
+{
+    private class WebRemoteServices : IRemoteServices
+    {
+        private readonly string _webPackageRoot;
+        protected readonly Dictionary<string, string> _mapping = new Dictionary<string, string>(10000);
+
+        public WebRemoteServices(string buildinPackRoot)
+        {
+            _webPackageRoot = buildinPackRoot;
+        }
+        string IRemoteServices.GetRemoteMainURL(string fileName)
+        {
+            return GetFileLoadURL(fileName);
+        }
+        string IRemoteServices.GetRemoteFallbackURL(string fileName)
+        {
+            return GetFileLoadURL(fileName);
+        }
+
+        private string GetFileLoadURL(string fileName)
+        {
+            if (_mapping.TryGetValue(fileName, out string url) == false)
+            {
+                string filePath = PathUtility.Combine(_webPackageRoot, fileName);
+                url = DownloadSystemHelper.ConvertToWWWPath(filePath);
+                _mapping.Add(fileName, url);
+            }
+            return url;
+        }
+    }
+
+    private readonly Dictionary<string, string> _cacheFilePathMapping = new Dictionary<string, string>(10000);
+    private TapFileSystemManager _fileSystemMgr;
+    private string _tapCacheRoot = string.Empty;
+
+    /// <summary>
+    /// 包裹名称
+    /// </summary>
+    public string PackageName { private set; get; }
+
+    /// <summary>
+    /// 文件根目录
+    /// </summary>
+    public string FileRoot
+    {
+        get
+        {
+            return _tapCacheRoot;
+        }
+    }
+
+    /// <summary>
+    /// 文件数量
+    /// </summary>
+    public int FileCount
+    {
+        get
+        {
+            return 0;
+        }
+    }
+
+    #region 自定义参数
+    /// <summary>
+    /// 自定义参数：远程服务接口
+    /// </summary>
+    public IRemoteServices RemoteServices { private set; get; } = null;
+
+    /// <summary>
+    ///  自定义参数：解密方法类
+    /// </summary>
+    public IWebDecryptionServices DecryptionServices { private set; get; }
+
+    /// <summary>
+    /// 自定义参数：资源清单服务类
+    /// </summary>
+    public IManifestRestoreServices ManifestServices { private set; get; }
+    #endregion
+
+
+    public TaptapFileSystem()
+    {
+    }
+    public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync()
+    {
+        var operation = new TPFSInitializeOperation(this);
+        return operation;
+    }
+    public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout)
+    {
+        var operation = new TPFSLoadPackageManifestOperation(this, packageVersion, timeout);
+        return operation;
+    }
+    public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout)
+    {
+        var operation = new TPFSRequestPackageVersionOperation(this, appendTimeTicks, timeout);
+        return operation;
+    }
+    public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
+    {
+        var operation = new FSClearCacheFilesCompleteOperation();
+        return operation;
+    }
+    public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+    {
+        string mainURL = RemoteServices.GetRemoteMainURL(bundle.FileName);
+        string fallbackURL = RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+        options.SetURL(mainURL, fallbackURL);
+        var operation = new TPFSDownloadFileOperation(this, bundle, options);
+        return operation;
+    }
+    public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
+    {
+        if (bundle.BundleType == (int)EBuildBundleType.AssetBundle)
+        {
+            var operation = new TPFSLoadBundleOperation(this, bundle);
+            return operation;
+        }
+        else
+        {
+            string error = $"{nameof(TaptapFileSystem)} not support load bundle type : {bundle.BundleType}";
+            var operation = new FSLoadBundleCompleteOperation(error);
+            return operation;
+        }
+    }
+
+    public virtual void SetParameter(string name, object value)
+    {
+        if (name == FileSystemParametersDefine.REMOTE_SERVICES)
+        {
+            RemoteServices = (IRemoteServices)value;
+        }
+        else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
+        {
+            DecryptionServices = (IWebDecryptionServices)value;
+        }
+        else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+        {
+            ManifestServices = (IManifestRestoreServices)value;
+        }
+        else
+        {
+            YooLogger.Warning($"Invalid parameter : {name}");
+        }
+    }
+    public virtual void OnCreate(string packageName, string rootDirectory)
+    {
+        PackageName = packageName;
+        _tapCacheRoot = rootDirectory;
+
+        if (string.IsNullOrEmpty(_tapCacheRoot))
+        {
+            throw new System.Exception("请配置小游戏的缓存根目录！");
+        }
+
+        // 注意：CDN服务未启用的情况下，使用WEB服务器
+        if (RemoteServices == null)
+        {
+            string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);
+            RemoteServices = new WebRemoteServices(webRoot);
+        }
+
+        _fileSystemMgr = Tap.GetFileSystemManager();
+    }
+    public virtual void OnDestroy()
+    {
+    }
+
+    public virtual bool Belong(PackageBundle bundle)
+    {
+        return true;
+    }
+    public virtual bool Exists(PackageBundle bundle)
+    {
+        return CheckCacheFileExist(bundle);
+    }
+    public virtual bool NeedDownload(PackageBundle bundle)
+    {
+        if (Belong(bundle) == false)
+            return false;
+
+        return Exists(bundle) == false;
+    }
+    public virtual bool NeedUnpack(PackageBundle bundle)
+    {
+        return false;
+    }
+    public virtual bool NeedImport(PackageBundle bundle)
+    {
+        return false;
+    }
+
+    public virtual string GetBundleFilePath(PackageBundle bundle)
+    {
+        return GetCacheFileLoadPath(bundle);
+    }
+    public virtual byte[] ReadBundleFileData(PackageBundle bundle)
+    {
+        if (CheckCacheFileExist(bundle))
+        {
+            string filePath = GetCacheFileLoadPath(bundle);
+            return _fileSystemMgr.ReadFileSync(filePath);
+        }
+        else
+        {
+            return Array.Empty<byte>();
+        }
+    }
+    public virtual string ReadBundleFileText(PackageBundle bundle)
+    {
+        if (CheckCacheFileExist(bundle))
+        {
+            string filePath = GetCacheFileLoadPath(bundle);
+            return _fileSystemMgr.ReadFileSync(filePath, "utf8");
+        }
+        else
+        {
+            return string.Empty;
+        }
+    }
+
+    #region 内部方法
+    public TapFileSystemManager GetFileSystemMgr()
+    {
+        return _fileSystemMgr;
+    }
+    public bool CheckCacheFileExist(PackageBundle bundle)
+    {
+        //TODO : 效率极低
+        /*
+        string filePath = GetCacheFileLoadPath(bundle);
+        string result = _fileSystemMgr.AccessSync(filePath);
+        return result.Equals("access:ok", StringComparison.Ordinal);
+        */
+        return false;
+    }
+    private string GetCacheFileLoadPath(PackageBundle bundle)
+    {
+        if (_cacheFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+        {
+            filePath = PathUtility.Combine(_tapCacheRoot, bundle.FileName);
+            _cacheFilePathMapping.Add(bundle.BundleGUID, filePath);
+        }
+        return filePath;
+    }
+    #endregion
+}
+#endif

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

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs

@@ -14,8 +14,8 @@ internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
     private readonly TiktokFileSystem _fileSystem;
     private readonly string _packageVersion;
     private readonly int _timeout;
-    private RequestTiktokPackageHashOperation _requestPackageHashOp;
+    private RequestWebPackageHashOperation _requestPackageHashOp;
-    private LoadTiktokPackageManifestOperation _loadPackageManifestOp;
+    private LoadWebPackageManifestOperation _loadPackageManifestOp;
     private ESteps _steps = ESteps.None;
 
 
@@ -38,7 +38,7 @@ internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
         {
             if (_requestPackageHashOp == null)
             {
-                _requestPackageHashOp = new RequestTiktokPackageHashOperation(_fileSystem, _packageVersion, _timeout);
+                _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
                 _requestPackageHashOp.StartOperation();
                 AddChildOperation(_requestPackageHashOp);
             }
@@ -64,7 +64,10 @@ internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
             if (_loadPackageManifestOp == null)
             {
                 string packageHash = _requestPackageHashOp.PackageHash;
-                _loadPackageManifestOp = new LoadTiktokPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+                string packageName = _fileSystem.PackageName;
+                var manifestServices = _fileSystem.ManifestServices;
+                var remoteServices = _fileSystem.RemoteServices;
+                _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
                 _loadPackageManifestOp.StartOperation();
                 AddChildOperation(_loadPackageManifestOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs

@@ -13,7 +13,7 @@ internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
     private readonly TiktokFileSystem _fileSystem;
     private readonly bool _appendTimeTicks;
     private readonly int _timeout;
-    private RequestTiktokPackageVersionOperation _requestPackageVersionOp;
+    private RequestWebPackageVersionOperation _requestPackageVersionOp;
     private ESteps _steps = ESteps.None;
 
 
@@ -36,7 +36,7 @@ internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
         {
             if (_requestPackageVersionOp == null)
             {
-                _requestPackageVersionOp = new RequestTiktokPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+                _requestPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
                 _requestPackageVersionOp.StartOperation();
                 AddChildOperation(_requestPackageVersionOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs

@@ -1,92 +0,0 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
-using YooAsset;
-
-internal class RequestTiktokPackageHashOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RequestPackageHash,
-        Done,
-    }
-
-    private readonly TiktokFileSystem _fileSystem;
-    private readonly string _packageVersion;
-    private readonly int _timeout;
-    private UnityWebTextRequestOperation _webTextRequestOp;
-    private int _requestCount = 0;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 包裹哈希值
-    /// </summary>
-    public string PackageHash { private set; get; }
-
-
-    public RequestTiktokPackageHashOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout)
-    {
-        _fileSystem = fileSystem;
-        _packageVersion = packageVersion;
-        _timeout = timeout;
-    }
-    internal override void InternalStart()
-    {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation));
-        _steps = ESteps.RequestPackageHash;
-    }
-    internal override void InternalUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RequestPackageHash)
-        {
-            if (_webTextRequestOp == null)
-            {
-                string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
-                string url = GetRequestURL(fileName);
-                _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                _webTextRequestOp.StartOperation();
-                AddChildOperation(_webTextRequestOp);
-            }
-
-            _webTextRequestOp.UpdateOperation();
-            Progress = _webTextRequestOp.Progress;
-            if (_webTextRequestOp.IsDone == false)
-                return;
-
-            if (_webTextRequestOp.Status == EOperationStatus.Succeed)
-            {
-                PackageHash = _webTextRequestOp.Result;
-                if (string.IsNullOrEmpty(PackageHash))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Web package hash file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _webTextRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation));
-            }
-        }
-    }
-
-    private string GetRequestURL(string fileName)
-    {
-        // 轮流返回请求地址
-        if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-        else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-    }
-}
-#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta

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

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

@@ -182,10 +182,10 @@ internal class TiktokFileSystem : IFileSystem
 
         if (string.IsNullOrEmpty(_ttCacheRoot))
         {
-            throw new System.Exception("请配置抖音小游戏的缓存根目录！");
+            throw new System.Exception("请配置小游戏的缓存根目录！");
         }
 
-        // 注意：CDN服务未启用的情况下，使用抖音WEB服务器
+        // 注意：CDN服务未启用的情况下，使用WEB服务器
         if (RemoteServices == null)
         {
             string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs

@@ -14,8 +14,8 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
     private readonly WechatFileSystem _fileSystem;
     private readonly string _packageVersion;
     private readonly int _timeout;
-    private RequestWechatPackageHashOperation _requestPackageHashOp;
+    private RequestWebPackageHashOperation _requestPackageHashOp;
-    private LoadWechatPackageManifestOperation _loadPackageManifestOp;
+    private LoadWebPackageManifestOperation _loadPackageManifestOp;
     private ESteps _steps = ESteps.None;
 
 
@@ -38,7 +38,7 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
         {
             if (_requestPackageHashOp == null)
             {
-                _requestPackageHashOp = new RequestWechatPackageHashOperation(_fileSystem, _packageVersion, _timeout);
+                _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
                 _requestPackageHashOp.StartOperation();
                 AddChildOperation(_requestPackageHashOp);
             }
@@ -64,7 +64,10 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
             if (_loadPackageManifestOp == null)
             {
                 string packageHash = _requestPackageHashOp.PackageHash;
-                _loadPackageManifestOp = new LoadWechatPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+                string packageName = _fileSystem.PackageName;
+                var manifestServices = _fileSystem.ManifestServices;
+                var remoteServices = _fileSystem.RemoteServices;
+                _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
                 _loadPackageManifestOp.StartOperation();
                 AddChildOperation(_loadPackageManifestOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs

@@ -13,7 +13,7 @@ internal class WXFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
     private readonly WechatFileSystem _fileSystem;
     private readonly bool _appendTimeTicks;
     private readonly int _timeout;
-    private RequestWechatPackageVersionOperation _requestWebPackageVersionOp;
+    private RequestWebPackageVersionOperation _requestWebPackageVersionOp;
     private ESteps _steps = ESteps.None;
 
 
@@ -36,7 +36,7 @@ internal class WXFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
         {
             if (_requestWebPackageVersionOp == null)
             {
-                _requestWebPackageVersionOp = new RequestWechatPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+                _requestWebPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
                 _requestWebPackageVersionOp.StartOperation();
                 AddChildOperation(_requestWebPackageVersionOp);
             }

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs

@@ -1,129 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-
-internal class LoadWechatPackageManifestOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RequestFileData,
-        VerifyFileData,
-        LoadManifest,
-        Done,
-    }
-
-    private readonly WechatFileSystem _fileSystem;
-    private readonly string _packageVersion;
-    private readonly string _packageHash;
-    private readonly int _timeout;
-    private UnityWebDataRequestOperation _webDataRequestOp;
-    private DeserializeManifestOperation _deserializer;
-    private int _requestCount = 0;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 包裹清单
-    /// </summary>
-    public PackageManifest Manifest { private set; get; }
-
-
-    internal LoadWechatPackageManifestOperation(WechatFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
-    {
-        _fileSystem = fileSystem;
-        _packageVersion = packageVersion;
-        _packageHash = packageHash;
-        _timeout = timeout;
-    }
-    internal override void InternalStart()
-    {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadWechatPackageManifestOperation));
-        _steps = ESteps.RequestFileData;
-    }
-    internal override void InternalUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RequestFileData)
-        {
-            if (_webDataRequestOp == null)
-            {
-                string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
-                string url = GetRequestURL(fileName);
-                _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
-                _webDataRequestOp.StartOperation();
-                AddChildOperation(_webDataRequestOp);
-            }
-
-            _webDataRequestOp.UpdateOperation();
-            Progress = _webDataRequestOp.Progress;
-            if (_webDataRequestOp.IsDone == false)
-                return;
-
-            if (_webDataRequestOp.Status == EOperationStatus.Succeed)
-            {
-                _steps = ESteps.VerifyFileData;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _webDataRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadWechatPackageManifestOperation));
-            }
-        }
-
-        if (_steps == ESteps.VerifyFileData)
-        {
-            string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
-            if (fileHash == _packageHash)
-            {
-                _steps = ESteps.LoadManifest;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Failed to verify package manifest file!";
-            }
-        }
-
-        if (_steps == ESteps.LoadManifest)
-        {
-            if (_deserializer == null)
-            {
-                _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
-                _deserializer.StartOperation();
-                AddChildOperation(_deserializer);
-            }
-
-            _deserializer.UpdateOperation();
-            Progress = _deserializer.Progress;
-            if (_deserializer.IsDone == false)
-                return;
-
-            if (_deserializer.Status == EOperationStatus.Succeed)
-            {
-                _steps = ESteps.Done;
-                Manifest = _deserializer.Manifest;
-                Status = EOperationStatus.Succeed;
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _deserializer.Error;
-            }
-        }
-    }
-
-    private string GetRequestURL(string fileName)
-    {
-        // 轮流返回请求地址
-        if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-        else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-    }
-}
-#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs

@@ -1,92 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-
-internal class RequestWechatPackageHashOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RequestPackageHash,
-        Done,
-    }
-
-    private readonly WechatFileSystem _fileSystem;
-    private readonly string _packageVersion;
-    private readonly int _timeout;
-    private UnityWebTextRequestOperation _webTextRequestOp;
-    private int _requestCount = 0;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 包裹哈希值
-    /// </summary>
-    public string PackageHash { private set; get; }
-
-
-    public RequestWechatPackageHashOperation(WechatFileSystem fileSystem, string packageVersion, int timeout)
-    {
-        _fileSystem = fileSystem;
-        _packageVersion = packageVersion;
-        _timeout = timeout;
-    }
-    internal override void InternalStart()
-    {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWechatPackageHashOperation));
-        _steps = ESteps.RequestPackageHash;
-    }
-    internal override void InternalUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RequestPackageHash)
-        {
-            if (_webTextRequestOp == null)
-            {
-                string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
-                string url = GetRequestURL(fileName);
-                _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                _webTextRequestOp.StartOperation();
-                AddChildOperation(_webTextRequestOp);
-            }
-
-            _webTextRequestOp.UpdateOperation();
-            Progress = _webTextRequestOp.Progress;
-            if (_webTextRequestOp.IsDone == false)
-                return;
-
-            if (_webTextRequestOp.Status == EOperationStatus.Succeed)
-            {
-                PackageHash = _webTextRequestOp.Result;
-                if (string.IsNullOrEmpty(PackageHash))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Web package hash file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _webTextRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWechatPackageHashOperation));
-            }
-        }
-    }
-
-    private string GetRequestURL(string fileName)
-    {
-        // 轮流返回请求地址
-        if (_requestCount % 2 == 0)
-            return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-        else
-            return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-    }
-}
-#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta

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

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs

@@ -1,100 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-
-internal class RequestWechatPackageVersionOperation : AsyncOperationBase
-{
-    private enum ESteps
-    {
-        None,
-        RequestPackageVersion,
-        Done,
-    }
-
-    private readonly WechatFileSystem _fileSystem;
-    private readonly bool _appendTimeTicks;
-    private readonly int _timeout;
-    private UnityWebTextRequestOperation _webTextRequestOp;
-    private int _requestCount = 0;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 包裹版本
-    /// </summary>
-    public string PackageVersion { private set; get; }
-
-    
-    public RequestWechatPackageVersionOperation(WechatFileSystem fileSystem, bool appendTimeTicks, int timeout)
-    {
-        _fileSystem = fileSystem;
-        _appendTimeTicks = appendTimeTicks;
-        _timeout = timeout;
-    }
-    internal override void InternalStart()
-    {
-        _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWechatPackageVersionOperation));
-        _steps = ESteps.RequestPackageVersion;
-    }
-    internal override void InternalUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.RequestPackageVersion)
-        {
-            if (_webTextRequestOp == null)
-            {
-                string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
-                string url = GetRequestURL(fileName);
-                _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
-                _webTextRequestOp.StartOperation();
-                AddChildOperation(_webTextRequestOp);
-            }
-
-            _webTextRequestOp.UpdateOperation();
-            Progress = _webTextRequestOp.Progress;
-            if (_webTextRequestOp.IsDone == false)
-                return;
-
-            if (_webTextRequestOp.Status == EOperationStatus.Succeed)
-            {
-                PackageVersion = _webTextRequestOp.Result;
-                if (string.IsNullOrEmpty(PackageVersion))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Web package version file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-            else
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = _webTextRequestOp.Error;
-                WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWechatPackageVersionOperation));
-            }
-        }
-    }
-
-    private string GetRequestURL(string fileName)
-    {
-        string url;
-
-        // 轮流返回请求地址
-        if (_requestCount % 2 == 0)
-            url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
-        else
-            url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-
-        // 在URL末尾添加时间戳
-        if (_appendTimeTicks)
-            return $"{url}?{System.DateTime.UtcNow.Ticks}";
-        else
-            return url;
-    }
-}
-#endif

Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta

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

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

@@ -196,10 +196,10 @@ internal class WechatFileSystem : IFileSystem
 
         if (string.IsNullOrEmpty(_wxCacheRoot))
         {
-            throw new System.Exception("请配置微信小游戏缓存根目录！");
+            throw new System.Exception("请配置小游戏缓存根目录！");
         }
 
-        // 注意：CDN服务未启用的情况下，使用微信WEB服务器
+        // 注意：CDN服务未启用的情况下，使用WEB服务器
         if (RemoteServices == null)
         {
             string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);

Assets/YooAsset/Samples~/Mini Game/Runtime/YooAsset.MiniGame.asmdef

@@ -6,7 +6,8 @@
         "GUID:5efd170ecd8084500bed5692932fe14e",
         "GUID:bb21d6197862c4c3e863390dec9859a7",
         "GUID:870f26a2ffa82429195df0861505c5d5",
-        "GUID:870f26a2ffa82429195df0861505c5d5"
+        "GUID:870f26a2ffa82429195df0861505c5d5",
+        "GUID:6921e41464907054da1a045ea64ca16f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/YooAsset/Samples~/Space Shooter/GameRes/UISprite/atlas_frame.meta

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

Assets/YooAsset/Samples~/Space Shooter/GameRes/UISprite/atlas_frame/frame.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: ddd541edadc7b104393f8973da3a3f7f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameRes/UISpriteAtlas/atlas_frame.spriteatlas

@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: atlas_frame
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 1
+      compressionQuality: 50
+      maxTextureSize: 2048
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings: []
+    packingSettings:
+      serializedVersion: 2
+      padding: 2
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 0
+      enableTightPacking: 0
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 102900000, guid: 9b4f533c5ce702848a2d979731b313a5, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - ddd541edadc7b104393f8973da3a3f7f: 21300000
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: ddd541edadc7b104393f8973da3a3f7f, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - frame
+  m_RenderDataMap: {}
+  m_Tag: atlas_frame
+  m_IsVariant: 0

Assets/YooAsset/Samples~/Space Shooter/GameRes/UISpriteAtlas/atlas_frame.spriteatlas.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 999da17edd2fbfe4496de3bbf2c182ec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -22,3 +22,11 @@ MonoBehaviour:
     - CollectPath: Assets/Samples/Space Shooter/GameRes/EffectArt
     WhiteList:
     - 1c89236d45255234ebd1d39657ff7e02
+  - ScannerGUID: e5322d5d-394f-47ea-82ab-82199f8d20d8
+    ScannerName: Default Scanner
+    ScannerDesc: 
+    ScannerSchema: 5c2e5b350351d674891ef1a046654bcf
+    SaveDirectory: 
+    Collectors:
+    - CollectPath: 
+    WhiteList: []

Assets/YooAsset/Samples~/Space Shooter/GameSetting/AssetBundleCollectorConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<root Version="v2.1">
+<root Version="v2025.8.28">
   <Common ShowPackageView="False" ShowEditorAlias="False" UniqueBundleName="False" />
-  <Package PackageName="DefaultPackage" PackageDesc="" AutoAddressable="True" LocationToLower="False" IncludeAssetGUID="False" IgnoreRuleName="NormalIgnoreRule">
+  <Package PackageName="DefaultPackage" PackageDesc="" AutoAddressable="True" SupportExtensionless="True" LocationToLower="False" IncludeAssetGUID="False" IgnoreRuleName="NormalIgnoreRule">
     <Group GroupActiveRule="EnableGroup" GroupName="battle" GroupDesc="战斗" AssetTags="">
       <Collector CollectPath="Assets/Samples/Space Shooter/GameRes/Effect" CollectGUID="80d76514758554baaa96a9efffe9f3ef" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" UserData="" AssetTags="" />
       <Collector CollectPath="Assets/Samples/Space Shooter/GameRes/Entity" CollectGUID="4d7c84745db8e884f8020a8c5356e67c" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" UserData="" AssetTags="" />

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

@@ -19,20 +19,53 @@ MonoBehaviour:
   - PackageName: DefaultPackage
     PackageDesc: 
     EnableAddressable: 1
+    SupportExtensionless: 1
     LocationToLower: 0
     IncludeAssetGUID: 0
     AutoCollectShaders: 1
     IgnoreRuleName: NormalIgnoreRule
     Groups:
-    - GroupName: config
+    - GroupName: battle
-      GroupDesc: "\u914D\u7F6E"
+      GroupDesc: "\u6218\u6597"
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/Config
+      - CollectPath: Assets/Samples/Space Shooter/GameRes/Effect
-        CollectorGUID: c8af3b4cae4ac0b45920b18120610006
+        CollectorGUID: 80d76514758554baaa96a9efffe9f3ef
         CollectorType: 0
         AddressRuleName: AddressByFileName
+        PackRuleName: PackSeparately
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/Samples/Space Shooter/GameRes/Entity
+        CollectorGUID: 4d7c84745db8e884f8020a8c5356e67c
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackSeparately
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/Samples/Space Shooter/GameRes/Audio
+        CollectorGUID: 306075fbe00b24251b6c889984a7a7d5
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackSeparately
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/Samples/Space Shooter/GameRes/EffectArt
+        CollectorGUID: 08d38891fe56f75448d95b93bf3e6c5c
+        CollectorType: 2
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/Samples/Space Shooter/GameRes/EntityArt
+        CollectorGUID: b79178f10b84c764f8c91480b4fdabe8
+        CollectorType: 2
+        AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
@@ -58,54 +91,9 @@ MonoBehaviour:
         FilterRuleName: CollectShaderVariants
         AssetTags: 
         UserData: 
-    - GroupName: battle
-      GroupDesc: "\u6218\u6597"
-      AssetTags: battle
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/Effect
-        CollectorGUID: 80d76514758554baaa96a9efffe9f3ef
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/Entity
-        CollectorGUID: 4d7c84745db8e884f8020a8c5356e67c
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/Audio
-        CollectorGUID: 306075fbe00b24251b6c889984a7a7d5
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/EffectArt
-        CollectorGUID: 08d38891fe56f75448d95b93bf3e6c5c
-        CollectorType: 2
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/EntityArt
-        CollectorGUID: b79178f10b84c764f8c91480b4fdabe8
-        CollectorType: 2
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
     - GroupName: scene
       GroupDesc: "\u573A\u666F"
-      AssetTags: scene
+      AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Samples/Space Shooter/GameRes/Scene
@@ -126,14 +114,14 @@ MonoBehaviour:
         UserData: 
     - GroupName: ugui
       GroupDesc: "\u9762\u677F"
-      AssetTags: ui
+      AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Samples/Space Shooter/GameRes/UIPanel
         CollectorGUID: 12d33f33f3a55224c9c747d7bffa1c68
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
+        PackRuleName: PackSeparately
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
@@ -153,14 +141,6 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/Samples/Space Shooter/GameRes/UISpriteAtlas
-        CollectorGUID: c355c783476322b4cacac98c5e1b46d8
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackSeparately
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
       - CollectPath: Assets/Samples/Space Shooter/GameRes/UISprite
         CollectorGUID: 935d7f20c085cc141a3daf9cacfabfae
         CollectorType: 1
@@ -169,3 +149,11 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
+      - CollectPath: Assets/Samples/Space Shooter/GameRes/UISpriteAtlas
+        CollectorGUID: c355c783476322b4cacac98c5e1b46d8
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackSeparately
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 

Assets/YooAsset/Samples~/Test Sample/TestRes/SpriteAtlas/atlas_icon.spriteatlas

@@ -36,6 +36,10 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - 379c45e0c5ba5e54e8df03f52e4c7680: 21300000
+    - fcab35236e33438448805a9211b0cc19: 21300000
+    - 3b8db7241fc8ff54e9dea6fc64cfd7e5: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 379c45e0c5ba5e54e8df03f52e4c7680, type: 3}

Assets/YooAsset/package.json

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