From 5fa9ebee805417e3efbccd4070e0673cff2c3cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=86=A0=E5=B3=B0?= Date: Wed, 11 Dec 2024 11:22:50 +0800 Subject: [PATCH] feat : package manifest add note info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 清单文件增加备注信息 --- .../Editor/AssetBundleBuilder/BuildParameters.cs | 10 ++++++++++ .../BuildPipeline/BaseTasks/TaskCreateManifest.cs | 1 + .../BuildPipeline/BaseTasks/TaskCreateReport.cs | 1 + .../Editor/AssetBundleReporter/ReportSummary.cs | 5 +++++ .../VisualViewers/ReporterSummaryViewer.cs | 1 + .../YooAsset/Runtime/ResourcePackage/ManifestTools.cs | 2 ++ .../Operation/Internal/DeserializeManifestOperation.cs | 1 + .../Runtime/ResourcePackage/PackageManifest.cs | 5 +++++ .../Runtime/ResourcePackage/ResourcePackage.cs | 9 +++++++++ Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs | 2 +- 10 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs index 0180e73c..06f166fe 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs @@ -46,6 +46,10 @@ namespace YooAsset.Editor /// public string PackageVersion; + /// + /// 构建的包裹备注 + /// + public string PackageNote; /// /// 是否启用共享资源打包 @@ -159,6 +163,12 @@ namespace YooAsset.Editor { BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}"); } + + // 设置默认备注信息 + if (string.IsNullOrEmpty(PackageNote)) + { + PackageNote = DateTime.Now.ToString(); + } } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs index 4c8af55e..18659647 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs @@ -35,6 +35,7 @@ namespace YooAsset.Editor manifest.BuildPipeline = buildParameters.BuildPipeline; manifest.PackageName = buildParameters.PackageName; manifest.PackageVersion = buildParameters.PackageVersion; + manifest.PackageNote = buildParameters.PackageNote; manifest.BundleList = GetAllPackageBundle(buildMapContext); manifest.AssetList = GetAllPackageAsset(buildMapContext); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs index dccf6080..fb9c4476 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs @@ -31,6 +31,7 @@ namespace YooAsset.Editor buildReport.Summary.BuildMode = buildParameters.BuildMode; buildReport.Summary.BuildPackageName = buildParameters.PackageName; buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion; + buildReport.Summary.BuildPackageNote = buildParameters.PackageNote; // 收集器配置 buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName; diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs b/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs index 1bc382d4..e41435d8 100644 --- a/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs +++ b/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs @@ -53,6 +53,11 @@ namespace YooAsset.Editor /// public string BuildPackageVersion; + /// + /// 构建包裹备注 + /// + public string BuildPackageNote; + // 收集器配置 public bool UniqueBundleName; public bool EnableAddressable; diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs index 7142dec2..82f71b97 100644 --- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs @@ -65,6 +65,7 @@ namespace YooAsset.Editor _items.Add(new ItemWrapper("Build Mode", $"{buildReport.Summary.BuildMode}")); _items.Add(new ItemWrapper("Package Name", buildReport.Summary.BuildPackageName)); _items.Add(new ItemWrapper("Package Version", buildReport.Summary.BuildPackageVersion)); + _items.Add(new ItemWrapper("Package Note", buildReport.Summary.BuildPackageNote)); _items.Add(new ItemWrapper(string.Empty, string.Empty)); _items.Add(new ItemWrapper("Collect Settings", string.Empty)); diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs index 05f34659..417b1c78 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs @@ -42,6 +42,7 @@ namespace YooAsset buffer.WriteUTF8(manifest.BuildPipeline); buffer.WriteUTF8(manifest.PackageName); buffer.WriteUTF8(manifest.PackageVersion); + buffer.WriteUTF8(manifest.PackageNote); // 写入资源列表 buffer.WriteInt32(manifest.AssetList.Count); @@ -113,6 +114,7 @@ namespace YooAsset manifest.BuildPipeline = buffer.ReadUTF8(); manifest.PackageName = buffer.ReadUTF8(); manifest.PackageVersion = buffer.ReadUTF8(); + manifest.PackageNote = buffer.ReadUTF8(); // 检测配置 if (manifest.EnableAddressable && manifest.LocationToLower) diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs index 1793dbce..7b2a54b2 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs @@ -83,6 +83,7 @@ namespace YooAsset Manifest.BuildPipeline = _buffer.ReadUTF8(); Manifest.PackageName = _buffer.ReadUTF8(); Manifest.PackageVersion = _buffer.ReadUTF8(); + Manifest.PackageNote = _buffer.ReadUTF8(); // 检测配置 if (Manifest.EnableAddressable && Manifest.LocationToLower) diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs b/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs index 015e74e8..8e605c34 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs @@ -52,6 +52,11 @@ namespace YooAsset /// public string PackageVersion; + /// + /// 资源包裹的备注信息 + /// + public string PackageNote; + /// /// 资源列表（主动收集的资源列表） /// diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs index 4e12d5b9..1d1f7f98 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs @@ -272,6 +272,15 @@ namespace YooAsset return _playModeImpl.ActiveManifest.PackageVersion; } + /// + /// 获取本地包裹的备注信息 + /// + public string GetPackageNote() + { + DebugCheckInitialize(); + return _playModeImpl.ActiveManifest.PackageNote; + } + #region 资源回收 /// /// 强制回收所有资源 diff --git a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs index 853a098b..74cf57d0 100644 --- a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs +++ b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs @@ -29,7 +29,7 @@ namespace YooAsset /// /// 清单文件格式版本 /// - public const string ManifestFileVersion = "2.0.0"; + public const string ManifestFileVersion = "2.2.5"; ///