fix #576

资源清单加密和解密

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

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

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

@@ -11,7 +11,7 @@ namespace YooAsset
 
         /// <summary>
         /// 在构建应用程序前自动生成内置资源目录文件。
-        /// 原理：搜索StreamingAssets目录下的所有资源文件，然后将这些文件信息写入文件，并存储在Resources目录下。
+        /// 原理：搜索StreamingAssets目录下的所有资源文件，将这些文件信息写入文件，然后在运行时做查询用途。
         /// </summary>
         public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
         {
@@ -21,7 +21,7 @@ namespace YooAsset
             DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
             if (rootDirectory.Exists == false)
             {
-                UnityEngine.Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
+                Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
                 return;
             }
 
@@ -31,10 +31,17 @@ namespace YooAsset
             {
                 string packageName = subDirectory.Name;
                 string pacakgeDirectory = subDirectory.FullName;
-                bool result = CreateBuildinCatalogFile(packageName, pacakgeDirectory);
-                if (result == false)
+                try
                 {
-                    throw new System.Exception($"Create package {packageName} catalog file failed ! See the detail error in console !");
+                    bool result = CreateBuildinCatalogFile(null, packageName, pacakgeDirectory);
+                    if (result == false)
+                    {
+                        Debug.LogError($"Create package {packageName} catalog file failed ! See the detail error in console !");
+                    }
+                }
+                catch (System.Exception ex)
+                {
+                    Debug.LogError($"Create package {packageName} catalog file failed ! {ex.Message}");
                 }
             }
         }
@@ -42,7 +49,7 @@ namespace YooAsset
         /// <summary>
         /// 生成包裹的内置资源目录文件
         /// </summary>
-        public static bool CreateBuildinCatalogFile(string packageName, string pacakgeDirectory)
+        public static bool CreateBuildinCatalogFile(IManifestServices services, string packageName, string pacakgeDirectory)
         {
             // 获取资源清单版本
             string packageVersion;
@@ -70,7 +77,7 @@ namespace YooAsset
                 }
 
                 var binaryData = FileUtility.ReadAllBytes(manifestFilePath);
-                packageManifest = ManifestTools.DeserializeFromBinary(binaryData);
+                packageManifest = ManifestTools.DeserializeFromBinary(binaryData, services);
             }
 
             // 获取文件名映射关系

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

@@ -106,10 +106,11 @@ namespace YooAsset
                 if (_loadCatalogFileOp == null)
                 {
 #if UNITY_EDITOR
+                    /*
                     // 兼容性初始化
                     // 说明：内置文件系统在编辑器下运行时需要动态生成
                     string packageRoot = _fileSystem.FileRoot;
-                    bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
+                    bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.ManifestServices, _fileSystem.PackageName, packageRoot);
                     if (result == false)
                     {
                         _steps = ESteps.Done;
@@ -117,6 +118,7 @@ namespace YooAsset
                         Error = $"Create package catalog file failed ! See the detail error in console !";
                         return;
                     }
+                    */
 #endif
 
                     _loadCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);

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

@@ -85,7 +85,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }