Merge 0b4f6d6639 into 6155256fb6

Assets/YooAsset/CHANGELOG.md

@@ -2,17 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.6] - 2025-03-25
-
-### Improvements
-
-- 构建管线新增了TaskCreateCatalog任务节点。
-- 内置文件系统的catalog文件现在存储在streammingAssets目录下。
-
-### Fixed
-
-- (#486) 修复了微信小游戏文件系统调用ClearUnusedBundleFiles时候的异常。
-
 ## [2.3.5-preview] - 2025-03-14
 
 ### Fixed

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

@@ -1,23 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-    public class TaskCreateCatalog
-    {
-        /// <summary>
-        /// 生成内置资源记录文件
-        /// </summary>
-        internal void CreateCatalogFile(BuildParametersContext buildParametersContext)
-        {
-            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
-            string buildPackageName = buildParametersContext.Parameters.PackageName;
-            DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
-
-            // 刷新目录
-            AssetDatabase.Refresh();
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs.meta

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

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

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
-            manifest.FileVersion = ManifestDefine.FileVersion;
+            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
             if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-
-namespace YooAsset.Editor
-{
-    public class TaskCreateCatalog_BBP : TaskCreateCatalog, IBuildTask
-    {
-        void IBuildTask.Run(BuildContext context)
-        {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-            {
-                CreateCatalogFile(buildParametersContext);
-            }
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs

@@ -36,7 +36,6 @@ namespace YooAsset.Editor
                     new TaskCreateReport_BBP(),
                     new TaskCreatePackage_BBP(),
                     new TaskCopyBuildinFiles_BBP(),
-                    new TaskCreateCatalog_BBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs

@@ -16,6 +16,7 @@ namespace YooAsset.Editor
             if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-
-namespace YooAsset.Editor
-{
-    public class TaskCreateCatalog_RFBP : TaskCreateCatalog, IBuildTask
-    {
-        void IBuildTask.Run(BuildContext context)
-        {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-            {
-                CreateCatalogFile(buildParametersContext);
-            }
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs

@@ -38,7 +38,6 @@ namespace YooAsset.Editor
                     new TaskCreateReport_RFBP(),
                     new TaskCreatePackage_RFBP(),
                     new TaskCopyBuildinFiles_RFBP(),
-                    new TaskCreateCatalog_RFBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
             if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-
-namespace YooAsset.Editor
-{
-    public class TaskCreateCatalog_SBP : TaskCreateCatalog, IBuildTask
-    {
-        void IBuildTask.Run(BuildContext context)
-        {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-            {
-                CreateCatalogFile(buildParametersContext);
-            }
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs.meta

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

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

@@ -36,7 +36,6 @@ namespace YooAsset.Editor
                     new TaskCreateReport_SBP(),
                     new TaskCreatePackage_SBP(),
                     new TaskCopyBuildinFiles_SBP(),
-                    new TaskCreateCatalog_SBP()
                 };
             return pipeline;
         }

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

@@ -1,21 +0,0 @@
-
-namespace YooAsset
-{
-    internal class CatalogDefine
-    {
-        /// <summary>
-        /// 文件极限大小（100MB）
-        /// </summary>
-        public const int FileMaxSize = 104857600;
-
-        /// <summary>
-        /// 文件头标记
-        /// </summary>
-        public const uint FileSign = 0x133C5EE;
-
-        /// <summary>
-        /// 文件格式版本
-        /// </summary>
-        public const string FileVersion = "1.0.0";
-    }
-}

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

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

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

@@ -1,102 +0,0 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace YooAsset
-{
-    internal static class CatalogTools
-    {
-        /// <summary>
-        /// 序列化（JSON文件）
-        /// </summary>
-        public static void SerializeToJson(string savePath, DefaultBuildinFileCatalog catalog)
-        {
-            string json = JsonUtility.ToJson(catalog, true);
-            FileUtility.WriteAllText(savePath, json);
-        }
-
-        /// <summary>
-        /// 反序列化（JSON文件）
-        /// </summary>
-        public static DefaultBuildinFileCatalog DeserializeFromJson(string jsonContent)
-        {
-            return JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonContent);
-        }
-
-        /// <summary>
-        /// 序列化（二进制文件）
-        /// </summary>
-        public static void SerializeToBinary(string savePath, DefaultBuildinFileCatalog catalog)
-        {
-            using (FileStream fs = new FileStream(savePath, FileMode.Create))
-            {
-                // 创建缓存器
-                BufferWriter buffer = new BufferWriter(CatalogDefine.FileMaxSize);
-
-                // 写入文件标记
-                buffer.WriteUInt32(CatalogDefine.FileSign);
-
-                // 写入文件版本
-                buffer.WriteUTF8(CatalogDefine.FileVersion);
-
-                // 写入文件头信息
-                buffer.WriteUTF8(catalog.PackageName);
-                buffer.WriteUTF8(catalog.PackageVersion);
-
-                // 写入资源包列表
-                buffer.WriteInt32(catalog.Wrappers.Count);
-                for (int i = 0; i < catalog.Wrappers.Count; i++)
-                {
-                    var fileWrapper = catalog.Wrappers[i];
-                    buffer.WriteUTF8(fileWrapper.BundleGUID);
-                    buffer.WriteUTF8(fileWrapper.FileName);
-                }
-
-                // 写入文件流
-                buffer.WriteToStream(fs);
-                fs.Flush();
-            }
-        }
-
-        /// <summary>
-        /// 反序列化（二进制文件）
-        /// </summary>
-        public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
-        {
-            // 创建缓存器
-            BufferReader buffer = new BufferReader(binaryData);
-
-            // 读取文件标记
-            uint fileSign = buffer.ReadUInt32();
-            if (fileSign != CatalogDefine.FileSign)
-                throw new Exception("Invalid catalog file !");
-
-            // 读取文件版本
-            string fileVersion = buffer.ReadUTF8();
-            if (fileVersion != CatalogDefine.FileVersion)
-                throw new Exception($"The catalog file version are not compatible : {fileVersion} != {CatalogDefine.FileVersion}");
-
-            DefaultBuildinFileCatalog catalog = new DefaultBuildinFileCatalog();
-            {
-                // 读取文件头信息
-                catalog.FileVersion = fileVersion;
-                catalog.PackageName = buffer.ReadUTF8();
-                catalog.PackageVersion = buffer.ReadUTF8();
-
-                // 读取资源包列表
-                int fileCount = buffer.ReadInt32();
-                catalog.Wrappers = new List<DefaultBuildinFileCatalog.FileWrapper>(fileCount);
-                for (int i = 0; i < fileCount; i++)
-                {
-                    var fileWrapper = new DefaultBuildinFileCatalog.FileWrapper();
-                    fileWrapper.BundleGUID = buffer.ReadUTF8();
-                    fileWrapper.FileName = buffer.ReadUTF8();
-                    catalog.Wrappers.Add(fileWrapper);
-                }
-            }
-
-            return catalog;
-        }
-    }
-}

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

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

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

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 
 namespace YooAsset
@@ -15,12 +14,13 @@ namespace YooAsset
         {
             public string BundleGUID;
             public string FileName;
-        }
 
-        /// <summary>
+            public FileWrapper(string bundleGUID, string fileName)
-        /// 文件版本
+            {
-        /// </summary>
+                BundleGUID = bundleGUID;
-        public string FileVersion;
+                FileName = fileName;
+            }
+        }
 
         /// <summary>
         /// 包裹名称

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

@@ -336,9 +336,10 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(_packageRoot, fileName);
         }
-        public string GetCatalogBinaryFileLoadPath()
+        public string GetCatalogFileLoadPath()
         {
-            return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
+            string fileName = DefaultBuildinFileSystemDefine.BuildinCatalogFileName;
+            return PathUtility.Combine(YooAssetSettingsData.GetRequestYooDefaultBuildinRoot(), PackageName, fileName);
         }
 
         /// <summary>

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

@@ -5,15 +5,13 @@ using UnityEngine;
 
 namespace YooAsset
 {
-    public class DefaultBuildinFileSystemBuild : UnityEditor.Build.IPreprocessBuildWithReport
+    public class DefaultBuildinFileSystemBuild
     {
-        public int callbackOrder { get { return 0; } }
-
         /// <summary>
-        /// 在构建应用程序前自动生成内置资源目录文件。
+        /// 输出包裹的内置资源目录文件
-        /// 原理：搜索StreamingAssets目录下的所有资源文件，然后将这些文件信息写入文件，并存储在Resources目录下。
         /// </summary>
-        public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
+        /// <exception cref="System.Exception"></exception>
+        public static void ExportBuildinCatalogFile()
         {
             YooLogger.Log("Begin to create catalog file !");
 
@@ -84,24 +82,9 @@ namespace YooAsset
 
             // 创建内置清单实例
             var buildinFileCatalog = new DefaultBuildinFileCatalog();
-            buildinFileCatalog.FileVersion = CatalogDefine.FileVersion;
             buildinFileCatalog.PackageName = packageName;
             buildinFileCatalog.PackageVersion = packageVersion;
 
-            // 创建白名单查询集合
-            HashSet<string> whiteFileList = new HashSet<string>
-            {
-                "link.xml",
-                "buildlogtep.json",
-                $"{packageName}.version",
-                $"{packageName}_{packageVersion}.bytes",
-                $"{packageName}_{packageVersion}.hash",
-                $"{packageName}_{packageVersion}.json",
-                $"{packageName}_{packageVersion}.report",
-                DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName,
-                DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName
-            };
-
             // 记录所有内置资源文件
             DirectoryInfo rootDirectory = new DirectoryInfo(pacakgeDirectory);
             FileInfo[] fileInfos = rootDirectory.GetFiles();
@@ -110,15 +93,25 @@ namespace YooAsset
                 if (fileInfo.Extension == ".meta")
                     continue;
 
-                if (whiteFileList.Contains(fileInfo.Name))
+                if (fileInfo.Name == "link.xml" || fileInfo.Name == "buildlogtep.json")
+                    continue;
+                if (fileInfo.Name == $"{packageName}.version")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.bytes")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.hash")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.json")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.report")
+                    continue;
+                if (fileInfo.Name == DefaultBuildinFileSystemDefine.BuildinCatalogFileName)
                     continue;
 
                 string fileName = fileInfo.Name;
                 if (fileMapping.TryGetValue(fileName, out string bundleGUID))
                 {
-                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper(bundleGUID, fileName);
-                    wrapper.BundleGUID = bundleGUID;
-                    wrapper.FileName = fileName;
                     buildinFileCatalog.Wrappers.Add(wrapper);
                 }
                 else
@@ -127,20 +120,16 @@ namespace YooAsset
                 }
             }
 
-            // 创建输出文件
+            // 创建输出目录
-            string jsonFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
+            string fullPath = YooAssetSettingsData.GetYooDefaultBuildinRoot();
-            if (File.Exists(jsonFilePath))
+            string saveFilePath = $"{fullPath}/{packageName}/{DefaultBuildinFileSystemDefine.BuildinCatalogFileName}";
-                File.Delete(jsonFilePath);
+            FileUtility.CreateFileDirectory(saveFilePath);
-            CatalogTools.SerializeToJson(jsonFilePath, buildinFileCatalog);
 
             // 创建输出文件
-            string binaryFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
+            File.WriteAllText(saveFilePath, JsonUtility.ToJson(buildinFileCatalog, false));
-            if (File.Exists(binaryFilePath))
-                File.Delete(binaryFilePath);
-            CatalogTools.SerializeToBinary(binaryFilePath, buildinFileCatalog);
-
             UnityEditor.AssetDatabase.Refresh();
-            Debug.Log($"Succeed to save buildin file catalog : {binaryFilePath}");
+
+            Debug.Log($"Succeed to save buildin file catalog : {saveFilePath}");
             return true;
         }
     }

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

@@ -4,13 +4,8 @@ namespace YooAsset
     internal class DefaultBuildinFileSystemDefine
     {
         /// <summary>
-        /// 内置清单JSON文件名称
+        /// 内置清单文件名称
         /// </summary>
-        public const string BuildinCatalogJsonFileName = "BuildinCatalog.json";
+        public const string BuildinCatalogFileName = "BuildinCatalog.json";
-
-        /// <summary>
-        /// 内置清单二进制文件名称
-        /// </summary>
-        public const string BuildinCatalogBinaryFileName = "BuildinCatalog.bytes";
     }
 }

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs

@@ -1,4 +1,5 @@
-using System;
+using UnityEngine;
+using UnityEngine.Networking;
 
 namespace YooAsset
 {
@@ -7,84 +8,89 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            RequestData,
             LoadCatalog,
+            WaitForRequest,
             Done,
         }
 
+        private UnityWebRequest _request;
         private readonly DefaultBuildinFileSystem _fileSystem;
-        private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
+
         internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.RequestData;
+            _steps = ESteps.LoadCatalog;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.RequestData)
+            string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
-            {
-                if (_webDataRequestOp == null)
-                {
-                    string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
-                    string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
-                    _webDataRequestOp.StartOperation();
-                    AddChildOperation(_webDataRequestOp);
-                }
-
-                _webDataRequestOp.UpdateOperation();
-                if (_webDataRequestOp.IsDone == false)
-                    return;
-
-                if (_webDataRequestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadCatalog;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _webDataRequestOp.Error;
-                }
-            }
 
             if (_steps == ESteps.LoadCatalog)
             {
-                try
+                _request = UnityWebRequest.Get(catalogFilePath);
-                {
+                _request.SendWebRequest();
-                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                _steps = ESteps.WaitForRequest;
-                    if (catalog.PackageName != _fileSystem.PackageName)
+                return;
-                    {
+            }
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
-                        return;
-                    }
 
-                    foreach (var wrapper in catalog.Wrappers)
+            if (_steps == ESteps.WaitForRequest)
-                    {
+            {
-                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                // 等待请求完成
-                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                if (!_request.isDone)
-                    }
+                    return;
 
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                if (_request.result != UnityWebRequest.Result.Success)
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                catch (Exception e)
                 {
+                    _request.Dispose();
+                    _request = null;
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load catalog file : {e.Message}";
+                    Error = $"Failed to load catalog file: {_request.error}";
+                    return;
                 }
+
+                // 解析 JSON
+                string jsonText = _request.downloadHandler.text;
+                var catalog = JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonText);
+                if (catalog == null)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed to load catalog file : {catalogFilePath}";
+                    return;
+                }
+
+                if (catalog.PackageName != _fileSystem.PackageName)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                    return;
+                }
+
+                foreach (var wrapper in catalog.Wrappers)
+                {
+                    var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                    _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                }
+
+                YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                _request.Dispose();
+                _request = null;
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
             }
         }
     }

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

@@ -198,9 +198,10 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(FileRoot, fileName);
         }
-        public string GetCatalogBinaryFileLoadPath()
+        public string GetCatalogFileLoadPath()
         {
-            return PathUtility.Combine(_webPackageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
+            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
+            return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
         }
 
         /// <summary>

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs

@@ -2,6 +2,8 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Networking;
 
 namespace YooAsset
 {
@@ -10,84 +12,94 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            RequestData,
             LoadCatalog,
+            WaitForRequest,
             Done,
         }
 
+        private UnityWebRequest _request;
         private readonly DefaultWebServerFileSystem _fileSystem;
-        private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
+        /// <summary>
+        /// 内置清单版本
+        /// </summary>
+        public string PackageVersion { private set; get; }
+
         internal LoadWebServerCatalogFileOperation(DefaultWebServerFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.RequestData;
+            _steps = ESteps.LoadCatalog;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.RequestData)
+            string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
-            {
-                if (_webDataRequestOp == null)
-                {
-                    string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
-                    string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
-                    _webDataRequestOp.StartOperation();
-                    AddChildOperation(_webDataRequestOp);
-                }
-
-                _webDataRequestOp.UpdateOperation();
-                if (_webDataRequestOp.IsDone == false)
-                    return;
-
-                if (_webDataRequestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadCatalog;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _webDataRequestOp.Error;
-                }
-            }
 
             if (_steps == ESteps.LoadCatalog)
             {
-                try
+                _request = UnityWebRequest.Get(catalogFilePath);
-                {
+                _request.SendWebRequest();
-                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                _steps = ESteps.WaitForRequest;
-                    if (catalog.PackageName != _fileSystem.PackageName)
+                return;
-                    {
+            }
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
-                        return;
-                    }
 
-                    foreach (var wrapper in catalog.Wrappers)
+            if (_steps == ESteps.WaitForRequest)
-                    {
+            {
-                        var fileWrapper = new DefaultWebServerFileSystem.FileWrapper(wrapper.FileName);
+                // 等待请求完成
-                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                if (!_request.isDone)
-                    }
+                    return;
 
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                if (_request.result != UnityWebRequest.Result.Success)
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                catch (Exception e)
                 {
+                    _request.Dispose();
+                    _request = null;
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load catalog file : {e.Message}";
+                    Error = $"Failed to load web server catalog file: {_request.error}";
+                    return;
                 }
+
+                // 解析 JSON
+                string jsonText = _request.downloadHandler.text;
+                var catalog = JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonText);
+                if (catalog == null)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed to load web server catalog file : {catalogFilePath}";
+                    return;
+                }
+
+                if (catalog.PackageName != _fileSystem.PackageName)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Web server catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                    return;
+                }
+
+                PackageVersion = catalog.PackageVersion;
+                foreach (var wrapper in catalog.Wrappers)
+                {
+                    var fileWrapper = new DefaultWebServerFileSystem.FileWrapper(wrapper.FileName);
+                    _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                }
+
+                YooLogger.Log($"Package '{_fileSystem.PackageName}' catalog files count : {catalog.Wrappers.Count}");
+                _request.Dispose();
+                _request = null;
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
             }
         }
     }

Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs

@@ -1,21 +0,0 @@
-
-namespace YooAsset
-{
-    public class ManifestDefine
-    {
-        /// <summary>
-        /// 文件极限大小（100MB）
-        /// </summary>
-        public const int FileMaxSize = 104857600;
-
-        /// <summary>
-        /// 文件头标记
-        /// </summary>
-        public const uint FileSign = 0x594F4F;
-
-        /// <summary>
-        /// 文件格式版本
-        /// </summary>
-        public const string FileVersion = "2.3.1";
-    }
-}

Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs.meta

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

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -8,6 +8,7 @@ namespace YooAsset
 {
     internal static class ManifestTools
     {
+#if UNITY_EDITOR
         /// <summary>
         /// 序列化（JSON文件）
         /// </summary>
@@ -25,10 +26,10 @@ namespace YooAsset
             using (FileStream fs = new FileStream(savePath, FileMode.Create))
             {
                 // 创建缓存器
-                BufferWriter buffer = new BufferWriter(ManifestDefine.FileMaxSize);
+                BufferWriter buffer = new BufferWriter(YooAssetSettings.ManifestFileMaxSize);
 
                 // 写入文件标记
-                buffer.WriteUInt32(ManifestDefine.FileSign);
+                buffer.WriteUInt32(YooAssetSettings.ManifestFileSign);
 
                 // 写入文件版本
                 buffer.WriteUTF8(manifest.FileVersion);
@@ -96,13 +97,13 @@ namespace YooAsset
 
             // 读取文件标记
             uint fileSign = buffer.ReadUInt32();
-            if (fileSign != ManifestDefine.FileSign)
+            if (fileSign != YooAssetSettings.ManifestFileSign)
                 throw new Exception("Invalid manifest file !");
 
             // 读取文件版本
             string fileVersion = buffer.ReadUTF8();
-            if (fileVersion != ManifestDefine.FileVersion)
+            if (fileVersion != YooAssetSettings.ManifestFileVersion)
-                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}");
+                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}");
 
             PackageManifest manifest = new PackageManifest();
             {
@@ -159,7 +160,7 @@ namespace YooAsset
             InitManifest(manifest);
             return manifest;
         }
-
+#endif
 
         #region 解析资源清单辅助方法
         public static void InitManifest(PackageManifest manifest)

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

@@ -57,7 +57,7 @@ namespace YooAsset
 
                     // 读取文件标记
                     uint fileSign = _buffer.ReadUInt32();
-                    if (fileSign != ManifestDefine.FileSign)
+                    if (fileSign != YooAssetSettings.ManifestFileSign)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
@@ -67,11 +67,11 @@ namespace YooAsset
 
                     // 读取文件版本
                     string fileVersion = _buffer.ReadUTF8();
-                    if (fileVersion != ManifestDefine.FileVersion)
+                    if (fileVersion != YooAssetSettings.ManifestFileVersion)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}";
+                        Error = $"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}";
                         return;
                     }
 

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -16,6 +16,22 @@ namespace YooAsset
         public string PackageManifestPrefix = string.Empty;
         
 
