yoo2.2,9

yoo2.2,9

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs

@@ -0,0 +1,131 @@
+
+namespace YooAsset
+{
+    public abstract class ClearCacheFilesOperation : AsyncOperationBase
+    {
+    }
+    internal sealed class ClearCacheFilesImplOperation : ClearCacheFilesOperation
+    {
+        private enum ESteps
+        {
+            None,
+            ClearFileSystemA,
+            ClearFileSystemB,
+            ClearFileSystemC,
+            Done,
+        }
+
+        private readonly IPlayMode _impl;
+        private readonly IFileSystem _fileSystemA;
+        private readonly IFileSystem _fileSystemB;
+        private readonly IFileSystem _fileSystemC;
+        private readonly string _clearMode;
+        private readonly object _clearParam;
+        private FSClearCacheFilesOperation _clearCacheFilesOpA;
+        private FSClearCacheFilesOperation _clearCacheFilesOpB;
+        private FSClearCacheFilesOperation _clearCacheFilesOpC;
+        private ESteps _steps = ESteps.None;
+        
+        internal ClearCacheFilesImplOperation(IPlayMode impl, IFileSystem fileSystemA, IFileSystem fileSystemB, IFileSystem fileSystemC, string clearMode, object clearParam)
+        {
+            _impl = impl;
+            _fileSystemA = fileSystemA;
+            _fileSystemB = fileSystemB;
+            _fileSystemC = fileSystemC;
+            _clearMode = clearMode;
+            _clearParam = clearParam;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.ClearFileSystemA;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.ClearFileSystemA)
+            {
+                if (_fileSystemA == null)
+                {
+                    _steps = ESteps.ClearFileSystemB;
+                    return;
+                }
+
+                if (_clearCacheFilesOpA == null)
+                    _clearCacheFilesOpA = _fileSystemA.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
+
+                Progress = _clearCacheFilesOpA.Progress;
+                if (_clearCacheFilesOpA.IsDone == false)
+                    return;
+
+                if (_clearCacheFilesOpA.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.ClearFileSystemB;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _clearCacheFilesOpA.Error;
+                }
+            }
+
+            if (_steps == ESteps.ClearFileSystemB)
+            {
+                if (_fileSystemB == null)
+                {
+                    _steps = ESteps.ClearFileSystemC;
+                    return;
+                }
+
+                if (_clearCacheFilesOpB == null)
+                    _clearCacheFilesOpB = _fileSystemB.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
+
+                Progress = _clearCacheFilesOpB.Progress;
+                if (_clearCacheFilesOpB.IsDone == false)
+                    return;
+
+                if (_clearCacheFilesOpB.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.ClearFileSystemC;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _clearCacheFilesOpB.Error;
+                }
+            }
+
+            if (_steps == ESteps.ClearFileSystemC)
+            {
+                if (_fileSystemC == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                    return;
+                }
+
+                if (_clearCacheFilesOpC == null)
+                    _clearCacheFilesOpC = _fileSystemC.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
+
+                Progress = _clearCacheFilesOpC.Progress;
+                if (_clearCacheFilesOpC.IsDone == false)
+                    return;
+
+                if (_clearCacheFilesOpC.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _clearCacheFilesOpC.Error;
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5067db2d5b2aa1240aef2f9a952a2e0c
+guid: 37b4e645f7a679f4fa978c55329ee01a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/DestroyOperation.cs

@@ -0,0 +1,67 @@
+
+namespace YooAsset
+{
+    public class DestroyOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            UnloadAllAssets,
+            DestroyPackage,
+            Done,
+        }
+
+        private readonly ResourcePackage _resourcePackage;
+        private UnloadAllAssetsOperation _unloadAllAssetsOp;
+        private ESteps _steps = ESteps.None;
+
+
+        public DestroyOperation(ResourcePackage resourcePackage)
+        {
+            _resourcePackage = resourcePackage;
+        }
+
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.UnloadAllAssets;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.UnloadAllAssets)
+            {
+                if (_unloadAllAssetsOp == null)
+                    _unloadAllAssetsOp = _resourcePackage.UnloadAllAssetsAsync();
+
+                if (_unloadAllAssetsOp.IsDone == false)
+                    return;
+
+                if (_unloadAllAssetsOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.DestroyPackage;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _unloadAllAssetsOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.DestroyPackage)
+            {
+                // 销毁包裹
+                _resourcePackage.DestroyPackage();
+
+                // 最后清理该包裹的异步任务
+                // 注意：对于有线程操作的异步任务，需要保证线程安全释放。
+                OperationSystem.ClearPackageOperation(_resourcePackage.PackageName);
+
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/DestroyOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fccaa9437207a174d858ce44f14f5a03
+guid: 61a8757fa3c6b5c42a45e97198a645a4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs

@@ -15,20 +15,36 @@ namespace YooAsset
 
         private const int MAX_LOADER_COUNT = 64;
 
-        public delegate void OnDownloadOver(bool isSucceed);
-        public delegate void OnDownloadProgress(int totalDownloadCount, int currentDownloadCount, long totalDownloadBytes, long currentDownloadBytes);
-        public delegate void OnDownloadError(string fileName, string error);
-        public delegate void OnStartDownloadFile(string fileName, long sizeBytes);
+        #region 委托定义
+        /// <summary>
+        /// 下载器结束
+        /// </summary>
+        public delegate void DownloaderFinish(DownloaderFinishData data);
+
+        /// <summary>
+        /// 下载进度更新
+        /// </summary>
+        public delegate void DownloadUpdate(DownloadUpdateData data);
+
+        /// <summary>
+        /// 下载发生错误
+        /// </summary>
+        public delegate void DownloadError(DownloadErrorData data);
+
+        /// <summary>
+        /// 开始下载某个文件
+        /// </summary>
+        public delegate void DownloadFileBegin(DownloadFileData data);
+        #endregion
 
-        private readonly DownloadManager _downloadMgr;
         private readonly string _packageName;
         private readonly int _downloadingMaxNumber;
         private readonly int _failedTryAgain;
         private readonly int _timeout;
         private readonly List<BundleInfo> _bundleInfoList;
-        private readonly List<DownloaderBase> _downloaders = new List<DownloaderBase>(MAX_LOADER_COUNT);
-        private readonly List<DownloaderBase> _removeList = new List<DownloaderBase>(MAX_LOADER_COUNT);
-        private readonly List<DownloaderBase> _failedList = new List<DownloaderBase>(MAX_LOADER_COUNT);
+        private readonly List<FSDownloadFileOperation> _downloaders = new List<FSDownloadFileOperation>(MAX_LOADER_COUNT);
+        private readonly List<FSDownloadFileOperation> _removeList = new List<FSDownloadFileOperation>(MAX_LOADER_COUNT);
+        private readonly List<FSDownloadFileOperation> _failedList = new List<FSDownloadFileOperation>(MAX_LOADER_COUNT);
 
         // 数据相关
         private bool _isPause = false;
@@ -68,27 +84,26 @@ namespace YooAsset
         /// <summary>
         /// 当下载器结束（无论成功或失败）
         /// </summary>
-        public OnDownloadOver OnDownloadOverCallback { set; get; }
+        public DownloaderFinish DownloadFinishCallback { set; get; }
 
         /// <summary>
         /// 当下载进度发生变化
         /// </summary>
-        public OnDownloadProgress OnDownloadProgressCallback { set; get; }
+        public DownloadUpdate DownloadUpdateCallback { set; get; }
 
         /// <summary>
-        /// 当某个文件下载失败
+        /// 当下载器发生错误
         /// </summary>
-        public OnDownloadError OnDownloadErrorCallback { set; get; }
+        public DownloadError DownloadErrorCallback { set; get; }
 
         /// <summary>
         /// 当开始下载某个文件
         /// </summary>
-        public OnStartDownloadFile OnStartDownloadFileCallback { set; get; }
+        public DownloadFileBegin DownloadFileBeginCallback { set; get; }
+        
 
-
-        internal DownloaderOperation(DownloadManager downloadMgr, string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+        internal DownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
-            _downloadMgr = downloadMgr;
             _packageName = packageName;
             _bundleInfoList = downloadList;
             _downloadingMaxNumber = UnityEngine.Mathf.Clamp(downloadingMaxNumber, 1, MAX_LOADER_COUNT); ;
@@ -103,7 +118,7 @@ namespace YooAsset
         }
         internal override void InternalOnStart()
         {
-            YooLogger.Log($"Begine to download : {TotalDownloadCount} files and {TotalDownloadBytes} bytes");
+            YooLogger.Log($"Begine to download {TotalDownloadCount} files and {TotalDownloadBytes} bytes");
             _steps = ESteps.Check;
         }
         internal override void InternalOnUpdate()
@@ -132,12 +147,12 @@ namespace YooAsset
                 long downloadBytes = _cachedDownloadBytes;
                 foreach (var downloader in _downloaders)
                 {
-                    downloadBytes += (long)downloader.DownloadedBytes;
-                    if (downloader.IsDone() == false)
+                    downloadBytes += downloader.DownloadedBytes;
+                    if (downloader.IsDone == false)
                         continue;
 
                     // 检测是否下载失败
-                    if (downloader.HasError())
+                    if (downloader.Status != EOperationStatus.Succeed)
                     {
                         _removeList.Add(downloader);
                         _failedList.Add(downloader);
@@ -147,13 +162,13 @@ namespace YooAsset
                     // 下载成功
                     _removeList.Add(downloader);
                     _cachedDownloadCount++;
-                    _cachedDownloadBytes += downloader.GetDownloadFileSize();
+                    _cachedDownloadBytes += downloader.DownloadedBytes;
                 }
 
                 // 移除已经完成的下载器（无论成功或失败）
-                foreach (var loader in _removeList)
+                foreach (var downloader in _removeList)
                 {
-                    _downloaders.Remove(loader);
+                    _downloaders.Remove(downloader);
                 }
 
                 // 如果下载进度发生变化
@@ -162,7 +177,18 @@ namespace YooAsset
                     _lastDownloadBytes = downloadBytes;
                     _lastDownloadCount = _cachedDownloadCount;
                     Progress = (float)_lastDownloadBytes / TotalDownloadBytes;
-                    OnDownloadProgressCallback?.Invoke(TotalDownloadCount, _lastDownloadCount, TotalDownloadBytes, _lastDownloadBytes);
+
+                    if (DownloadUpdateCallback != null)
+                    {
+                        var data = new DownloadUpdateData();
+                        data.PackageName = _packageName;
+                        data.Progress = Progress;
+                        data.TotalDownloadCount = TotalDownloadCount;
+                        data.CurrentDownloadCount = _lastDownloadCount;
+                        data.TotalDownloadBytes = TotalDownloadBytes;
+                        data.CurrentDownloadBytes = _lastDownloadBytes;
+                        DownloadUpdateCallback.Invoke(data);
+                    }
                 }
 
                 // 动态创建新的下载器到最大数量限制
@@ -177,10 +203,17 @@ namespace YooAsset
                         int index = _bundleInfoList.Count - 1;
                         var bundleInfo = _bundleInfoList[index];
                         var downloader = bundleInfo.CreateDownloader(_failedTryAgain, _timeout);
-                        downloader.SendRequest();
                         _downloaders.Add(downloader);
                         _bundleInfoList.RemoveAt(index);
-                        OnStartDownloadFileCallback?.Invoke(bundleInfo.Bundle.BundleName, bundleInfo.Bundle.FileSize);
+
+                        if (DownloadFileBeginCallback != null)
+                        {
+                            var data = new DownloadFileData();
+                            data.PackageName = _packageName;
+                            data.FileName = bundleInfo.Bundle.BundleName;
+                            data.FileSize = bundleInfo.Bundle.FileSize;
+                            DownloadFileBeginCallback.Invoke(data);
+                        }
                     }
                 }
 
@@ -190,19 +223,41 @@ namespace YooAsset
                     if (_failedList.Count > 0)
                     {
                         var failedDownloader = _failedList[0];
-                        string bundleName = failedDownloader.GetDownloadBundleName();
+                        string bundleName = failedDownloader.Bundle.BundleName;
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
                         Error = $"Failed to download file : {bundleName}";
-                        OnDownloadErrorCallback?.Invoke(bundleName, failedDownloader.GetLastError());
-                        OnDownloadOverCallback?.Invoke(false);
+
+                        if (DownloadErrorCallback != null)
+                        {
+                            var data = new DownloadErrorData();
+                            data.PackageName = _packageName;
+                            data.FileName = bundleName;
+                            data.ErrorInfo = failedDownloader.Error;
+                            DownloadErrorCallback.Invoke(data);
+                        }
+
+                        if (DownloadFinishCallback != null)
+                        {
+                            var data = new DownloaderFinishData();
+                            data.PackageName = _packageName;
+                            data.Succeed = false;
+                            DownloadFinishCallback.Invoke(data);
+                        }
                     }
                     else
                     {
                         // 结算成功
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Succeed;
-                        OnDownloadOverCallback?.Invoke(true);
+
+                        if (DownloadFinishCallback != null)
+                        {
+                            var data = new DownloaderFinishData();
+                            data.PackageName = _packageName;
+                            data.Succeed = true;
+                            DownloadFinishCallback.Invoke(data);
+                        }
                     }
                 }
             }
@@ -246,16 +301,18 @@ namespace YooAsset
             HashSet<string> temper = new HashSet<string>();
             foreach (var bundleInfo in _bundleInfoList)
             {
-                if (temper.Contains(bundleInfo.CachedDataFilePath) == false)
+                string combineGUID = bundleInfo.GetDownloadCombineGUID();
+                if (temper.Contains(combineGUID) == false)
                 {
-                    temper.Add(bundleInfo.CachedDataFilePath);
+                    temper.Add(combineGUID);
                 }
             }
 
             // 合并下载列表
             foreach (var bundleInfo in downloader._bundleInfoList)
             {
-                if (temper.Contains(bundleInfo.CachedDataFilePath) == false)
+                string combineGUID = bundleInfo.GetDownloadCombineGUID();
+                if (temper.Contains(combineGUID) == false)
                 {
                     _bundleInfoList.Add(bundleInfo);
                 }
@@ -272,7 +329,7 @@ namespace YooAsset
         {
             if (_steps == ESteps.None)
             {
-                OperationSystem.StartOperation(this);
+                OperationSystem.StartOperation(_packageName, this);
             }
         }
 
@@ -302,69 +359,63 @@ namespace YooAsset
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
                 Error = "User cancel.";
-                ReleaseAllDownloader();
-            }
-        }
-        private void ReleaseAllDownloader()
-        {
-            foreach (var downloader in _downloaders)
-            {
-                downloader.Release();
-            }
 
-            // 注意：停止不再使用的下载器
-            _downloadMgr.AbortUnusedDownloader();
+                foreach (var downloader in _downloaders)
+                {
+                    downloader.Release();
+                }
+            }
         }
     }
 
     public sealed class ResourceDownloaderOperation : DownloaderOperation
     {
-        internal ResourceDownloaderOperation(DownloadManager downloadMgr, string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-            : base(downloadMgr, packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
+        internal ResourceDownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
         {
         }
 
         /// <summary>
         /// 创建空的下载器
         /// </summary>
-        internal static ResourceDownloaderOperation CreateEmptyDownloader(DownloadManager downloadMgr, string packageName, int downloadingMaxNumber, int failedTryAgain, int timeout)
+        internal static ResourceDownloaderOperation CreateEmptyDownloader(string packageName, int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = new List<BundleInfo>();
-            var operation = new ResourceDownloaderOperation(downloadMgr, packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+            var operation = new ResourceDownloaderOperation(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
     }
     public sealed class ResourceUnpackerOperation : DownloaderOperation
     {
-        internal ResourceUnpackerOperation(DownloadManager downloadMgr, string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-            : base(downloadMgr, packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
+        internal ResourceUnpackerOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
         {
         }
 
         /// <summary>
         /// 创建空的解压器
         /// </summary>
-        internal static ResourceUnpackerOperation CreateEmptyUnpacker(DownloadManager downloadMgr, string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
+        internal static ResourceUnpackerOperation CreateEmptyUnpacker(string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = new List<BundleInfo>();
-            var operation = new ResourceUnpackerOperation(downloadMgr, packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
+            var operation = new ResourceUnpackerOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
             return operation;
         }
     }
     public sealed class ResourceImporterOperation : DownloaderOperation
     {
-        internal ResourceImporterOperation(DownloadManager downloadMgr, string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-            : base(downloadMgr, packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
+        internal ResourceImporterOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
         {
         }
 
         /// <summary>
         /// 创建空的导入器
         /// </summary>
-        internal static ResourceImporterOperation CreateEmptyImporter(DownloadManager downloadMgr, string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
+        internal static ResourceImporterOperation CreateEmptyImporter(string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = new List<BundleInfo>();
-            var operation = new ResourceImporterOperation(downloadMgr, packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
+            var operation = new ResourceImporterOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
             return operation;
         }
     }

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs

@@ -1,8 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
-
+
 namespace YooAsset
 {
     /// <summary>
@@ -10,52 +6,70 @@ namespace YooAsset
     /// </summary>
     public abstract class InitializationOperation : AsyncOperationBase
     {
-        public string PackageVersion { protected set; get; }
     }
 
     /// <summary>
-    /// 编辑器下模拟模式的初始化操作
+    /// 编辑器下模拟模式
     /// </summary>
     internal sealed class EditorSimulateModeInitializationOperation : InitializationOperation
     {
         private enum ESteps
         {
             None,
-            LoadEditorManifest,
+            CreateFileSystem,
+            InitFileSystem,
             Done,
         }
 
         private readonly EditorSimulateModeImpl _impl;
-        private readonly string _simulateManifestFilePath;
-        private LoadEditorManifestOperation _loadEditorManifestOp;
+        private readonly EditorSimulateModeParameters _parameters;
+        private FSInitializeFileSystemOperation _initFileSystemOp;
         private ESteps _steps = ESteps.None;
 
-        internal EditorSimulateModeInitializationOperation(EditorSimulateModeImpl impl, string simulateManifestFilePath)
+        internal EditorSimulateModeInitializationOperation(EditorSimulateModeImpl impl, EditorSimulateModeParameters parameters)
         {
             _impl = impl;
-            _simulateManifestFilePath = simulateManifestFilePath;
+            _parameters = parameters;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.LoadEditorManifest;
+            _steps = ESteps.CreateFileSystem;
         }
         internal override void InternalOnUpdate()
         {
-            if (_steps == ESteps.LoadEditorManifest)
+            if (_steps == ESteps.CreateFileSystem)
             {
-                if (_loadEditorManifestOp == null)
+                if (_parameters.EditorFileSystemParameters == null)
                 {
-                    _loadEditorManifestOp = new LoadEditorManifestOperation(_impl.PackageName, _simulateManifestFilePath);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadEditorManifestOp);
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Editor file system parameters is null";
+                    return;
                 }
 
-                if (_loadEditorManifestOp.IsDone == false)
+                _impl.EditorFileSystem = _parameters.EditorFileSystemParameters.CreateFileSystem(_impl.PackageName);
+                if (_impl.EditorFileSystem == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Failed to create editor file system";
+                    return;
+                }
+
+                _steps = ESteps.InitFileSystem;
+            }
+
+            if (_steps == ESteps.InitFileSystem)
+            {
+                if (_initFileSystemOp == null)
+                    _initFileSystemOp = _impl.EditorFileSystem.InitializeFileSystemAsync();
+
+                Progress = _initFileSystemOp.Progress;
+                if (_initFileSystemOp.IsDone == false)
                     return;
 
-                if (_loadEditorManifestOp.Status == EOperationStatus.Succeed)
+                if (_initFileSystemOp.Status == EOperationStatus.Succeed)
                 {
-                    PackageVersion = _loadEditorManifestOp.Manifest.PackageVersion;
-                    _impl.ActiveManifest = _loadEditorManifestOp.Manifest;
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }
@@ -63,443 +77,346 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadEditorManifestOp.Error;
+                    Error = _initFileSystemOp.Error;
                 }
             }
         }
     }
 
     /// <summary>
-    /// 离线运行模式的初始化操作
+    /// 离线运行模式
     /// </summary>
     internal sealed class OfflinePlayModeInitializationOperation : InitializationOperation
     {
         private enum ESteps
         {
             None,
-            QueryBuildinPackageVersion,
-            LoadBuildinManifest,
-            PackageCaching,
+            CreateFileSystem,
+            InitFileSystem,
             Done,
         }
 
         private readonly OfflinePlayModeImpl _impl;
-        private QueryBuildinPackageVersionOperation _queryBuildinPackageVersionOp;
-        private LoadBuildinManifestOperation _loadBuildinManifestOp;
-        private PackageCachingOperation _cachingOperation;
+        private readonly OfflinePlayModeParameters _parameters;
+        private FSInitializeFileSystemOperation _initFileSystemOp;
+        private FSRequestPackageVersionOperation _requestPackageVersionOp;
+        private FSLoadPackageManifestOperation _loadPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
-        internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl)
+        internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl, OfflinePlayModeParameters parameters)
         {
             _impl = impl;
+            _parameters = parameters;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.QueryBuildinPackageVersion;
+            _steps = ESteps.CreateFileSystem;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.QueryBuildinPackageVersion)
+            if (_steps == ESteps.CreateFileSystem)
             {
-                if (_queryBuildinPackageVersionOp == null)
-                {
-                    _queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_impl.Persistent);
-                    OperationSystem.StartOperation(_impl.PackageName, _queryBuildinPackageVersionOp);
-                }
-
-                if (_queryBuildinPackageVersionOp.IsDone == false)
-                    return;
-
-                if (_queryBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadBuildinManifest;
-                }
-                else
+                if (_parameters.BuildinFileSystemParameters == null)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _queryBuildinPackageVersionOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadBuildinManifest)
-            {
-                if (_loadBuildinManifestOp == null)
-                {
-                    _loadBuildinManifestOp = new LoadBuildinManifestOperation(_impl.Persistent, _queryBuildinPackageVersionOp.PackageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadBuildinManifestOp);
-                }
-
-                Progress = _loadBuildinManifestOp.Progress;
-                if (_loadBuildinManifestOp.IsDone == false)
+                    Error = "Buildin file system parameters is null";
                     return;
-
-                if (_loadBuildinManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageVersion = _loadBuildinManifestOp.Manifest.PackageVersion;
-                    _impl.ActiveManifest = _loadBuildinManifestOp.Manifest;
-                    _steps = ESteps.PackageCaching;
                 }
-                else
+
+                _impl.BuildinFileSystem = _parameters.BuildinFileSystemParameters.CreateFileSystem(_impl.PackageName);
+                if (_impl.BuildinFileSystem == null)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadBuildinManifestOp.Error;
+                    Error = "Failed to create buildin file system";
+                    return;
                 }
+
+                _steps = ESteps.InitFileSystem;
             }
 
-            if (_steps == ESteps.PackageCaching)
+            if (_steps == ESteps.InitFileSystem)
             {
-                if (_cachingOperation == null)
-                {
-                    _cachingOperation = new PackageCachingOperation(_impl.Persistent, _impl.Cache);
-                    OperationSystem.StartOperation(_impl.PackageName, _cachingOperation);
-                }
+                if (_initFileSystemOp == null)
+                    _initFileSystemOp = _impl.BuildinFileSystem.InitializeFileSystemAsync();
 
-                Progress = _cachingOperation.Progress;
-                if (_cachingOperation.IsDone)
+                Progress = _initFileSystemOp.Progress;
+                if (_initFileSystemOp.IsDone == false)
+                    return;
+
+                if (_initFileSystemOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _initFileSystemOp.Error;
+                }
             }
         }
     }
 
     /// <summary>
-    /// 联机运行模式的初始化操作
-    /// 注意：优先从沙盒里加载清单，如果沙盒里不存在就尝试把内置清单拷贝到沙盒并加载该清单。
+    /// 联机运行模式
     /// </summary>
     internal sealed class HostPlayModeInitializationOperation : InitializationOperation
     {
         private enum ESteps
         {
             None,
-            CheckAppFootPrint,
-            QueryCachePackageVersion,
-            TryLoadCacheManifest,
-            QueryBuildinPackageVersion,
-            UnpackBuildinManifest,
-            LoadBuildinManifest,
-            PackageCaching,
+            CreateBuildinFileSystem,
+            InitBuildinFileSystem,
+            CreateCacheFileSystem,
+            InitCacheFileSystem,
             Done,
         }
 
         private readonly HostPlayModeImpl _impl;
-        private QueryBuildinPackageVersionOperation _queryBuildinPackageVersionOp;
-        private QueryCachePackageVersionOperation _queryCachePackageVersionOp;
-        private UnpackBuildinManifestOperation _unpackBuildinManifestOp;
-        private LoadBuildinManifestOperation _loadBuildinManifestOp;
-        private LoadCacheManifestOperation _loadCacheManifestOp;
-        private PackageCachingOperation _cachingOperation;
+        private readonly HostPlayModeParameters _parameters;
+        private FSInitializeFileSystemOperation _initBuildinFileSystemOp;
+        private FSInitializeFileSystemOperation _initCacheFileSystemOp;
         private ESteps _steps = ESteps.None;
 
-        internal HostPlayModeInitializationOperation(HostPlayModeImpl impl)
+        internal HostPlayModeInitializationOperation(HostPlayModeImpl impl, HostPlayModeParameters parameters)
         {
             _impl = impl;
+            _parameters = parameters;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.CheckAppFootPrint;
+            _steps = ESteps.CreateBuildinFileSystem;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.CheckAppFootPrint)
+            if (_steps == ESteps.CreateBuildinFileSystem)
             {
-                var appFootPrint = new AppFootPrint(_impl.Persistent);
-                appFootPrint.Load(_impl.PackageName);
-
-                // 如果水印发生变化，则说明覆盖安装后首次打开游戏
-                if (appFootPrint.IsDirty())
+                if (_parameters.BuildinFileSystemParameters == null)
                 {
-                    _impl.Persistent.DeleteSandboxManifestFilesFolder();
-                    appFootPrint.Coverage(_impl.PackageName);
-                    YooLogger.Log("Delete manifest files when application foot print dirty !");
+                    _steps = ESteps.CreateCacheFileSystem;
+                    return;
                 }
-                _steps = ESteps.QueryCachePackageVersion;
+
+                _impl.BuildinFileSystem = _parameters.BuildinFileSystemParameters.CreateFileSystem(_impl.PackageName);
+                if (_impl.BuildinFileSystem == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Failed to create buildin file system";
+                    return;
+                }
+
+                _steps = ESteps.InitBuildinFileSystem;
             }
 
-            if (_steps == ESteps.QueryCachePackageVersion)
+            if (_steps == ESteps.InitBuildinFileSystem)
             {
-                if (_queryCachePackageVersionOp == null)
-                {
-                    _queryCachePackageVersionOp = new QueryCachePackageVersionOperation(_impl.Persistent);
-                    OperationSystem.StartOperation(_impl.PackageName, _queryCachePackageVersionOp);
-                }
+                if (_initBuildinFileSystemOp == null)
+                    _initBuildinFileSystemOp = _impl.BuildinFileSystem.InitializeFileSystemAsync();
 
-                if (_queryCachePackageVersionOp.IsDone == false)
+                Progress = _initBuildinFileSystemOp.Progress;
+                if (_initBuildinFileSystemOp.IsDone == false)
                     return;
 
-                if (_queryCachePackageVersionOp.Status == EOperationStatus.Succeed)
+                if (_initBuildinFileSystemOp.Status == EOperationStatus.Succeed)
                 {
-                    _steps = ESteps.TryLoadCacheManifest;
-                }
-                else
-                {
-                    _steps = ESteps.QueryBuildinPackageVersion;
-                }
-            }
-
-            if (_steps == ESteps.TryLoadCacheManifest)
-            {
-                if (_loadCacheManifestOp == null)
-                {
-                    _loadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _queryCachePackageVersionOp.PackageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
-                }
-
-                if (_loadCacheManifestOp.IsDone == false)
-                    return;
-
-                if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageVersion = _loadCacheManifestOp.Manifest.PackageVersion;
-                    _impl.ActiveManifest = _loadCacheManifestOp.Manifest;
-                    _steps = ESteps.PackageCaching;
-                }
-                else
-                {
-                    _steps = ESteps.QueryBuildinPackageVersion;
-                }
-            }
-
-            if (_steps == ESteps.QueryBuildinPackageVersion)
-            {
-                if (_queryBuildinPackageVersionOp == null)
-                {
-                    _queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_impl.Persistent);
-                    OperationSystem.StartOperation(_impl.PackageName, _queryBuildinPackageVersionOp);
-                }
-
-                if (_queryBuildinPackageVersionOp.IsDone == false)
-                    return;
-
-                if (_queryBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.UnpackBuildinManifest;
-                }
-                else
-                {
-                    // 注意：为了兼容MOD模式，初始化动态新增的包裹的时候，如果内置清单不存在也不需要报错！
-                    _steps = ESteps.PackageCaching;
-                    string error = _queryBuildinPackageVersionOp.Error;
-                    YooLogger.Log($"Failed to load buildin package version file : {error}");
-                }
-            }
-
-            if (_steps == ESteps.UnpackBuildinManifest)
-            {
-                if (_unpackBuildinManifestOp == null)
-                {
-                    _unpackBuildinManifestOp = new UnpackBuildinManifestOperation(_impl.Persistent, _queryBuildinPackageVersionOp.PackageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _unpackBuildinManifestOp);
-                }
-
-                if (_unpackBuildinManifestOp.IsDone == false)
-                    return;
-
-                if (_unpackBuildinManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadBuildinManifest;
+                    _steps = ESteps.CreateCacheFileSystem;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _unpackBuildinManifestOp.Error;
+                    Error = _initBuildinFileSystemOp.Error;
                 }
             }
 
-            if (_steps == ESteps.LoadBuildinManifest)
+            if (_steps == ESteps.CreateCacheFileSystem)
             {
-                if (_loadBuildinManifestOp == null)
-                {
-                    _loadBuildinManifestOp = new LoadBuildinManifestOperation(_impl.Persistent, _queryBuildinPackageVersionOp.PackageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadBuildinManifestOp);
-                }
-
-                Progress = _loadBuildinManifestOp.Progress;
-                if (_loadBuildinManifestOp.IsDone == false)
-                    return;
-
-                if (_loadBuildinManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageVersion = _loadBuildinManifestOp.Manifest.PackageVersion;
-                    _impl.ActiveManifest = _loadBuildinManifestOp.Manifest;
-                    _impl.FlushManifestVersionFile(); //注意：解压内置清单并加载成功后保存该清单版本。
-                    _steps = ESteps.PackageCaching;
-                }
-                else
+                if (_parameters.CacheFileSystemParameters == null)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadBuildinManifestOp.Error;
+                    Error = "Cache file system parameters is null";
+                    return;
                 }
+
+                _impl.CacheFileSystem = _parameters.CacheFileSystemParameters.CreateFileSystem(_impl.PackageName);
+                if (_impl.CacheFileSystem == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Failed to create cache file system";
+                    return;
+                }
+
+                _steps = ESteps.InitCacheFileSystem;
             }
 
-            if (_steps == ESteps.PackageCaching)
+            if (_steps == ESteps.InitCacheFileSystem)
             {
-                if (_cachingOperation == null)
-                {
-                    _cachingOperation = new PackageCachingOperation(_impl.Persistent, _impl.Cache);
-                    OperationSystem.StartOperation(_impl.PackageName, _cachingOperation);
-                }
+                if (_initCacheFileSystemOp == null)
+                    _initCacheFileSystemOp = _impl.CacheFileSystem.InitializeFileSystemAsync();
 
-                Progress = _cachingOperation.Progress;
-                if (_cachingOperation.IsDone)
+                Progress = _initCacheFileSystemOp.Progress;
+                if (_initCacheFileSystemOp.IsDone == false)
+                    return;
+
+                if (_initCacheFileSystemOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _initCacheFileSystemOp.Error;
+                }
             }
         }
     }
 
     /// <summary>
-    /// WebGL运行模式的初始化操作
+    /// WebGL运行模式
     /// </summary>
     internal sealed class WebPlayModeInitializationOperation : InitializationOperation
     {
         private enum ESteps
         {
             None,
-            QueryWebPackageVersion,
-            LoadWebManifest,
+            CreateWebServerFileSystem,
+            InitWebServerFileSystem,
+            CreateWebRemoteFileSystem,
+            InitWebRemoteFileSystem,
+            CheckResult,
             Done,
         }
 
         private readonly WebPlayModeImpl _impl;
-        private QueryBuildinPackageVersionOperation _queryWebPackageVersionOp;
-        private LoadBuildinManifestOperation _loadWebManifestOp;
+        private readonly WebPlayModeParameters _parameters;
+        private FSInitializeFileSystemOperation _initWebServerFileSystemOp;
+        private FSInitializeFileSystemOperation _initWebRemoteFileSystemOp;
         private ESteps _steps = ESteps.None;
 
-        internal WebPlayModeInitializationOperation(WebPlayModeImpl impl)
+        internal WebPlayModeInitializationOperation(WebPlayModeImpl impl, WebPlayModeParameters parameters)
         {
             _impl = impl;
+            _parameters = parameters;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.QueryWebPackageVersion;
+            _steps = ESteps.CreateWebServerFileSystem;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.QueryWebPackageVersion)
+            if (_steps == ESteps.CreateWebServerFileSystem)
             {
-                if (_queryWebPackageVersionOp == null)
+                if (_parameters.WebServerFileSystemParameters == null)
                 {
-                    _queryWebPackageVersionOp = new QueryBuildinPackageVersionOperation(_impl.Persistent);
-                    OperationSystem.StartOperation(_impl.PackageName, _queryWebPackageVersionOp);
-                }
-
-                if (_queryWebPackageVersionOp.IsDone == false)
+                    _steps = ESteps.CreateWebRemoteFileSystem;
                     return;
+                }
 
-                if (_queryWebPackageVersionOp.Status == EOperationStatus.Succeed)
+                _impl.WebServerFileSystem = _parameters.WebServerFileSystemParameters.CreateFileSystem(_impl.PackageName);
+                if (_impl.WebServerFileSystem == null)
                 {
-                    _steps = ESteps.LoadWebManifest;
-                }
-                else
-                {
-                    // 注意：WebGL平台可能因为网络的原因会导致请求失败。如果内置清单不存在或者超时也不需要报错！
                     _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                    string error = _queryWebPackageVersionOp.Error;
-                    YooLogger.Log($"Failed to load web package version file : {error}");
+                    Status = EOperationStatus.Failed;
+                    Error = "Failed to create web server file system";
+                    return;
                 }
+
+                _steps = ESteps.InitWebServerFileSystem;
             }
 
-            if (_steps == ESteps.LoadWebManifest)
+            if (_steps == ESteps.InitWebServerFileSystem)
             {
-                if (_loadWebManifestOp == null)
-                {
-                    _loadWebManifestOp = new LoadBuildinManifestOperation(_impl.Persistent, _queryWebPackageVersionOp.PackageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadWebManifestOp);
-                }
+                if (_initWebServerFileSystemOp == null)
+                    _initWebServerFileSystemOp = _impl.WebServerFileSystem.InitializeFileSystemAsync();
 
-                Progress = _loadWebManifestOp.Progress;
-                if (_loadWebManifestOp.IsDone == false)
+                Progress = _initWebServerFileSystemOp.Progress;
+                if (_initWebServerFileSystemOp.IsDone == false)
                     return;
 
-                if (_loadWebManifestOp.Status == EOperationStatus.Succeed)
+                if (_initWebServerFileSystemOp.Status == EOperationStatus.Succeed)
                 {
-                    PackageVersion = _loadWebManifestOp.Manifest.PackageVersion;
-                    _impl.ActiveManifest = _loadWebManifestOp.Manifest;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
+                    _steps = ESteps.CreateWebRemoteFileSystem;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadWebManifestOp.Error;
+                    Error = _initWebServerFileSystemOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CreateWebRemoteFileSystem)
+            {
+                if (_parameters.WebRemoteFileSystemParameters == null)
+                {
+                    _steps = ESteps.CheckResult;
+                    return;
+                }
+
+                _impl.WebRemoteFileSystem = _parameters.WebRemoteFileSystemParameters.CreateFileSystem(_impl.PackageName);
+                if (_impl.WebRemoteFileSystem == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Failed to create web remote file system";
+                    return;
+                }
+
+                _steps = ESteps.InitWebRemoteFileSystem;
+            }
+
+            if (_steps == ESteps.InitWebRemoteFileSystem)
+            {
+                if (_initWebRemoteFileSystemOp == null)
+                    _initWebRemoteFileSystemOp = _impl.WebRemoteFileSystem.InitializeFileSystemAsync();
+
+                Progress = _initWebRemoteFileSystemOp.Progress;
+                if (_initWebRemoteFileSystemOp.IsDone == false)
+                    return;
+
+                if (_initWebRemoteFileSystemOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CheckResult;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _initWebRemoteFileSystemOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CheckResult)
+            {
+                if (_impl.WebServerFileSystem == null && _impl.WebRemoteFileSystem == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Not found any file system !";
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
                 }
             }
         }
     }
-
-    /// <summary>
-    /// 应用程序水印
-    /// </summary>
-    internal class AppFootPrint
-    {
-        private PersistentManager _persistent;
-        private string _footPrint;
-
-        public AppFootPrint(PersistentManager persistent)
-        {
-            _persistent = persistent;
-        }
-
-        /// <summary>
-        /// 读取应用程序水印
-        /// </summary>
-        public void Load(string packageName)
-        {
-            string footPrintFilePath = _persistent.SandboxAppFootPrintFilePath;
-            if (File.Exists(footPrintFilePath))
-            {
-                _footPrint = FileUtility.ReadAllText(footPrintFilePath);
-            }
-            else
-            {
-                Coverage(packageName);
-            }
-        }
-
-        /// <summary>
-        /// 检测水印是否发生变化
-        /// </summary>
-        public bool IsDirty()
-        {
-#if UNITY_EDITOR
-            return _footPrint != Application.version;
-#else
-			return _footPrint != Application.buildGUID;
-#endif
-        }
-
-        /// <summary>
-        /// 覆盖掉水印
-        /// </summary>
-        public void Coverage(string packageName)
-        {
-#if UNITY_EDITOR
-            _footPrint = Application.version;
-#else
-			_footPrint = Application.buildGUID;
-#endif
-            string footPrintFilePath = _persistent.SandboxAppFootPrintFilePath;
-            FileUtility.WriteAllText(footPrintFilePath, _footPrint);
-            YooLogger.Log($"Save application foot print : {_footPrint}");
-        }
-    }
 }

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using System;
 
 namespace YooAsset
 {
@@ -14,6 +15,7 @@ namespace YooAsset
             DeserializeAssetList,
             PrepareBundleList,
             DeserializeBundleList,
+            InitManifest,
             Done,
         }
 
@@ -80,9 +82,11 @@ namespace YooAsset
                     Manifest.LocationToLower = _buffer.ReadBool();
                     Manifest.IncludeAssetGUID = _buffer.ReadBool();
                     Manifest.OutputNameStyle = _buffer.ReadInt32();
+                    Manifest.BuildBundleType = _buffer.ReadInt32();
                     Manifest.BuildPipeline = _buffer.ReadUTF8();
                     Manifest.PackageName = _buffer.ReadUTF8();
                     Manifest.PackageVersion = _buffer.ReadUTF8();
+                    Manifest.PackageNote = _buffer.ReadUTF8();
 
                     // 检测配置
                     if (Manifest.EnableAddressable && Manifest.LocationToLower)
@@ -94,20 +98,8 @@ namespace YooAsset
                 if (_steps == ESteps.PrepareAssetList)
                 {
                     _packageAssetCount = _buffer.ReadInt32();
-                    Manifest.AssetList = new List<PackageAsset>(_packageAssetCount);
-                    Manifest.AssetDic = new Dictionary<string, PackageAsset>(_packageAssetCount);
-
-                    if (Manifest.EnableAddressable)
-                        Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount * 3);
-                    else
-                        Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount * 2);
-
-                    if (Manifest.IncludeAssetGUID)
-                        Manifest.AssetPathMapping2 = new Dictionary<string, string>(_packageAssetCount);
-                    else
-                        Manifest.AssetPathMapping2 = new Dictionary<string, string>();
-
                     _progressTotalValue = _packageAssetCount;
+                    ManifestTools.CreateAssetCollection(Manifest, _packageAssetCount);
                     _steps = ESteps.DeserializeAssetList;
                 }
                 if (_steps == ESteps.DeserializeAssetList)
