update resource package

增加CustomPlayMode运行模式

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

@@ -4,132 +4,7 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-    /// <summary>
-    /// 预下载内容
-    /// 说明：目前只支持联机模式
-    /// </summary>
-    public abstract class PreDownloadContentOperation : AsyncOperationBase
-    {
-        /// <summary>
-        /// 创建资源下载器，用于下载当前资源版本所有的资源包文件
-        /// </summary>
-        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-        /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
-        public abstract ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
-
-        /// <summary>
-        /// 创建资源下载器，用于下载指定的资源标签关联的资源包文件
-        /// </summary>
-        /// <param name="tag">资源标签</param>
-        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-        /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
-        public abstract ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
-
-        /// <summary>
-        /// 创建资源下载器，用于下载指定的资源标签列表关联的资源包文件
-        /// </summary>
-        /// <param name="tags">资源标签列表</param>
-        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-        /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
-        public abstract ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
-
-        /// <summary>
-        /// 创建资源下载器，用于下载指定的资源依赖的资源包文件
-        /// </summary>
-        /// <param name="location">资源定位地址</param>
-        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-        /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
-        public abstract ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
-
-        /// <summary>
-        /// 创建资源下载器，用于下载指定的资源列表依赖的资源包文件
-        /// </summary>
-        /// <param name="locations">资源定位地址列表</param>
-        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-        /// <param name="failedTryAgain">下载失败的重试次数</param>
-        /// <param name="timeout">超时时间</param>
-        public abstract ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
-    }
-
-    internal class EditorSimulateModePreDownloadContentOperation : PreDownloadContentOperation
-    {
-        private readonly EditorSimulateModeImpl _impl;
-
-        public EditorSimulateModePreDownloadContentOperation(EditorSimulateModeImpl impl)
-        {
-            _impl = impl;
-        }
-        internal override void InternalStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalUpdate()
-        {
-        }
-
-        public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            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.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-    }
-    internal class OfflinePlayModePreDownloadContentOperation : PreDownloadContentOperation
-    {
-        private readonly OfflinePlayModeImpl _impl;
-
-        public OfflinePlayModePreDownloadContentOperation(OfflinePlayModeImpl impl)
-        {
-            _impl = impl;
-        }
-        internal override void InternalStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalUpdate()
-        {
-        }
-
-        public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            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.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-    }
-    internal class HostPlayModePreDownloadContentOperation : PreDownloadContentOperation
+    public sealed class PreDownloadContentOperation : AsyncOperationBase
     {
         private enum ESteps
         {
@@ -140,7 +15,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly HostPlayModeImpl _impl;
+        private readonly PlayModeImpl _impl;
         private readonly string _packageVersion;
         private readonly int _timeout;
         private FSLoadPackageManifestOperation _loadPackageManifestOp;
@@ -148,7 +23,7 @@ namespace YooAsset
         private ESteps _steps = ESteps.None;
 
 
-        internal HostPlayModePreDownloadContentOperation(HostPlayModeImpl impl, string packageVersion, int timeout)
+        internal PreDownloadContentOperation(PlayModeImpl impl, string packageVersion, int timeout)
         {
             _impl = impl;
             _packageVersion = packageVersion;
@@ -196,7 +71,8 @@ namespace YooAsset
             {
                 if (_loadPackageManifestOp == null)
                 {
-                    _loadPackageManifestOp = _impl.CacheFileSystem.LoadPackageManifestAsync(_packageVersion, _timeout);
+                    var mainFileSystem = _impl.GetMainFileSystem();
+                    _loadPackageManifestOp = mainFileSystem.LoadPackageManifestAsync(_packageVersion, _timeout);
                     _loadPackageManifestOp.StartOperation();
                     AddChildOperation(_loadPackageManifestOp);
                 }
@@ -220,7 +96,13 @@ namespace YooAsset
             }
         }
 
-        public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+        /// <summary>
+        /// 创建资源下载器，用于下载当前资源版本所有的资源包文件
+        /// </summary>
+        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+        /// <param name="failedTryAgain">下载失败的重试次数</param>
+        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -228,11 +110,19 @@ namespace YooAsset
                 return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
-            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByAll(_manifest, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            List<BundleInfo> downloadList = _impl.GetDownloadListByAll(_manifest);
             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)
+
+        /// <summary>
+        /// 创建资源下载器，用于下载指定的资源标签关联的资源包文件
+        /// </summary>
+        /// <param name="tag">资源标签</param>
+        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+        /// <param name="failedTryAgain">下载失败的重试次数</param>
+        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -240,11 +130,19 @@ namespace YooAsset
                 return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
-            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByTags(_manifest, new string[] { tag }, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, new string[] { tag });
             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)
+
+        /// <summary>
+        /// 创建资源下载器，用于下载指定的资源标签列表关联的资源包文件
+        /// </summary>
+        /// <param name="tags">资源标签列表</param>
+        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+        /// <param name="failedTryAgain">下载失败的重试次数</param>
+        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -252,11 +150,19 @@ namespace YooAsset
                 return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
-            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByTags(_manifest, tags, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, tags);
             var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+
+        /// <summary>
+        /// 创建资源下载器，用于下载指定的资源依赖的资源包文件
+        /// </summary>
+        /// <param name="location">资源定位地址</param>
+        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+        /// <param name="failedTryAgain">下载失败的重试次数</param>
+        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -268,11 +174,19 @@ namespace YooAsset
             var assetInfo = _manifest.ConvertLocationToAssetInfo(location, null);
             assetInfos.Add(assetInfo);
 
-            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), recursiveDownload, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), recursiveDownload);
             var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+
+        /// <summary>
+        /// 创建资源下载器，用于下载指定的资源列表依赖的资源包文件
+        /// </summary>
+        /// <param name="locations">资源定位地址列表</param>
+        /// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+        /// <param name="failedTryAgain">下载失败的重试次数</param>
+        /// <param name="timeout">超时时间</param>
+        public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             if (Status != EOperationStatus.Succeed)
             {
@@ -287,46 +201,9 @@ namespace YooAsset
                 assetInfos.Add(assetInfo);
             }
 
-            List<BundleInfo> downloadList = PlayModeHelper.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), recursiveDownload, _impl.BuildinFileSystem, _impl.CacheFileSystem);
+            List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), recursiveDownload);
             var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
     }
-    internal class WebPlayModePreDownloadContentOperation : PreDownloadContentOperation
-    {
-        private readonly WebPlayModeImpl _impl;
-
-        public WebPlayModePreDownloadContentOperation(WebPlayModeImpl impl)
-        {
-            _impl = impl;
-        }
-        internal override void InternalStart()
-        {
-            Status = EOperationStatus.Succeed;
-        }
-        internal override void InternalUpdate()
-        {
-        }
-
-        public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            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.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string location, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-        public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-        {
-            return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
-        }
-    }
 }