+        /// <summary>
+        /// 清单文件头标记
+        /// </summary>
+        public const uint ManifestFileSign = 0x594F4F;
+
+        /// <summary>
+        /// 清单文件极限大小（100MB）
+        /// </summary>
+        public const int ManifestFileMaxSize = 104857600;
+
+        /// <summary>
+        /// 清单文件格式版本
+        /// </summary>
+        public const string ManifestFileVersion = "2.3.1";
+
+
         /// <summary>
         /// 构建输出文件夹名称
         /// </summary>

Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs

@@ -106,6 +106,28 @@ namespace YooAsset
         }
 
         #region 路径相关
+        /// <summary>
+        /// 获取YOO的Resources目录的加载路径
+        /// </summary>
+        internal static string GetYooResourcesLoadPath(string packageName, string fileName)
+        {
+            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
+                return PathUtility.Combine(packageName, fileName);
+            else
+                return PathUtility.Combine(Setting.DefaultYooFolderName, packageName, fileName);
+        }
+
+        /// <summary>
+        /// 获取YOO的Resources目录的全路径
+        /// </summary>
+        internal static string GetYooResourcesFullPath()
+        {
+            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
+                return $"Assets/Resources";
+            else
+                return $"Assets/Resources/{Setting.DefaultYooFolderName}";
+        }
+
         /// <summary>
         /// 获取YOO的编辑器下缓存文件根目录
         /// </summary>