@@ -120,57 +112,7 @@ namespace YooAsset
                         packageAsset.AssetGUID = _buffer.ReadUTF8();
                         packageAsset.AssetTags = _buffer.ReadUTF8Array();
                         packageAsset.BundleID = _buffer.ReadInt32();
-                        Manifest.AssetList.Add(packageAsset);
-
-                        // 注意：我们不允许原始路径存在重名
-                        string assetPath = packageAsset.AssetPath;
-                        if (Manifest.AssetDic.ContainsKey(assetPath))
-                            throw new System.Exception($"AssetPath have existed : {assetPath}");
-                        else
-                            Manifest.AssetDic.Add(assetPath, packageAsset);
-
-                        // 填充AssetPathMapping1
-                        {
-                            string location = packageAsset.AssetPath;
-                            if (Manifest.LocationToLower)
-                                location = location.ToLower();
-
-                            // 添加原生路径的映射
-                            if (Manifest.AssetPathMapping1.ContainsKey(location))
-                                throw new System.Exception($"Location have existed : {location}");
-                            else
-                                Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-
-                            // 添加无后缀名路径的映射
-                            string locationWithoutExtension = Path.ChangeExtension(location, null);
-                            if (ReferenceEquals(location, locationWithoutExtension) == false)
-                            {
-                                if (Manifest.AssetPathMapping1.ContainsKey(locationWithoutExtension))
-                                    YooLogger.Warning($"Location have existed : {locationWithoutExtension}");
-                                else
-                                    Manifest.AssetPathMapping1.Add(locationWithoutExtension, packageAsset.AssetPath);
-                            }
-                        }
-                        if (Manifest.EnableAddressable)
-                        {
-                            string location = packageAsset.Address;
-                            if (string.IsNullOrEmpty(location) == false)
-                            {
-                                if (Manifest.AssetPathMapping1.ContainsKey(location))
-                                    throw new System.Exception($"Location have existed : {location}");
-                                else
-                                    Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-                            }
-                        }
-
-                        // 填充AssetPathMapping2
-                        if (Manifest.IncludeAssetGUID)
-                        {
-                            if (Manifest.AssetPathMapping2.ContainsKey(packageAsset.AssetGUID))
-                                throw new System.Exception($"AssetGUID have existed : {packageAsset.AssetGUID}");
-                            else
-                                Manifest.AssetPathMapping2.Add(packageAsset.AssetGUID, packageAsset.AssetPath);
-                        }
+                        ManifestTools.FillAssetCollection(Manifest, packageAsset);
 
                         _packageAssetCount--;
                         Progress = 1f - _packageAssetCount / _progressTotalValue;
@@ -187,11 +129,8 @@ namespace YooAsset
                 if (_steps == ESteps.PrepareBundleList)
                 {
                     _packageBundleCount = _buffer.ReadInt32();
-                    Manifest.BundleList = new List<PackageBundle>(_packageBundleCount);
-                    Manifest.BundleDic1 = new Dictionary<string, PackageBundle>(_packageBundleCount);
-                    Manifest.BundleDic2 = new Dictionary<string, PackageBundle>(_packageBundleCount);
-                    Manifest.BundleDic3 = new Dictionary<string, PackageBundle>(_packageBundleCount);
                     _progressTotalValue = _packageBundleCount;
+                    ManifestTools.CreateBundleCollection(Manifest, _packageBundleCount);
                     _steps = ESteps.DeserializeBundleList;
                 }
                 if (_steps == ESteps.DeserializeBundleList)
@@ -207,14 +146,7 @@ namespace YooAsset
                         packageBundle.Encrypted = _buffer.ReadBool();
                         packageBundle.Tags = _buffer.ReadUTF8Array();
                         packageBundle.DependIDs = _buffer.ReadInt32Array();
-                        packageBundle.ParseBundle(Manifest);
-                        Manifest.BundleList.Add(packageBundle);
-                        Manifest.BundleDic1.Add(packageBundle.BundleName, packageBundle);
-                        Manifest.BundleDic2.Add(packageBundle.FileName, packageBundle);
-
-                        // 注意：原始文件可能存在相同的CacheGUID
-                        if (Manifest.BundleDic3.ContainsKey(packageBundle.CacheGUID) == false)
-                            Manifest.BundleDic3.Add(packageBundle.CacheGUID, packageBundle);
+                        ManifestTools.FillBundleCollection(Manifest, packageBundle);
 
                         _packageBundleCount--;
                         Progress = 1f - _packageBundleCount / _progressTotalValue;
@@ -224,10 +156,16 @@ namespace YooAsset
 
                     if (_packageBundleCount <= 0)
                     {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
+                        _steps = ESteps.InitManifest;
                     }
                 }
+
+                if (_steps == ESteps.InitManifest)
+                {
+                    ManifestTools.InitManifest(Manifest);
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
             }
             catch (System.Exception e)
             {

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs

@@ -1,113 +0,0 @@
-
-namespace YooAsset
-{
-    internal class DownloadManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            DownloadPackageHashFile,
-            DownloadManifestFile,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private readonly IRemoteServices _remoteServices;
-        private readonly string _packageVersion;
-        private readonly int _timeout;
-        private UnityWebFileRequester _downloader1;
-        private UnityWebFileRequester _downloader2;
-        private ESteps _steps = ESteps.None;
-        private int _requestCount = 0;
-
-        internal DownloadManifestOperation(PersistentManager persistent, IRemoteServices remoteServices, string packageVersion, int timeout)
-        {
-            _persistent = persistent;
-            _remoteServices = remoteServices;
-            _packageVersion = packageVersion;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _requestCount = RequestHelper.GetRequestFailedCount(_persistent.PackageName, nameof(DownloadManifestOperation));
-            _steps = ESteps.DownloadPackageHashFile;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.DownloadPackageHashFile)
-            {
-                if (_downloader1 == null)
-                {
-                    string savePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
-                    string fileName = YooAssetSettingsData.GetPackageHashFileName(_persistent.PackageName, _packageVersion);
-                    string webURL = GetDownloadRequestURL(fileName);
-                    YooLogger.Log($"Beginning to download package hash file : {webURL}");
-                    _downloader1 = new UnityWebFileRequester();
-                    _downloader1.SendRequest(webURL, savePath, _timeout);
-                }
-
-                _downloader1.CheckTimeout();
-                if (_downloader1.IsDone() == false)
-                    return;
-
-                if (_downloader1.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader1.GetError();
-                    RequestHelper.RecordRequestFailed(_persistent.PackageName, nameof(DownloadManifestOperation));
-                }
-                else
-                {
-                    _steps = ESteps.DownloadManifestFile;
-                }
-
-                _downloader1.Dispose();
-            }
-
-            if (_steps == ESteps.DownloadManifestFile)
-            {
-                if (_downloader2 == null)
-                {
-                    string savePath = _persistent.GetSandboxPackageManifestFilePath(_packageVersion);
-                    string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_persistent.PackageName, _packageVersion);
-                    string webURL = GetDownloadRequestURL(fileName);
-                    YooLogger.Log($"Beginning to download package manifest file : {webURL}");
-                    _downloader2 = new UnityWebFileRequester();
-                    _downloader2.SendRequest(webURL, savePath, _timeout);
-                }
-
-                _downloader2.CheckTimeout();
-                if (_downloader2.IsDone() == false)
-                    return;
-
-                if (_downloader2.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader2.GetError();
-                    RequestHelper.RecordRequestFailed(_persistent.PackageName, nameof(DownloadManifestOperation));
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-
-                _downloader2.Dispose();
-            }
-        }
-
-        private string GetDownloadRequestURL(string fileName)
-        {
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                return _remoteServices.GetRemoteMainURL(fileName);
-            else
-                return _remoteServices.GetRemoteFallbackURL(fileName);
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs

@@ -1,91 +0,0 @@
-
-namespace YooAsset
-{
-    internal class LoadBuildinManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            LoadBuildinManifest,
-            CheckDeserializeManifest,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private readonly string _buildinPackageVersion;
-        private UnityWebDataRequester _downloader;
-        private DeserializeManifestOperation _deserializer;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 加载的清单实例
-        /// </summary>
-        public PackageManifest Manifest { private set; get; }
-
-
-        public LoadBuildinManifestOperation(PersistentManager persistent, string buildinPackageVersion)
-        {
-            _persistent = persistent;
-            _buildinPackageVersion = buildinPackageVersion;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.LoadBuildinManifest;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.LoadBuildinManifest)
-            {
-                if (_downloader == null)
-                {
-                    string filePath = _persistent.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
-                    string url = PersistentHelper.ConvertToWWWPath(filePath);
-                    _downloader = new UnityWebDataRequester();
-                    _downloader.SendRequest(url);
-                }
-
-                if (_downloader.IsDone() == false)
-                    return;
-
-                if (_downloader.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader.GetError();
-                }
-                else
-                {
-                    byte[] bytesData = _downloader.GetData();
-                    _deserializer = new DeserializeManifestOperation(bytesData);
-                    OperationSystem.StartOperation(_persistent.PackageName, _deserializer);
-                    _steps = ESteps.CheckDeserializeManifest;
-                }
-
-                _downloader.Dispose();
-            }
-
-            if (_steps == ESteps.CheckDeserializeManifest)
-            {
-                Progress = _deserializer.Progress;
-                if (_deserializer.IsDone == false)
-                    return;
-
-                if (_deserializer.Status == EOperationStatus.Succeed)
-                {
-                    Manifest = _deserializer.Manifest;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _deserializer.Error;
-                }
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadCacheManifestOperation.cs

@@ -1,141 +0,0 @@
-using System.IO;
-
-namespace YooAsset
-{
-    internal class LoadCacheManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            QueryCachePackageHash,
-            VerifyFileHash,
-            LoadCacheManifest,
-            CheckDeserializeManifest,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private readonly string _packageVersion;
-        private QueryCachePackageHashOperation _queryCachePackageHashOp;
-        private DeserializeManifestOperation _deserializer;
-        private string _manifestFilePath;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 加载的清单实例
-        /// </summary>
-        public PackageManifest Manifest { private set; get; }
-
-
-        public LoadCacheManifestOperation(PersistentManager persistent, string packageVersion)
-        {
-            _persistent = persistent;
-            _packageVersion = packageVersion;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.QueryCachePackageHash;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.QueryCachePackageHash)
-            {
-                if (_queryCachePackageHashOp == null)
-                {
-                    _queryCachePackageHashOp = new QueryCachePackageHashOperation(_persistent, _packageVersion);
-                    OperationSystem.StartOperation(_persistent.PackageName, _queryCachePackageHashOp);
-                }
-
-                if (_queryCachePackageHashOp.IsDone == false)
-                    return;
-
-                if (_queryCachePackageHashOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.VerifyFileHash;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _queryCachePackageHashOp.Error;
-                    ClearCacheFile();
-                }
-            }
-
-            if (_steps == ESteps.VerifyFileHash)
-            {
-                _manifestFilePath = _persistent.GetSandboxPackageManifestFilePath(_packageVersion);
-                if (File.Exists(_manifestFilePath) == false)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Not found cache manifest file : {_manifestFilePath}";
-                    ClearCacheFile();
-                    return;
-                }
-
-                string fileHash = HashUtility.FileMD5Safely(_manifestFilePath);
-                if (fileHash != _queryCachePackageHashOp.PackageHash)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Failed to verify cache manifest file hash !";
-                    ClearCacheFile();
-                }
-                else
-                {
-                    _steps = ESteps.LoadCacheManifest;
-                }
-            }
-
-            if (_steps == ESteps.LoadCacheManifest)
-            {
-                byte[] bytesData = File.ReadAllBytes(_manifestFilePath);
-                _deserializer = new DeserializeManifestOperation(bytesData);
-                OperationSystem.StartOperation(_persistent.PackageName, _deserializer);
-                _steps = ESteps.CheckDeserializeManifest;
-            }
-
-            if (_steps == ESteps.CheckDeserializeManifest)
-            {
-                Progress = _deserializer.Progress;
-                if (_deserializer.IsDone == false)
-                    return;
-
-                if (_deserializer.Status == EOperationStatus.Succeed)
-                {
-                    Manifest = _deserializer.Manifest;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _deserializer.Error;
-                    ClearCacheFile();
-                }
-            }
-        }
-
-        private void ClearCacheFile()
-        {
-            // 注意：如果加载沙盒内的清单报错，为了避免流程被卡住，主动把损坏的文件删除。
-            if (File.Exists(_manifestFilePath))
-            {
-                YooLogger.Warning($"Failed to load cache manifest file : {Error}");
-                YooLogger.Warning($"Invalid cache manifest file have been removed : {_manifestFilePath}");
-                File.Delete(_manifestFilePath);
-            }
-
-            string hashFilePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
-            if (File.Exists(hashFilePath))
-            {
-                File.Delete(hashFilePath);
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs

@@ -1,78 +0,0 @@
-using System.IO;
-
-namespace YooAsset
-{
-    internal class LoadEditorManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            LoadEditorManifest,
-            CheckDeserializeManifest,
-            Done,
-        }
-
-        private readonly string _packageName;
-        private readonly string _manifestFilePath;
-        private DeserializeManifestOperation _deserializer;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 加载的清单实例
-        /// </summary>
-        public PackageManifest Manifest { private set; get; }
-
-
-        public LoadEditorManifestOperation(string packageName, string manifestFilePath)
-        {
-            _packageName = packageName;
-            _manifestFilePath = manifestFilePath;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.LoadEditorManifest;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.LoadEditorManifest)
-            {
-                if (File.Exists(_manifestFilePath) == false)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Not found simulation manifest file : {_manifestFilePath}";
-                    return;
-                }
-
-                YooLogger.Log($"Load editor manifest file : {_manifestFilePath}");
-                byte[] bytesData = FileUtility.ReadAllBytes(_manifestFilePath);
-                _deserializer = new DeserializeManifestOperation(bytesData);
-                OperationSystem.StartOperation(_packageName, _deserializer);
-                _steps = ESteps.CheckDeserializeManifest;
-            }
-
-            if (_steps == ESteps.CheckDeserializeManifest)
-            {
-                Progress = _deserializer.Progress;
-                if (_deserializer.IsDone == false)
-                    return;
-
-                if (_deserializer.Status == EOperationStatus.Succeed)
-                {
-                    Manifest = _deserializer.Manifest;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _deserializer.Error;
-                }
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs

@@ -1,151 +0,0 @@
-
-namespace YooAsset
-{
-    internal class LoadRemoteManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            DownloadPackageHashFile,
-            DownloadManifestFile,
-            VerifyFileHash,
-            CheckDeserializeManifest,
-            Done,
-        }
-
-        private readonly IRemoteServices _remoteServices;
-        private readonly string _packageName;
-        private readonly string _packageVersion;
-        private readonly int _timeout;
-        private QueryRemotePackageHashOperation _queryRemotePackageHashOp;
-        private UnityWebDataRequester _downloader;
-        private DeserializeManifestOperation _deserializer;
-        private byte[] _fileData;
-        private ESteps _steps = ESteps.None;
-        private int _requestCount = 0;
-
-        /// <summary>
-        /// 加载的清单实例
-        /// </summary>
-        public PackageManifest Manifest { private set; get; }
-
-
-        internal LoadRemoteManifestOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
-        {
-            _remoteServices = remoteServices;
-            _packageName = packageName;
-            _packageVersion = packageVersion;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(LoadRemoteManifestOperation));
-            _steps = ESteps.DownloadPackageHashFile;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.DownloadPackageHashFile)
-            {
-                if (_queryRemotePackageHashOp == null)
-                {
-                    _queryRemotePackageHashOp = new QueryRemotePackageHashOperation(_remoteServices, _packageName, _packageVersion, _timeout);
-                    OperationSystem.StartOperation(_packageName, _queryRemotePackageHashOp);
-                }
-
-                if (_queryRemotePackageHashOp.IsDone == false)
-                    return;
-
-                if (_queryRemotePackageHashOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.DownloadManifestFile;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _queryRemotePackageHashOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.DownloadManifestFile)
-            {
-                if (_downloader == null)
-                {
-                    string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
-                    string webURL = GetDownloadRequestURL(fileName);
-                    YooLogger.Log($"Beginning to download manifest file : {webURL}");
-                    _downloader = new UnityWebDataRequester();
-                    _downloader.SendRequest(webURL, _timeout);
-                }
-
-                _downloader.CheckTimeout();
-                if (_downloader.IsDone() == false)
-                    return;
-
-                if (_downloader.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader.GetError();
-                    RequestHelper.RecordRequestFailed(_packageName, nameof(LoadRemoteManifestOperation));
-                }
-                else
-                {
-                    _fileData = _downloader.GetData();
-                    _steps = ESteps.VerifyFileHash;
-                }
-
-                _downloader.Dispose();
-            }
-
-            if (_steps == ESteps.VerifyFileHash)
-            {
-                string fileHash = HashUtility.BytesMD5(_fileData);
-                if (fileHash != _queryRemotePackageHashOp.PackageHash)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Failed to verify remote manifest file hash !";
-                }
-                else
-                {
-                    _deserializer = new DeserializeManifestOperation(_fileData);
-                    OperationSystem.StartOperation(_packageName, _deserializer);
-                    _steps = ESteps.CheckDeserializeManifest;
-                }
-            }
-
-            if (_steps == ESteps.CheckDeserializeManifest)
-            {
-                Progress = _deserializer.Progress;
-                if (_deserializer.IsDone == false)
-                    return;
-
-                if (_deserializer.Status == EOperationStatus.Succeed)
-                {
-                    Manifest = _deserializer.Manifest;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _deserializer.Error;
-                }
-            }
-        }
-
-        private string GetDownloadRequestURL(string fileName)
-        {
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                return _remoteServices.GetRemoteMainURL(fileName);
-            else
-                return _remoteServices.GetRemoteFallbackURL(fileName);
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs

@@ -1,75 +0,0 @@
-
-namespace YooAsset
-{
-    internal class QueryBuildinPackageVersionOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            LoadBuildinPackageVersionFile,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private UnityWebDataRequester _downloader;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 包裹版本
-        /// </summary>
-        public string PackageVersion { private set; get; }
-
-
-        public QueryBuildinPackageVersionOperation(PersistentManager persistent)
-        {
-            _persistent = persistent;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.LoadBuildinPackageVersionFile;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.LoadBuildinPackageVersionFile)
-            {
-                if (_downloader == null)
-                {
-                    string filePath = _persistent.GetBuildinPackageVersionFilePath();
-                    string url = PersistentHelper.ConvertToWWWPath(filePath);
-                    _downloader = new UnityWebDataRequester();
-                    _downloader.SendRequest(url);
-                }
-
-                if (_downloader.IsDone() == false)
-                    return;
-
-                if (_downloader.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader.GetError();
-                }
-                else
-                {
-                    PackageVersion = _downloader.GetText();
-                    if (string.IsNullOrEmpty(PackageVersion))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Buildin package version file content is empty !";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                }
-
-                _downloader.Dispose();
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs

@@ -1,64 +0,0 @@
-using System.IO;
-
-namespace YooAsset
-{
-    internal class QueryCachePackageHashOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            LoadCachePackageHashFile,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private readonly string _packageVersion;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 包裹哈希值
-        /// </summary>
-        public string PackageHash { private set; get; }
-
-
-        public QueryCachePackageHashOperation(PersistentManager persistent, string packageVersion)
-        {
-            _persistent = persistent;
-            _packageVersion = packageVersion;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.LoadCachePackageHashFile;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.LoadCachePackageHashFile)
-            {
-                string filePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
-                if (File.Exists(filePath) == false)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Cache package hash file not found : {filePath}";
-                    return;
-                }
-
-                PackageHash = FileUtility.ReadAllText(filePath);
-                if (string.IsNullOrEmpty(PackageHash))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Cache package hash file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs

@@ -1,62 +0,0 @@
-using System.IO;
-
-namespace YooAsset
-{
-    internal class QueryCachePackageVersionOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            LoadCachePackageVersionFile,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private ESteps _steps = ESteps.None;
-
-        /// <summary>
-        /// 包裹版本
-        /// </summary>
-        public string PackageVersion { private set; get; }
-
-
-        public QueryCachePackageVersionOperation(PersistentManager persistent)
-        {
-            _persistent = persistent;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.LoadCachePackageVersionFile;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.LoadCachePackageVersionFile)
-            {
-                string filePath = _persistent.GetSandboxPackageVersionFilePath();
-                if (File.Exists(filePath) == false)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Cache package version file not found : {filePath}";
-                    return;
-                }
-
-                PackageVersion = FileUtility.ReadAllText(filePath);
-                if (string.IsNullOrEmpty(PackageVersion))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Cache package version file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs

@@ -1,100 +0,0 @@
-
-namespace YooAsset
-{
-    internal class QueryRemotePackageHashOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            DownloadPackageHash,
-            Done,
-        }
-
-        private readonly IRemoteServices _remoteServices;
-        private readonly string _packageName;
-        private readonly string _packageVersion;
-        private readonly int _timeout;
-        private UnityWebDataRequester _downloader;
-        private ESteps _steps = ESteps.None;
-        private int _requestCount = 0;
-
-        /// <summary>
-        /// 包裹哈希值
-        /// </summary>
-        public string PackageHash { private set; get; }
-
-
-        public QueryRemotePackageHashOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
-        {
-            _remoteServices = remoteServices;
-            _packageName = packageName;
-            _packageVersion = packageVersion;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(QueryRemotePackageHashOperation));
-            _steps = ESteps.DownloadPackageHash;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.DownloadPackageHash)
-            {
-                if (_downloader == null)
-                {
-                    string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
-                    string webURL = GetPackageHashRequestURL(fileName);
-                    YooLogger.Log($"Beginning to request package hash : {webURL}");
-                    _downloader = new UnityWebDataRequester();
-                    _downloader.SendRequest(webURL, _timeout);
-                }
-
-                Progress = _downloader.Progress();
-                _downloader.CheckTimeout();
-                if (_downloader.IsDone() == false)
-                    return;
-
-                if (_downloader.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader.GetError();
-                    RequestHelper.RecordRequestFailed(_packageName, nameof(QueryRemotePackageHashOperation));
-                }
-                else
-                {
-                    PackageHash = _downloader.GetText();
-                    if (string.IsNullOrEmpty(PackageHash))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Remote package hash is empty : {_downloader.URL}";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                }
-
-                _downloader.Dispose();
-            }
-        }
-
-        private string GetPackageHashRequestURL(string fileName)
-        {
-            string url;
-
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                url = _remoteServices.GetRemoteMainURL(fileName);
-            else
-                url = _remoteServices.GetRemoteFallbackURL(fileName);
-
-            return url;
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs

@@ -1,104 +0,0 @@
-
-namespace YooAsset
-{
-    internal class QueryRemotePackageVersionOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            DownloadPackageVersion,
-            Done,
-        }
-
-        private readonly IRemoteServices _remoteServices;
-        private readonly string _packageName;
-        private readonly bool _appendTimeTicks;
-        private readonly int _timeout;
-        private UnityWebDataRequester _downloader;
-        private ESteps _steps = ESteps.None;
-        private int _requestCount = 0;
-
-        /// <summary>
-        /// 包裹版本
-        /// </summary>
-        public string PackageVersion { private set; get; }
-
-
-        public QueryRemotePackageVersionOperation(IRemoteServices remoteServices, string packageName, bool appendTimeTicks, int timeout)
-        {
-            _remoteServices = remoteServices;
-            _packageName = packageName;
-            _appendTimeTicks = appendTimeTicks;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(QueryRemotePackageVersionOperation));
-            _steps = ESteps.DownloadPackageVersion;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.DownloadPackageVersion)
-            {
-                if (_downloader == null)
-                {
-                    string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
-                    string webURL = GetPackageVersionRequestURL(fileName);
-                    YooLogger.Log($"Beginning to request package version : {webURL}");
-                    _downloader = new UnityWebDataRequester();
-                    _downloader.SendRequest(webURL, _timeout);
-                }
-
-                Progress = _downloader.Progress();
-                _downloader.CheckTimeout();
-                if (_downloader.IsDone() == false)
-                    return;
-
-                if (_downloader.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader.GetError();
-                    RequestHelper.RecordRequestFailed(_packageName, nameof(QueryRemotePackageVersionOperation));
-                }
-                else
-                {
-                    PackageVersion = _downloader.GetText();
-                    if (string.IsNullOrEmpty(PackageVersion))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Remote package version is empty : {_downloader.URL}";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                }
-
-                _downloader.Dispose();
-            }
-        }
-
-        private string GetPackageVersionRequestURL(string fileName)
-        {
-            string url;
-
-            // 轮流返回请求地址
-            if (_requestCount % 2 == 0)
-                url = _remoteServices.GetRemoteMainURL(fileName);
-            else
-                url = _remoteServices.GetRemoteFallbackURL(fileName);
-
-            // 在URL末尾添加时间戳
-            if (_appendTimeTicks)
-                return $"{url}?{System.DateTime.UtcNow.Ticks}";
-            else
-                return url;
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs

@@ -1,92 +0,0 @@
-
-namespace YooAsset
-{
-    internal class UnpackBuildinManifestOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            UnpackManifestHashFile,
-            UnpackManifestFile,
-            Done,
-        }
-
-        private readonly PersistentManager _persistent;
-        private readonly string _buildinPackageVersion;
-        private UnityWebFileRequester _downloader1;
-        private UnityWebFileRequester _downloader2;
-        private ESteps _steps = ESteps.None;
-
-        public UnpackBuildinManifestOperation(PersistentManager persistent, string buildinPackageVersion)
-        {
-            _persistent = persistent;
-            _buildinPackageVersion = buildinPackageVersion;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.UnpackManifestHashFile;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.UnpackManifestHashFile)
-            {
-                if (_downloader1 == null)
-                {
-                    string savePath = _persistent.GetSandboxPackageHashFilePath(_buildinPackageVersion);
-                    string filePath = _persistent.GetBuildinPackageHashFilePath(_buildinPackageVersion);
-                    string url = PersistentHelper.ConvertToWWWPath(filePath);
-                    _downloader1 = new UnityWebFileRequester();
-                    _downloader1.SendRequest(url, savePath);
-                }
-
-                if (_downloader1.IsDone() == false)
-                    return;
-
-                if (_downloader1.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader1.GetError();
-                }
-                else
-                {
-                    _steps = ESteps.UnpackManifestFile;
-                }
-
-                _downloader1.Dispose();
-            }
-
-            if (_steps == ESteps.UnpackManifestFile)
-            {
-                if (_downloader2 == null)
-                {
-                    string savePath = _persistent.GetSandboxPackageManifestFilePath(_buildinPackageVersion);
-                    string filePath = _persistent.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
-                    string url = PersistentHelper.ConvertToWWWPath(filePath);
-                    _downloader2 = new UnityWebFileRequester();
-                    _downloader2.SendRequest(url, savePath);
-                }
-
-                if (_downloader2.IsDone() == false)
-                    return;
-
-                if (_downloader2.HasError())
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloader2.GetError();
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-
-                _downloader2.Dispose();
-            }
-        }
-    }
-}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs

@@ -4,6 +4,10 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
+    /// <summary>
+    /// 预下载内容
+    /// 说明：目前只支持联机模式
+    /// </summary>
     public abstract class PreDownloadContentOperation : AsyncOperationBase
     {
         /// <summary>
@@ -51,11 +55,11 @@ namespace YooAsset
         public abstract ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
     }
 
-    internal class EditorPlayModePreDownloadContentOperation : PreDownloadContentOperation
+    internal class EditorSimulateModePreDownloadContentOperation : PreDownloadContentOperation
     {
         private readonly EditorSimulateModeImpl _impl;
 
-        public EditorPlayModePreDownloadContentOperation(EditorSimulateModeImpl impl)
+        public EditorSimulateModePreDownloadContentOperation(EditorSimulateModeImpl impl)
         {
             _impl = impl;
         }
@@ -69,23 +73,23 @@ namespace YooAsset
 
         public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
     }
     internal class OfflinePlayModePreDownloadContentOperation : PreDownloadContentOperation
@@ -106,23 +110,23 @@ namespace YooAsset
 
         public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
     }
     internal class HostPlayModePreDownloadContentOperation : PreDownloadContentOperation
@@ -130,19 +134,16 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckParams,
             CheckActiveManifest,
-            TryLoadCacheManifest,
-            DownloadManifest,
-            LoadCacheManifest,
+            LoadPackageManifest,
             Done,
         }
 
         private readonly HostPlayModeImpl _impl;
         private readonly string _packageVersion;
         private readonly int _timeout;
-        private LoadCacheManifestOperation _tryLoadCacheManifestOp;
-        private LoadCacheManifestOperation _loadCacheManifestOp;
-        private DownloadManifestOperation _downloadManifestOp;
+        private FSLoadPackageManifestOperation _loadPackageManifestOp;
         private PackageManifest _manifest;
         private ESteps _steps = ESteps.None;
 
@@ -155,13 +156,26 @@ namespace YooAsset
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.CheckActiveManifest;
+            _steps = ESteps.CheckParams;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckParams)
+            {
+                if (string.IsNullOrEmpty(_packageVersion))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Package version is null or empty.";
+                    return;
+                }
+
+                _steps = ESteps.CheckActiveManifest;
+            }
+
             if (_steps == ESteps.CheckActiveManifest)
             {
                 // 检测当前激活的清单对象
@@ -175,69 +189,22 @@ namespace YooAsset
                         return;
                     }
                 }
-                _steps = ESteps.TryLoadCacheManifest;
+                _steps = ESteps.LoadPackageManifest;
             }
 
-            if (_steps == ESteps.TryLoadCacheManifest)
+            if (_steps == ESteps.LoadPackageManifest)
             {
-                if (_tryLoadCacheManifestOp == null)
+                if (_loadPackageManifestOp == null)
                 {
-                    _tryLoadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _tryLoadCacheManifestOp);
+                    _loadPackageManifestOp = _impl.CacheFileSystem.LoadPackageManifestAsync(_packageVersion, _timeout);
                 }
 
-                if (_tryLoadCacheManifestOp.IsDone == false)
+                if (_loadPackageManifestOp.IsDone == false)
                     return;
 
-                if (_tryLoadCacheManifestOp.Status == EOperationStatus.Succeed)
+                if (_loadPackageManifestOp.Status == EOperationStatus.Succeed)
                 {
-                    _manifest = _tryLoadCacheManifestOp.Manifest;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.DownloadManifest;
-                }
-            }
-
-            if (_steps == ESteps.DownloadManifest)
-            {
-                if (_downloadManifestOp == null)
-                {
-                    _downloadManifestOp = new DownloadManifestOperation(_impl.Persistent, _impl.RemoteServices, _packageVersion, _timeout);
-                    OperationSystem.StartOperation(_impl.PackageName, _downloadManifestOp);
-                }
-
-                if (_downloadManifestOp.IsDone == false)
-                    return;
-
-                if (_downloadManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadCacheManifest;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloadManifestOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadCacheManifest)
-            {
-                if (_loadCacheManifestOp == null)
-                {
-                    _loadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
-                }
-
-                if (_loadCacheManifestOp.IsDone == false)
-                    return;
-
-                if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _manifest = _loadCacheManifestOp.Manifest;
+                    _manifest = _loadPackageManifestOp.Manifest;
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }
@@ -245,7 +212,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadCacheManifestOp.Error;
+                    Error = _loadPackageManifestOp.Error;
                 }
             }
         }
@@ -255,11 +222,11 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
-            List<BundleInfo> downloadList = _impl.GetDownloadListByAll(_manifest);
-            var operation = new ResourceDownloaderOperation(_impl.Download, _impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByAll(_manifest, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -267,11 +234,11 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
-            List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, new string[] { tag });
-            var operation = new ResourceDownloaderOperation(_impl.Download, _impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByTags(_manifest, new string[] { tag }, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -279,11 +246,11 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
-            List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, tags);
-            var operation = new ResourceDownloaderOperation(_impl.Download, _impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByTags(_manifest, tags, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -291,15 +258,15 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<AssetInfo> assetInfos = new List<AssetInfo>();
             var assetInfo = _manifest.ConvertLocationToAssetInfo(location, null);
             assetInfos.Add(assetInfo);
 
-            List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray());
-            var operation = new ResourceDownloaderOperation(_impl.Download, _impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -307,7 +274,7 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
@@ -317,8 +284,8 @@ namespace YooAsset
                 assetInfos.Add(assetInfo);
             }
 
-            List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray());
-            var operation = new ResourceDownloaderOperation(_impl.Download, _impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
     }
@@ -340,23 +307,23 @@ namespace YooAsset
 
         public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.Download, _impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
         }
     }
 }

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/RequestPackageVersionOperation.cs

