Update CHANGELOG.md

修正2.3.11版本同步加载本地加密文件失败的问题。

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,65 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.12] - 2025-07-01
+
+### Improvements
+
+- 优化了同步接口导致的资源拷贝和资源验证性能开销高的现象。
+- 微信小游戏和抖音小游戏支持资源清单加密。
+
+### Fixed
+
+- (#579) 修复了2.3.10版本资源包构建页面里CopyBuildinFileParam无法编辑问题。
+- (#572) 修复了资源收集页面指定收集的预制体名称变动的问题。
+- (#582) 修复了非递归收集依赖时，依赖列表中才包含主资源的问题。
+
+### Added
+
+- 新增初始化参数：WebGLForceSyncLoadAsset
+
+  ```csharp
+  public abstract class InitializeParameters
+  {
+      /// <summary>
+      /// WebGL平台强制同步加载资源对象
+      /// </summary>Add commentMore actions
+      public bool WebGLForceSyncLoadAsset = false;
+  }
+  ```
+
+- (#576) 新增了资源清单服务类：IManifestServices
+
+  ```csharp
+  /// <summary>
+  /// 资源清单文件处理服务接口
+  /// </summary>
+  public interface IManifestServices
+  {
+      /// <summary>
+      /// 处理资源清单（压缩和加密）
+      /// </summary>
+      byte[] ProcessManifest(byte[] fileData);
+          
+      /// <summary>
+      /// 还原资源清单（解压和解密）
+      /// </summary>
+      byte[] RestoreManifest(byte[] fileData);
+  } 
+  ```
+
+- (#585) 新增了本地文件拷贝服务类：ICopyLocalFileServices
+
+  ```csharp
+  /// <summary>
+  /// 本地文件拷贝服务类
+  /// </summary>
+  public interface ICopyLocalFileServices
+  {
+      void CopyFile(LocalFileInfo sourceFileInfo, string destFilePath);
+  }
+  ```
+
 ## [2.3.10] - 2025-06-17
 
 ### Improvements

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -177,9 +177,6 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetDependencies(string assetPath, bool recursive)
         {
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
-
             // 注意：机制上不允许存在未收录的资源
             if (_database.ContainsKey(assetPath) == false)
             {
@@ -187,17 +184,14 @@ namespace YooAsset.Editor
             }
 
             var result = new HashSet<string>();
-            
-            // 递归收集依赖时，依赖列表中包含主资源
+
+            // 注意：递归收集依赖时，依赖列表中包含主资源
             if (recursive)
-            {
                 result.Add(assetPath);
-            }
-            
+
             // 收集依赖
             CollectDependencies(assetPath, assetPath, result, recursive);
 
-            // 注意：AssetDatabase.GetDependencies保持一致，将主资源添加到依赖列表最前面
             return result.ToArray();
         }
         private void CollectDependencies(string parent, string assetPath, HashSet<string> result, bool recursive)
@@ -263,6 +257,7 @@ namespace YooAsset.Editor
         }
         private DependencyInfo CreateDependencyInfo(string assetPath)
         {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
             var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
             var dependAssetPaths = AssetDatabase.GetDependencies(assetPath, false);
             var dependGUIDs = new List<string>();

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

@@ -93,6 +93,11 @@ namespace YooAsset
         /// 自定义参数：资源清单服务类
         /// </summary>
         public IManifestServices ManifestServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：拷贝内置文件服务类
+        /// </summary>
+        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
 
 
@@ -183,6 +188,10 @@ namespace YooAsset
             {
                 ManifestServices = (IManifestServices)value;
             }
+            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
+            {
+                CopyLocalFileServices = (ICopyLocalFileServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");
@@ -205,6 +214,7 @@ namespace YooAsset
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.INSTALL_CLEAR_MODE, InstallClearMode);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, AppendFileExtension);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, DecryptionServices);
+            _unpackFileSystem.SetParameter(FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES, CopyLocalFileServices);
             _unpackFileSystem.OnCreate(packageName, null);
         }
         public virtual void OnDestroy()

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

@@ -104,6 +104,11 @@ namespace YooAsset
         /// 自定义参数：资源清单服务类
         /// </summary>
         public IManifestServices ManifestServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：拷贝内置文件服务类
+        /// </summary>
+        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
 
 
@@ -230,6 +235,10 @@ namespace YooAsset
             {
                 ManifestServices = (IManifestServices)value;
             }
+            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
+            {
+                CopyLocalFileServices = (ICopyLocalFileServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");

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

@@ -228,10 +228,6 @@ namespace YooAsset
             {
                 if (ExecuteWhileDone())
                 {
-                    //TODO 拷贝本地文件失败也会触发该错误！
-                    if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
-                        YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote !");
-
                     _steps = ESteps.Done;
                     break;
                 }
@@ -361,10 +357,6 @@ namespace YooAsset
             {
                 if (ExecuteWhileDone())
                 {
-                    //TODO 拷贝本地文件失败也会触发该错误！
-                    if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
-                        YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote !");
-
                     _steps = ESteps.Done;
                     break;
                 }

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

@@ -82,32 +82,43 @@ namespace YooAsset
                 return oldDownloader;
             }
 
-            // 设置请求URL
+            // 获取下载地址
             if (string.IsNullOrEmpty(options.ImportFilePath))
             {
+                // 注意：如果是解压文件系统类，这里会返回本地内置文件的下载路径
                 options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
                 options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
             }
             else
             {
-                // 注意：把本地文件路径指定为远端下载地址
+                // 注意：把本地导入文件路径转换为下载器请求地址
                 options.MainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
                 options.FallbackURL = options.MainURL;
             }
 
             // 创建新的下载器
             DefaultDownloadFileOperation newDownloader;
-            if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
+            bool isRequestLocalFile = DownloadSystemHelper.IsRequestLocalFile(options.MainURL);
+            if (isRequestLocalFile)
             {
-                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, options);
+                newDownloader = new DownloadLocalFileOperation(_fileSystem, bundle, options);
                 AddChildOperation(newDownloader);
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
             else
             {
-                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, options);
-                AddChildOperation(newDownloader);
-                _downloaders.Add(bundle.BundleGUID, newDownloader);
+                if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
+                {
+                    newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, options);
+                    AddChildOperation(newDownloader);
+                    _downloaders.Add(bundle.BundleGUID, newDownloader);
+                }
+                else
+                {
+                    newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, options);
+                    AddChildOperation(newDownloader);
+                    _downloaders.Add(bundle.BundleGUID, newDownloader);
+                }
             }
             return newDownloader;
         }

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

@@ -0,0 +1,221 @@
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+    internal class DownloadLocalFileOperation : DefaultDownloadFileOperation
+    {
+        private readonly DefaultCacheFileSystem _fileSystem;
+        private VerifyTempFileOperation _verifyOperation;
+        private string _tempFilePath;
+        private ESteps _steps = ESteps.None;
+
+        internal DownloadLocalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        {
+            _fileSystem = fileSystem;
+        }
+        internal override void InternalStart()
+        {
+            _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
+            _steps = ESteps.CheckExists;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 检测文件是否存在
+            if (_steps == ESteps.CheckExists)
+            {
+                if (_fileSystem.Exists(Bundle))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    if (_fileSystem.CopyLocalFileServices != null)
+                        _steps = ESteps.CopyBuildinBundle;
+                    else
+                        _steps = ESteps.CreateRequest;
+                }
+            }
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                FileUtility.CreateFileDirectory(_tempFilePath);
+
+                // 删除临时文件
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+
+                // 获取请求地址
+                _requestURL = GetRequestURL();
+
+                // 重置请求
+                ResetRequestFiled();
+
+                // 创建下载器
+                CreateWebRequest();
+
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                {
+                    CheckRequestTimeout();
+                    return;
+                }
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                    _steps = ESteps.VerifyTempFile;
+                else
+                    _steps = ESteps.TryAgain;
+
+                // 注意：最终释放请求器
+                DisposeWebRequest();
+            }
+
+            // 拷贝内置文件
+            if (_steps == ESteps.CopyBuildinBundle)
+            {
+                FileUtility.CreateFileDirectory(_tempFilePath);
+
+                // 删除临时文件
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+
+                // 获取请求地址
+                _requestURL = GetRequestURL();
+
+                try
+                {
+                    //TODO 团结引擎，在某些机型（红米），拷贝包内文件会小概率失败！需要借助其它方式来拷贝包内文件。
+                    var localFileInfo = new LocalFileInfo();
+                    localFileInfo.PackageName = _fileSystem.PackageName;
+                    localFileInfo.BundleName = Bundle.BundleName;
+                    localFileInfo.SourceFileURL = _requestURL;
+                    _fileSystem.CopyLocalFileServices.CopyFile(localFileInfo, _tempFilePath);
+                    if (File.Exists(_tempFilePath))
+                    {
+                        DownloadProgress = 1f;
+                        DownloadedBytes = Bundle.FileSize;
+                        Progress = DownloadProgress;
+                        _steps = ESteps.VerifyTempFile;
+                    }
+                    else
+                    {
+                        Error = $"Failed copy local file : {_requestURL}";
+                        _steps = ESteps.TryAgain;
+                    }
+                }
+                catch (System.Exception ex)
+                {
+                    Error = $"Failed copy local file : {ex.Message}";
+                    _steps = ESteps.TryAgain;
+                }
+            }
+
+            // 验证下载文件
+            if (_steps == ESteps.VerifyTempFile)
+            {
+                var element = new TempFileElement(_tempFilePath, Bundle.FileCRC, Bundle.FileSize);
+                _verifyOperation = new VerifyTempFileOperation(element);
+                _verifyOperation.StartOperation();
+                AddChildOperation(_verifyOperation);
+                _steps = ESteps.CheckVerifyTempFile;
+            }
+
+            // 等待验证完成
+            if (_steps == ESteps.CheckVerifyTempFile)
+            {
+                if (IsWaitForAsyncComplete)
+                    _verifyOperation.WaitForAsyncComplete();
+
+                _verifyOperation.UpdateOperation();
+                if (_verifyOperation.IsDone == false)
+                    return;
+
+                if (_verifyOperation.Status == EOperationStatus.Succeed)
+                {
+                    if (_fileSystem.WriteCacheBundleFile(Bundle, _tempFilePath))
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"{_fileSystem.GetType().FullName} failed to write file !";
+                        YooLogger.Error(Error);
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.TryAgain;
+                    Error = _verifyOperation.Error;
+                }
+
+                // 注意：验证完成后直接删除文件
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                //TODO 拷贝本地文件失败后不再尝试！
+                Status = EOperationStatus.Failed;
+                _steps = ESteps.Done;
+                YooLogger.Error(Error);
+            }
+        }
+        internal override void InternalAbort()
+        {
+            _steps = ESteps.Done;
+            DisposeWebRequest();
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                //TODO 等待导入或解压本地文件完毕，该操作会挂起主线程！
+                InternalUpdate();
+                if (IsDone)
+                    break;
+
+                // 短暂休眠避免完全卡死
+                System.Threading.Thread.Sleep(1);
+            }
+        }
+
+        private void CreateWebRequest()
+        {
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
+            handler.removeFileOnAbort = true;
+            _webRequest.downloadHandler = handler;
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _webRequest.SendWebRequest();
+        }
+        private void DisposeWebRequest()
+        {
+            if (_webRequest != null)
+            {
+                //注意：引擎底层会自动调用Abort方法
+                _webRequest.Dispose();
+                _webRequest = null;
+            }
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadLocalFileOperation.cs.meta

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

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

@@ -8,7 +8,6 @@ namespace YooAsset
     {
         private readonly DefaultCacheFileSystem _fileSystem;
         private VerifyTempFileOperation _verifyOperation;
-        private bool _isReuqestLocalFile;
         private string _tempFilePath;
         private ESteps _steps = ESteps.None;
 
@@ -18,7 +17,6 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
             _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }
@@ -133,15 +131,6 @@ namespace YooAsset
             // 重新尝试下载
             if (_steps == ESteps.TryAgain)
             {
-                //TODO 拷贝本地文件失败后不再尝试！
-                if (_isReuqestLocalFile)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
                 if (FailedTryAgain <= 0)
                 {
                     Status = EOperationStatus.Failed;
@@ -168,23 +157,17 @@ namespace YooAsset
         {
             while (true)
             {
-                //TODO 如果是导入或解压本地文件，执行等待完毕，该操作会挂起主线程！
-                if (_isReuqestLocalFile)
+                if (ExecuteWhileDone())
                 {
-                    InternalUpdate();
-                    if (IsDone)
-                        break;
-
-                    // 短暂休眠避免完全卡死
-                    System.Threading.Thread.Sleep(1);
-                }
-                else
-                {
-                    if (ExecuteWhileDone())
+                    //TODO 尝试同步加载远端的资源文件失败
+                    if (Status == EOperationStatus.Failed)
                     {
-                        _steps = ESteps.Done;
-                        break;
+                        YooLogger.Error($"Try load bundle {Bundle.BundleName} from remote !");
+                        YooLogger.Error($"The load remote bundle url : {_requestURL}");
                     }
+
+                    _steps = ESteps.Done;
+                    break;
                 }
             }
         }

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

@@ -9,19 +9,16 @@ namespace YooAsset
         private readonly DefaultCacheFileSystem _fileSystem;
         private DownloadHandlerFileRange _downloadHandle;
         private VerifyTempFileOperation _verifyOperation;
-        private bool _isReuqestLocalFile;
         private long _fileOriginLength = 0;
         private string _tempFilePath;
         private ESteps _steps = ESteps.None;
 
-
         internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
             _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }
@@ -152,15 +149,6 @@ namespace YooAsset
             // 重新尝试下载
             if (_steps == ESteps.TryAgain)
             {
-                //TODO 拷贝本地文件失败后不再尝试！
-                if (_isReuqestLocalFile)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
                 if (FailedTryAgain <= 0)
                 {
                     Status = EOperationStatus.Failed;
@@ -187,23 +175,17 @@ namespace YooAsset
         {
             while (true)
             {
-                //TODO 如果是导入或解压本地文件，执行等待完毕，该操作会挂起主线程！
-                if (_isReuqestLocalFile)
+                if (ExecuteWhileDone())
                 {
-                    InternalUpdate();
-                    if (IsDone)
-                        break;
-
-                    // 短暂休眠避免完全卡死
-                    System.Threading.Thread.Sleep(1);
-                }
-                else
-                {
-                    if (ExecuteWhileDone())
+                    //TODO 尝试同步加载远端的资源文件失败
+                    if (Status == EOperationStatus.Failed)
                     {
-                        _steps = ESteps.Done;
-                        break;
+                        YooLogger.Error($"Try load bundle {Bundle.BundleName} from remote !");
+                        YooLogger.Error($"The load remote bundle url : {_requestURL}");
                     }
+
+                    _steps = ESteps.Done;
+                    break;
                 }
             }
         }

Assets/YooAsset/Runtime/FileSystem/FileSystemParametersDefine.cs

@@ -19,5 +19,6 @@ namespace YooAsset
         public const string ASYNC_SIMULATE_MAX_FRAME = "ASYNC_SIMULATE_MAX_FRAME";
         public const string COPY_BUILDIN_PACKAGE_MANIFEST = "COPY_BUILDIN_PACKAGE_MANIFEST";
         public const string COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT = "COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT";
+        public const string COPY_LOCAL_FILE_SERVICES = "COPY_LOCAL_FILE_SERVICES";
     }
 }

Assets/YooAsset/Runtime/FileSystem/Operation/FSDownloadFileOperation.cs

@@ -24,7 +24,7 @@ namespace YooAsset
         public string FallbackURL { set; get; }
 
         /// <summary>
-        /// 导入的本地文件路径
+        /// 拷贝的本地文件路径
         /// </summary>
         public string ImportFilePath { set; get; }
 

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DefaultDownloadFileOperation.cs

@@ -11,6 +11,7 @@ namespace YooAsset
             CheckExists,
             CreateRequest,
             CheckRequest,
+            CopyBuildinBundle,
             VerifyTempFile,
             CheckVerifyTempFile,
             TryAgain,

Assets/YooAsset/Runtime/Services/ICopyLocalFileServices.cs

@@ -0,0 +1,30 @@
+
+namespace YooAsset
+{
+    public struct LocalFileInfo
+    {
+        /// <summary>
+        /// 包裹名称
+        /// </summary>
+        public string PackageName;
+
+        /// <summary>
+        /// 资源包名称
+        /// </summary>
+        public string BundleName;
+
+        /// <summary>
+        /// 源文件请求地址
+        /// </summary>
+        public string SourceFileURL;
+    }
+
+    /// <summary>
+    /// 本地文件拷贝服务类
+    /// 备注：包体内文件拷贝，沙盒内文件导入都会触发该服务！
+    /// </summary>
+    public interface ICopyLocalFileServices
+    {
+        void CopyFile(LocalFileInfo sourceFileInfo, string destFilePath);
+    }
+}

Assets/YooAsset/Runtime/Services/ICopyLocalFileServices.cs.meta

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

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using YooAsset;
+
+/// <summary>
+/// 获取包体里的内置资源清单版本
+/// </summary>
+public class GetBuildinPackageVersionOperation : GameAsyncOperation
+{
+    private enum ESteps
+    {
+        None,
+        GetPackageVersion,
+        Done,
+    }
+
+    private readonly string _packageName;
+    private UnityWebTextRequestOperation _versionFileRequestOp;
+    private ESteps _steps = ESteps.None;
+
+    /// <summary>
+    /// 内置资源清单版本
+    /// </summary>
+    public string PackageVersion { private set; get; }
+
+    public GetBuildinPackageVersionOperation(string packageName)
+    {
+        _packageName = packageName;
+    }
+    protected override void OnStart()
+    {
+        _steps = ESteps.GetPackageVersion;
+    }
+    protected override void OnUpdate()
+    {
+        if (_steps == ESteps.None || _steps == ESteps.Done)
+            return;
+
+        if (_steps == ESteps.GetPackageVersion)
+        {
+            if (_versionFileRequestOp == null)
+            {
+                string filePath = GetBuildinPackageVersionFilePath();
+                string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
+                _versionFileRequestOp = new UnityWebTextRequestOperation(url);
+                OperationSystem.StartOperation(_packageName, _versionFileRequestOp);
+            }
+
+            if (_versionFileRequestOp.IsDone == false)
+                return;
+
+            if (_versionFileRequestOp.Status == EOperationStatus.Succeed)
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+                PackageVersion = _versionFileRequestOp.Result;
+            }
+            else
+            {
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Failed;
+                Error = _versionFileRequestOp.Error;
+            }
+        }
+    }
+    protected override void OnAbort()
+    {
+    }
+
+    private string GetBuildinYooRoot()
+    {
+        return YooAssetSettingsData.GetYooDefaultBuildinRoot();
+    }
+    private string GetBuildinPackageVersionFilePath()
+    {
+        string fileRoot = GetBuildinYooRoot();
+        string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+        return PathUtility.Combine(fileRoot, _packageName, fileName);
+    }
+}

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionOperation/GetBuildinPackageVersionOperation.cs.meta

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

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

@@ -92,7 +92,7 @@ internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
         {
             if (_deserializer == null)
             {
-                _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
+                _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                 _deserializer.StartOperation();
                 AddChildOperation(_deserializer);
             }

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

@@ -103,6 +103,11 @@ internal class TiktokFileSystem : IFileSystem
     ///  自定义参数：解密方法类
     /// </summary>
     public IWebDecryptionServices DecryptionServices { private set; get; }
+
+    /// <summary>
+    /// 自定义参数：资源清单服务类
+    /// </summary>
+    public IManifestServices ManifestServices { private set; get; }
     #endregion
 
 
@@ -161,6 +166,10 @@ internal class TiktokFileSystem : IFileSystem
         {
             DecryptionServices = (IWebDecryptionServices)value;
         }
+        else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+        {
+            ManifestServices = (IManifestServices)value;
+        }
         else
         {
             YooLogger.Warning($"Invalid parameter : {name}");

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

@@ -92,7 +92,7 @@ internal class LoadWechatPackageManifestOperation : AsyncOperationBase
         {
             if (_deserializer == null)
             {
-                _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
+                _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                 _deserializer.StartOperation();
                 AddChildOperation(_deserializer);
             }

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

@@ -104,6 +104,11 @@ internal class WechatFileSystem : IFileSystem
     ///  自定义参数：解密方法类
     /// </summary>
     public IWebDecryptionServices DecryptionServices { private set; get; }
+
+    /// <summary>
+    /// 自定义参数：资源清单服务类
+    /// </summary>
+    public IManifestServices ManifestServices { private set; get; }
     #endregion
 
 
@@ -176,6 +181,10 @@ internal class WechatFileSystem : IFileSystem
         {
             DecryptionServices = (IWebDecryptionServices)value;
         }
+        else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+        {
+            ManifestServices = (IManifestServices)value;
+        }
         else
         {
             YooLogger.Warning($"Invalid parameter : {name}");

Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs

@@ -71,7 +71,8 @@ public static class TestPackageBuilder
             buildParameters.ClearBuildCacheFiles = true;
             buildParameters.UseAssetDependencyDB = true;
             buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
-            buildParameters.EncryptionServices = new FileStreamTestEncryption();
+            buildParameters.EncryptionServices = new TestFileStreamEncryption();
+            buildParameters.ManifestServices = new TestProcessManifest();
 
             var pipeline = new ScriptableBuildPipeline();
             BuildResult buildResult = pipeline.Run(buildParameters, false);
@@ -108,7 +109,8 @@ public static class TestPackageBuilder
             buildParameters.CompressOption = ECompressOption.LZ4;
             buildParameters.ClearBuildCacheFiles = true;
             buildParameters.UseAssetDependencyDB = true;
-            buildParameters.EncryptionServices = new FileStreamTestEncryption();
+            buildParameters.EncryptionServices = new TestFileStreamEncryption();
+            buildParameters.ManifestServices = new TestProcessManifest();
 
             var pipeline = new BuiltinBuildPipeline();
             BuildResult buildResult = pipeline.Run(buildParameters, false);

Assets/YooAsset/Samples~/Test Sample/Runtime/T0_InitYooAssets/T0_InitYooAssets.cs

@@ -168,14 +168,14 @@ public class T0_InitYooAssets : IPrebuildSetup, IPostBuildCleanup
             collector1.CollectPath = "";
             collector1.CollectorGUID = "e082d492b9da65e499cee3495be3645d"; //TestRes3/music目录
             collector1.CollectorType = YooAsset.Editor.ECollectorType.MainAssetCollector;
-            collector1.PackRuleName = nameof(YooAsset.Editor.PackDirectory);
+            collector1.PackRuleName = nameof(YooAsset.Editor.PackSeparately);
             YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(referenceGroup, collector1);
 
             var collector2 = new YooAsset.Editor.AssetBundleCollector();
             collector2.CollectPath = "";
             collector2.CollectorGUID = "8c5a1726d94498e4cbe30f5f510cc796"; //TestRes3/prefab目录
             collector2.CollectorType = YooAsset.Editor.ECollectorType.MainAssetCollector;
-            collector2.PackRuleName = nameof(YooAsset.Editor.PackDirectory);
+            collector2.PackRuleName = nameof(YooAsset.Editor.PackSeparately);
             YooAsset.Editor.AssetBundleCollectorSettingData.CreateCollector(referenceGroup, collector2);
         }
     }

Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/T2_TestBuldinFileSystem.cs

@@ -47,7 +47,7 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
     [UnityTest]
     public IEnumerator A_InitializePackage()
     {
-        // 初始化资源包
+        // 初始化资源包 ASSET_BUNDLE
         {
             string packageRoot = string.Empty;
 #if UNITY_EDITOR
@@ -60,8 +60,11 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
 
             // 初始化资源包
             var initParams = new OfflinePlayModeParameters();
-            var decryption = new FileStreamTestDecryption();
-            initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(decryption, packageRoot);
+            var fileDecryption = new TestFileStreamDecryption();
+            var manifestProcess = new TestProcessManifest();
+            initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(fileDecryption, packageRoot);
+            initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true);
+            initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.MANIFEST_SERVICES, manifestProcess);
             var initializeOp = package.InitializeAsync(initParams);
             yield return initializeOp;
             if (initializeOp.Status != EOperationStatus.Succeed)
@@ -83,7 +86,7 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
             Assert.AreEqual(EOperationStatus.Succeed, updateManifestOp.Status);
         }
 
-        // 初始化资源包
+        // 初始化资源包 RAW_BUNDLE
         {
             string packageRoot = string.Empty;
 #if UNITY_EDITOR
@@ -98,6 +101,7 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
             var initParams = new OfflinePlayModeParameters();
             initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(null, packageRoot);
             initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, true);
+            initParams.BuildinFileSystemParameters.AddParameter(FileSystemParametersDefine.DISABLE_CATALOG_FILE, true);
             var initializeOp = package.InitializeAsync(initParams);
             yield return initializeOp;
             if (initializeOp.Status != EOperationStatus.Succeed)

Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestBundleEncryption.cs

@@ -13,9 +13,22 @@ public class TestBundleEncryption
         ResourcePackage package = YooAssets.GetPackage(TestDefine.AssetBundlePackageName);
         Assert.IsNotNull(package);
 
-        // 加载音乐播放预制体
+        // 异步加载音乐播放预制体
         {
-            var assetHandle = package.LoadAssetAsync<GameObject>("prefab_audio");
+            var assetHandle = package.LoadAssetAsync<GameObject>("prefab_audioA");
+            yield return assetHandle;
+            Assert.AreEqual(EOperationStatus.Succeed, assetHandle.Status);
+
+            var go = assetHandle.InstantiateSync(Vector3.zero, Quaternion.identity);
+            Assert.IsNotNull(go);
+
+            var audioSource = go.GetComponent<AudioSource>();
+            Assert.IsNotNull(audioSource.clip);
+        }
+
+        // 同步加载音乐播放预制体
+        {
+            var assetHandle = package.LoadAssetSync<GameObject>("prefab_audioB");
             yield return assetHandle;
             Assert.AreEqual(EOperationStatus.Succeed, assetHandle.Status);
 
@@ -34,7 +47,7 @@ public class TestBundleEncryption
 /// <summary>
 /// 文件流加密方式
 /// </summary>
-public class FileStreamTestEncryption : IEncryptionServices
+public class TestFileStreamEncryption : IEncryptionServices
 {
     public EncryptResult Encrypt(EncryptFileInfo fileInfo)
     {
@@ -64,7 +77,7 @@ public class FileStreamTestEncryption : IEncryptionServices
 /// <summary>
 /// 文件偏移加密方式
 /// </summary>
-public class FileOffsetTestEncryption : IEncryptionServices
+public class TestFileOffsetEncryption : IEncryptionServices
 {
     public EncryptResult Encrypt(EncryptFileInfo fileInfo)
     {
@@ -119,7 +132,7 @@ public class BundleStream : FileStream
 /// <summary>
 /// 资源文件流解密类
 /// </summary>
-public class FileStreamTestDecryption : IDecryptionServices
+public class TestFileStreamDecryption : IDecryptionServices
 {
     /// <summary>
     /// 同步方式获取解密的资源包对象
@@ -180,7 +193,7 @@ public class FileStreamTestDecryption : IDecryptionServices
 /// <summary>
 /// 资源文件偏移解密类
 /// </summary>
-public class FileOffsetTestDecryption : IDecryptionServices
+public class TestFileOffsetDecryption : IDecryptionServices
 {
     /// <summary>
     /// 同步方式获取解密的资源包对象
@@ -240,7 +253,7 @@ public class FileOffsetTestDecryption : IDecryptionServices
 /// WebGL平台解密类
 /// 注意：WebGL平台支持内存解密
 /// </summary>
-public class WebFileStreamTestDecryption : IWebDecryptionServices
+public class TestWebFileStreamDecryption : IWebDecryptionServices
 {
     public WebDecryptResult LoadAssetBundle(WebDecryptFileInfo fileInfo)
     {

Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestProcessManifest.cs

@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+using UnityEngine;
+using NUnit.Framework;
+using YooAsset;
+
+public class TestProcessManifest : IManifestServices
+{
+    public byte[] ProcessManifest(byte[] fileData)
+    {
+        return XorProcess(fileData, "YOO");
+    }
+    public byte[] RestoreManifest(byte[] fileData)
+    {
+        return XorProcess(fileData, "YOO");
+    }
+
+    /// <summary>
+    /// 使用异或加密/解密字节数组
+    /// </summary>
+    /// <param name="data">输入数据</param>
+    /// <param name="key">加密密钥</param>
+    /// <returns>处理后的字节数组</returns>
+    public static byte[] XorProcess(byte[] data, byte[] key)
+    {
+        if (data == null)
+            throw new ArgumentNullException(nameof(data));
+
+        if (key == null || key.Length == 0)
+            throw new ArgumentException("Key cannot be null or empty");
+
+        byte[] result = new byte[data.Length];
+        for (int i = 0; i < data.Length; i++)
+        {
+            // 循环使用密钥中的字节
+            result[i] = (byte)(data[i] ^ key[i % key.Length]);
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// 使用字符串密钥进行异或处理（自动转换编码）
+    /// </summary>
+    /// <param name="data">输入数据</param>
+    /// <param name="key">字符串密钥</param>
+    /// <returns>处理后的字节数组</returns>
+    public static byte[] XorProcess(byte[] data, string key)
+    {
+        byte[] keyBytes = System.Text.Encoding.UTF8.GetBytes(key);
+        return XorProcess(data, keyBytes);
+    }
+}

Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestProcessManifest.cs.meta

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

Assets/YooAsset/Samples~/Test Sample/TestRes3/music/music_encryptB.wav.meta

@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 502e4faa60c5fc441a6a8ae9a61fbf35
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 1
+    quality: 0.5
+    conversionMode: 0
+    preloadAudioData: 1
+  platformSettingOverrides:
+    1:
+      serializedVersion: 2
+      loadType: 2
+      sampleRateSetting: 0
+      sampleRateOverride: 0
+      compressionFormat: 1
+      quality: 0.5
+      conversionMode: 0
+      preloadAudioData: 1
+    4:
+      serializedVersion: 2
+      loadType: 2
+      sampleRateSetting: 0
+      sampleRateOverride: 0
+      compressionFormat: 1
+      quality: 0.5
+      conversionMode: 0
+      preloadAudioData: 1
+    7:
+      serializedVersion: 2
+      loadType: 2
+      sampleRateSetting: 0
+      sampleRateOverride: 0
+      compressionFormat: 1
+      quality: 0.5
+      conversionMode: 0
+      preloadAudioData: 1
+    13:
+      serializedVersion: 2
+      loadType: 2
+      sampleRateSetting: 2
+      sampleRateOverride: 44100
+      compressionFormat: 7
+      quality: 0.5
+      conversionMode: 0
+      preloadAudioData: 1
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioA.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 8364371343008149393}
   - component: {fileID: 7423861191467597400}
   m_Layer: 0
-  m_Name: prefab_audio
+  m_Name: prefab_audioA
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab

@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3749121449083481702
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1740794871874781600}
+  - component: {fileID: 8364371343008149393}
+  - component: {fileID: 7423861191467597400}
+  m_Layer: 0
+  m_Name: prefab_audioB
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1740794871874781600
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3749121449083481702}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.5441012, y: -1.4355755, z: -5.0895267}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &8364371343008149393
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3749121449083481702}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 502e4faa60c5fc441a6a8ae9a61fbf35, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!81 &7423861191467597400
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3749121449083481702}
+  m_Enabled: 1

Assets/YooAsset/Samples~/Test Sample/TestRes3/prefab/prefab_audioB.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ea7f727cf3cd1b7499c5431e766891c3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/package.json

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