@@ -198,6 +220,26 @@ namespace YooAsset
             else
                 return PathUtility.Combine(Application.streamingAssetsPath, Setting.DefaultYooFolderName);
         }
+
+        internal static string GetRequestYooDefaultBuildinRoot()
+        {
+            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
+                return GetRequestStreamingAssetsPath();
+            else
+                return PathUtility.Combine(GetRequestStreamingAssetsPath(), Setting.DefaultYooFolderName);
+        }
+
+        /// <summary>
+        /// 获取UnityWebRequest StreamingAssets的路径 (OSX and iOS 需要加 file://)
+        /// </summary>
+        internal static string GetRequestStreamingAssetsPath()
+        {
+#if UNITY_STANDALONE_OSX || UNITY_IOS
+            return $"file://{Application.streamingAssetsPath}";
+#else
+            return Application.streamingAssetsPath;
+#endif
+        }
         #endregion
     }
 }

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs

@@ -17,7 +17,7 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation
 
     private readonly WechatFileSystem _fileSystem;
     private readonly PackageManifest _manifest;
-    private List<string> _unusedCacheFiles = new List<string>(1000);
+    private List<string> _unusedCacheFiles;
     private int _unusedFileTotalCount = 0;
     private ESteps _steps = ESteps.None;
 

Assets/YooAsset/package.json

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