@@ -0,0 +1,67 @@
+
+namespace YooAsset
+{
+    /// <summary>
+    /// 查询远端包裹的最新版本
+    /// </summary>
+    public abstract class RequestPackageVersionOperation : AsyncOperationBase
+    {
+        /// <summary>
+        /// 当前最新的包裹版本
+        /// </summary>
+        public string PackageVersion { protected set; get; }
+    }
+    internal sealed class RequestPackageVersionImplOperation : RequestPackageVersionOperation
+    {
+        private enum ESteps
+        {
+            None,
+            RequestPackageVersion,
+            Done,
+        }
+
+        private readonly IFileSystem _fileSystem;
+        private readonly bool _appendTimeTicks;
+        private readonly int _timeout;
+        private FSRequestPackageVersionOperation _requestPackageVersionOp;
+        private ESteps _steps = ESteps.None;
+
+        internal RequestPackageVersionImplOperation(IFileSystem fileSystem, bool appendTimeTicks, int timeout)
+        {
+            _fileSystem = fileSystem;
+            _appendTimeTicks = appendTimeTicks;
+            _timeout = timeout;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.RequestPackageVersion;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.RequestPackageVersion)
+            {
+                if (_requestPackageVersionOp == null)
+                    _requestPackageVersionOp = _fileSystem.RequestPackageVersionAsync(_appendTimeTicks, _timeout);
+
+                if (_requestPackageVersionOp.IsDone == false)
+                    return;
+
+                if (_requestPackageVersionOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    PackageVersion = _requestPackageVersionOp.PackageVersion;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _requestPackageVersionOp.Error;
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
+
 namespace YooAsset
 {
     /// <summary>
@@ -9,222 +6,30 @@ namespace YooAsset
     /// </summary>
     public abstract class UpdatePackageManifestOperation : AsyncOperationBase
     {
-        /// <summary>
-        /// 保存当前清单的版本，用于下次启动时自动加载的版本。
-        /// </summary>
-        public virtual void SavePackageVersion() { }
     }
-
-    /// <summary>
-    /// 编辑器下模拟运行的更新清单操作
-    /// </summary>
-    internal sealed class EditorPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
-    {
-        public EditorPlayModeUpdatePackageManifestOperation()
-        {
-        }
-        internal override void InternalOnStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalOnUpdate()
-        {
-        }
-    }
-
-    /// <summary>
-    /// 离线模式的更新清单操作
-    /// </summary>
-    internal sealed class OfflinePlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
-    {
-        public OfflinePlayModeUpdatePackageManifestOperation()
-        {
-        }
-        internal override void InternalOnStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalOnUpdate()
-        {
-        }
-    }
-
-    /// <summary>
-    /// 联机模式的更新清单操作
-    /// 注意：优先加载沙盒里缓存的清单文件，如果缓存没找到就下载远端清单文件，并保存到本地。
-    /// </summary>
-    internal sealed class HostPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
+    internal sealed class UpdatePackageManifestImplOperation : UpdatePackageManifestOperation
     {
         private enum ESteps
         {
             None,
             CheckParams,
             CheckActiveManifest,
-            TryLoadCacheManifest,
-            DownloadManifest,
-            LoadCacheManifest,
+            LoadPackageManifest,
             Done,
         }
 
-        private readonly HostPlayModeImpl _impl;
+        private readonly IPlayMode _impl;
+        private readonly IFileSystem _fileSystem;
         private readonly string _packageVersion;
-        private readonly bool _autoSaveVersion;
         private readonly int _timeout;
-        private LoadCacheManifestOperation _tryLoadCacheManifestOp;
-        private LoadCacheManifestOperation _loadCacheManifestOp;
-        private DownloadManifestOperation _downloadManifestOp;
+        private FSLoadPackageManifestOperation _loadPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
 
-        internal HostPlayModeUpdatePackageManifestOperation(HostPlayModeImpl impl, string packageVersion, bool autoSaveVersion, int timeout)
-        {
-            _impl = impl;
-            _packageVersion = packageVersion;
-            _autoSaveVersion = autoSaveVersion;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.CheckParams;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.CheckParams)
-            {
-                if (string.IsNullOrEmpty(_packageVersion))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Package version is null or empty.";
-                    return;
-                }
-
-                _steps = ESteps.CheckActiveManifest;
-            }
-
-            if (_steps == ESteps.CheckActiveManifest)
-            {
-                // 检测当前激活的清单对象	
-                if (_impl.ActiveManifest != null && _impl.ActiveManifest.PackageVersion == _packageVersion)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.TryLoadCacheManifest;
-                }
-            }
-
-            if (_steps == ESteps.TryLoadCacheManifest)
-            {
-                if (_tryLoadCacheManifestOp == null)
-                {
-                    _tryLoadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _tryLoadCacheManifestOp);
-                }
-
-                if (_tryLoadCacheManifestOp.IsDone == false)
-                    return;
-
-                if (_tryLoadCacheManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _impl.ActiveManifest = _tryLoadCacheManifestOp.Manifest;
-                    if (_autoSaveVersion)
-                        SavePackageVersion();
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.DownloadManifest;
-                }
-            }
-
-            if (_steps == ESteps.DownloadManifest)
-            {
-                if (_downloadManifestOp == null)
-                {
-                    _downloadManifestOp = new DownloadManifestOperation(_impl.Persistent, _impl.RemoteServices, _packageVersion, _timeout);
-                    OperationSystem.StartOperation(_impl.PackageName, _downloadManifestOp);
-                }
-
-                if (_downloadManifestOp.IsDone == false)
-                    return;
-
-                if (_downloadManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadCacheManifest;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _downloadManifestOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadCacheManifest)
-            {
-                if (_loadCacheManifestOp == null)
-                {
-                    _loadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
-                }
-
-                if (_loadCacheManifestOp.IsDone == false)
-                    return;
-
-                if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _impl.ActiveManifest = _loadCacheManifestOp.Manifest;
-                    if (_autoSaveVersion)
-                        SavePackageVersion();
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _loadCacheManifestOp.Error;
-                }
-            }
-        }
-
-        public override void SavePackageVersion()
-        {
-            _impl.FlushManifestVersionFile();
-        }
-    }
-
-    /// <summary>
-    /// WebGL模式的更新清单操作
-    /// </summary>
-    internal sealed class WebPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
-    {
-        private enum ESteps
-        {
-            None,
-            CheckParams,
-            CheckActiveManifest,
-            LoadRemoteManifest,
-            Done,
-        }
-
-        private readonly WebPlayModeImpl _impl;
-        private readonly string _packageVersion;
-        private readonly int _timeout;
-        private LoadRemoteManifestOperation _loadCacheManifestOp;
-        private ESteps _steps = ESteps.None;
-
-
-        internal WebPlayModeUpdatePackageManifestOperation(WebPlayModeImpl impl, string packageVersion, int timeout)
+        internal UpdatePackageManifestImplOperation(IPlayMode impl, IFileSystem fileSystem, string packageVersion, int timeout)
         {
             _impl = impl;
+            _fileSystem = fileSystem;
             _packageVersion = packageVersion;
             _timeout = timeout;
         }
@@ -244,10 +49,11 @@ namespace YooAsset
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
                     Error = "Package version is null or empty.";
-                    return;
                 }
-
-                _steps = ESteps.CheckActiveManifest;
+                else
+                {
+                    _steps = ESteps.CheckActiveManifest;
+                }
             }
 
             if (_steps == ESteps.CheckActiveManifest)
@@ -260,32 +66,29 @@ namespace YooAsset
                 }
                 else
                 {
-                    _steps = ESteps.LoadRemoteManifest;
+                    _steps = ESteps.LoadPackageManifest;
                 }
             }
 
-            if (_steps == ESteps.LoadRemoteManifest)
+            if (_steps == ESteps.LoadPackageManifest)
             {
-                if (_loadCacheManifestOp == null)
-                {
-                    _loadCacheManifestOp = new LoadRemoteManifestOperation(_impl.RemoteServices, _impl.PackageName, _packageVersion, _timeout);
-                    OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
-                }
+                if (_loadPackageManifestOp == null)
+                    _loadPackageManifestOp = _fileSystem.LoadPackageManifestAsync(_packageVersion, _timeout);
 
-                if (_loadCacheManifestOp.IsDone == false)
+                if (_loadPackageManifestOp.IsDone == false)
                     return;
 
-                if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
+                if (_loadPackageManifestOp.Status == EOperationStatus.Succeed)
                 {
-                    _impl.ActiveManifest = _loadCacheManifestOp.Manifest;
                     _steps = ESteps.Done;
+                    _impl.ActiveManifest = _loadPackageManifestOp.Manifest;
                     Status = EOperationStatus.Succeed;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadCacheManifestOp.Error;
+                    Error = _loadPackageManifestOp.Error;
                 }
             }
         }

UnityProject/Packages/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageVersionOperation.cs

@@ -1,165 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace YooAsset
-{
-    /// <summary>
-    /// 请求远端包裹的最新版本
-    /// </summary>
-    public abstract class UpdatePackageVersionOperation : AsyncOperationBase
-    {
-        /// <summary>
-        /// 当前最新的包裹版本
-        /// </summary>
-        public string PackageVersion { protected set; get; }
-    }
-
-    /// <summary>
-    /// 编辑器下模拟模式的请求远端包裹的最新版本
-    /// </summary>
-    internal sealed class EditorPlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
-    {
-        internal override void InternalOnStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalOnUpdate()
-        {
-        }
-    }
-
-    /// <summary>
-    /// 离线模式的请求远端包裹的最新版本
-    /// </summary>
-    internal sealed class OfflinePlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
-    {
-        internal override void InternalOnStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalOnUpdate()
-        {
-        }
-    }
-
-    /// <summary>
-    /// 联机模式的请求远端包裹的最新版本
-    /// </summary>
-    internal sealed class HostPlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
-    {
-        private enum ESteps
-        {
-            None,
-            QueryRemotePackageVersion,
-            Done,
-        }
-
-        private readonly HostPlayModeImpl _impl;
-        private readonly bool _appendTimeTicks;
-        private readonly int _timeout;
-        private QueryRemotePackageVersionOperation _queryRemotePackageVersionOp;
-        private ESteps _steps = ESteps.None;
-
-        internal HostPlayModeUpdatePackageVersionOperation(HostPlayModeImpl impl, bool appendTimeTicks, int timeout)
-        {
-            _impl = impl;
-            _appendTimeTicks = appendTimeTicks;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.QueryRemotePackageVersion;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.QueryRemotePackageVersion)
-            {
-                if (_queryRemotePackageVersionOp == null)
-                {
-                    _queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _impl.PackageName, _appendTimeTicks, _timeout);
-                    OperationSystem.StartOperation(_impl.PackageName, _queryRemotePackageVersionOp);
-                }
-
-                if (_queryRemotePackageVersionOp.IsDone == false)
-                    return;
-
-                if (_queryRemotePackageVersionOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageVersion = _queryRemotePackageVersionOp.PackageVersion;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _queryRemotePackageVersionOp.Error;
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// WebGL模式的请求远端包裹的最新版本
-    /// </summary>
-    internal sealed class WebPlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
-    {
-        private enum ESteps
-        {
-            None,
-            QueryRemotePackageVersion,
-            Done,
-        }
-
-        private readonly WebPlayModeImpl _impl;
-        private readonly bool _appendTimeTicks;
-        private readonly int _timeout;
-        private QueryRemotePackageVersionOperation _queryRemotePackageVersionOp;
-        private ESteps _steps = ESteps.None;
-
-        internal WebPlayModeUpdatePackageVersionOperation(WebPlayModeImpl impl, bool appendTimeTicks, int timeout)
-        {
-            _impl = impl;
-            _appendTimeTicks = appendTimeTicks;
-            _timeout = timeout;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.QueryRemotePackageVersion;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.QueryRemotePackageVersion)
-            {
-                if (_queryRemotePackageVersionOp == null)
-                {
-                    _queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _impl.PackageName, _appendTimeTicks, _timeout);
-                    OperationSystem.StartOperation(_impl.PackageName, _queryRemotePackageVersionOp);
-                }
-
-                if (_queryRemotePackageVersionOp.IsDone == false)
-                    return;
-
-                if (_queryRemotePackageVersionOp.Status == EOperationStatus.Succeed)
-                {
-                    PackageVersion = _queryRemotePackageVersionOp.PackageVersion;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _queryRemotePackageVersionOp.Error;
-                }
-            }
-        }
-    }
-}