fix #576

资源清单加密和解密
2026-05-27 11:10:11 +00:00 · 2025-06-20 11:36:29 +08:00
parent 9e33df0375
commit ed89e73d26
37 changed files with 310 additions and 85 deletions
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs
@@ -44,19 +44,33 @@ namespace YooAsset.Editor
        }

        /// <summary>
-        /// 创建加密类实例
+        /// 创建资源加密服务类实例
        /// </summary>
-        protected IEncryptionServices CreateEncryptionInstance()
+        protected IEncryptionServices CreateEncryptionServicesInstance()
        {
-            var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
-            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
+            var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
            if (classType != null)
                return (IEncryptionServices)Activator.CreateInstance(classType);
            else
                return null;
        }

+        /// <summary>
+        /// 创建资源清单服务类实例
+        /// </summary>
+        protected IManifestServices CreateManifestServicesInstance()
+        {
+            var className = AssetBundleBuilderSetting.GetPackageManifestServicesClassName(PackageName, PipelineName);
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestServices));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
+            if (classType != null)
+                return (IManifestServices)Activator.CreateInstance(classType);
+            else
+                return null;
+        }
+
        #region UI元素通用处理方法
        protected void SetBuildOutputField(TextField textField)
        {
@@ -149,35 +163,66 @@ namespace YooAsset.Editor
            });
            UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
        }
-        protected PopupField<Type> CreateEncryptionField(VisualElement container)
+        protected PopupField<Type> CreateEncryptionServicesField(VisualElement container)
        {
-            // 加密方法
-            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            if (encryptionClassTypes.Count > 0)
+            // 加密服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            if (classTypes.Count > 0)
            {
-                var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
-                int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName));
+                var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
                if (defaultIndex < 0)
                    defaultIndex = 0;
-                var encryptionField = new PopupField<Type>(encryptionClassTypes, defaultIndex);
-                encryptionField.label = "Encryption";
-                encryptionField.style.width = StyleWidth;
-                encryptionField.RegisterValueChangedCallback(evt =>
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
+                popupField.label = "Encryption Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
                {
-                    AssetBundleBuilderSetting.SetPackageEncyptionClassName(PackageName, PipelineName, encryptionField.value.FullName);
+                    AssetBundleBuilderSetting.SetPackageEncyptionServicesClassName(PackageName, PipelineName, popupField.value.FullName);
                });
-                container.Add(encryptionField);
-                UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
-                return encryptionField;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
            }
            else
            {
-                var encryptionField = new PopupField<Type>();
-                encryptionField.label = "Encryption";
-                encryptionField.style.width = StyleWidth;
-                container.Add(encryptionField);
-                UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
-                return encryptionField;
+                var popupField = new PopupField<Type>();
+                popupField.label = "Encryption Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+        }
+        protected PopupField<Type> CreateManifestServicesField(VisualElement container)
+        {
+            // 清单服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestServices));
+            if (classTypes.Count > 0)
+            {
+                var className = AssetBundleBuilderSetting.GetPackageManifestServicesClassName(PackageName, PipelineName);
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
+                if (defaultIndex < 0)
+                    defaultIndex = 0;
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
+                popupField.label = "Manifest Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageManifestServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                });
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+            else
+            {
+                var popupField = new PopupField<Type>();
+                popupField.label = "Manifest Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
            }
        }
        #endregion
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs
@@ -16,7 +16,8 @@ namespace YooAsset.Editor
        protected TemplateContainer Root;
        protected TextField _buildOutputField;
        protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestServicesField;
        protected EnumField _compressionField;
        protected EnumField _outputNameStyleField;
        protected EnumField _copyBuildinFileOptionField;
@@ -43,9 +44,10 @@ namespace YooAsset.Editor
            _buildVersionField = Root.Q<TextField>("BuildVersion");
            SetBuildVersionField(_buildVersionField);

-            // 加密方法
-            var encryptionContainer = Root.Q("EncryptionContainer");
-            _encryptionField = CreateEncryptionField(encryptionContainer);
+            // 服务类
+            var popupContainer = Root.Q("PopupContainer");
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestServicesField = CreateManifestServicesField(popupContainer);

            // 压缩方式选项
            _compressionField = Root.Q<EnumField>("Compression");
@@ -116,7 +118,8 @@ namespace YooAsset.Editor
            buildParameters.CompressOption = compressOption;
            buildParameters.ClearBuildCacheFiles = clearBuildCache;
            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();

            BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
            var buildResult = pipeline.Run(buildParameters, true);
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml
@@ -4,7 +4,7 @@
        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
        <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
        <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
        <uie:EnumField label="Compression" value="Center" name="Compression" />
        <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs
@@ -74,7 +74,6 @@ namespace YooAsset.Editor
            buildParameters.FileNameStyle = fileNameStyle;
            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();

            EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
            var buildResult = pipeline.Run(buildParameters, true);
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs
@@ -16,7 +16,8 @@ namespace YooAsset.Editor
        protected TemplateContainer Root;
        protected TextField _buildOutputField;
        protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestServicesField;
        protected EnumField _outputNameStyleField;
        protected EnumField _copyBuildinFileOptionField;
        protected TextField _copyBuildinFileTagsField;
@@ -43,8 +44,9 @@ namespace YooAsset.Editor
            SetBuildVersionField(_buildVersionField);

            // 加密方法
-            var encryptionContainer = Root.Q("EncryptionContainer");
-            _encryptionField = CreateEncryptionField(encryptionContainer);
+            var popupContainer = Root.Q("PopupContainer");
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestServicesField = CreateManifestServicesField(popupContainer);

            // 输出文件名称样式
            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
@@ -108,7 +110,8 @@ namespace YooAsset.Editor
            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
            buildParameters.ClearBuildCacheFiles = clearBuildCache;
            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();

            RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
            var buildResult = pipeline.Run(buildParameters, true);
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml
@@ -4,7 +4,7 @@
        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
        <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
        <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
        <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Param" name="CopyBuildinFileParam" />
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs
@@ -16,7 +16,8 @@ namespace YooAsset.Editor
        protected TemplateContainer Root;
        protected TextField _buildOutputField;
        protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestServicesField;
        protected EnumField _compressionField;
        protected EnumField _outputNameStyleField;
        protected EnumField _copyBuildinFileOptionField;
@@ -44,8 +45,9 @@ namespace YooAsset.Editor
            SetBuildVersionField(_buildVersionField);

            // 加密方法
-            var encryptionContainer = Root.Q("EncryptionContainer");
-            _encryptionField = CreateEncryptionField(encryptionContainer);
+            var popupContainer = Root.Q("PopupContainer");
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestServicesField = CreateManifestServicesField(popupContainer);

            // 压缩方式选项
            _compressionField = Root.Q<EnumField>("Compression");
@@ -118,7 +120,8 @@ namespace YooAsset.Editor
            buildParameters.ClearBuildCacheFiles = clearBuildCache;
            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
            buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();

            ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
            var buildResult = pipeline.Run(buildParameters, true);
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml
@@ -4,7 +4,7 @@
        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
        <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
        <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
        <uie:EnumField label="Compression" value="Center" name="Compression" />
        <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />