From eb2f783417e4d69296bd8ad5a80e1873378f9e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E5=86=A0=E5=B3=B0?= <hevinci@hotmail.com>
Date: Fri, 14 Mar 2025 17:23:55 +0800
Subject: [PATCH] update resource package
---
.../Runtime/ResourcePackage/ManifestDefine.cs | 21 +++++++++++++++++++
.../ResourcePackage/ManifestDefine.cs.meta | 11 ++++++++++
.../Runtime/ResourcePackage/ManifestTools.cs | 10 ++++-----
.../Internal/DeserializeManifestOperation.cs | 6 +++---
.../Runtime/Settings/YooAssetSettings.cs | 16 --------------
5 files changed, 40 insertions(+), 24 deletions(-)
create mode 100644 Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs
create mode 100644 Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs b/Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs
new file mode 100644
index 00000000..f37396ac
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs
@@ -0,0 +1,21 @@
+
+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";
+ }
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs.meta
new file mode 100644
index 00000000..956b8c0e
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3282b72521a19144292a482e50ba0429
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
index cfe87568..ffb7b5e1 100644
--- a/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
@@ -26,10 +26,10 @@ namespace YooAsset
using (FileStream fs = new FileStream(savePath, FileMode.Create))
{
// 创建缓存器
- BufferWriter buffer = new BufferWriter(YooAssetSettings.ManifestFileMaxSize);
+ BufferWriter buffer = new BufferWriter(ManifestDefine.FileMaxSize);
// 写入文件标记
- buffer.WriteUInt32(YooAssetSettings.ManifestFileSign);
+ buffer.WriteUInt32(ManifestDefine.FileSign);
// 写入文件版本
buffer.WriteUTF8(manifest.FileVersion);
@@ -97,13 +97,13 @@ namespace YooAsset
// 读取文件标记
uint fileSign = buffer.ReadUInt32();
- if (fileSign != YooAssetSettings.ManifestFileSign)
+ if (fileSign != ManifestDefine.FileSign)
throw new Exception("Invalid manifest file !");
// 读取文件版本
string fileVersion = buffer.ReadUTF8();
- if (fileVersion != YooAssetSettings.ManifestFileVersion)
- throw new Exception($"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}");
+ if (fileVersion != ManifestDefine.FileVersion)
+ throw new Exception($"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}");
PackageManifest manifest = new PackageManifest();
{
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
index 4e4b8d34..824854a2 100644
--- a/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
@@ -57,7 +57,7 @@ namespace YooAsset
// 读取文件标记
uint fileSign = _buffer.ReadUInt32();
- if (fileSign != YooAssetSettings.ManifestFileSign)
+ if (fileSign != ManifestDefine.FileSign)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
@@ -67,11 +67,11 @@ namespace YooAsset
// 读取文件版本
string fileVersion = _buffer.ReadUTF8();
- if (fileVersion != YooAssetSettings.ManifestFileVersion)
+ if (fileVersion != ManifestDefine.FileVersion)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
- Error = $"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}";
+ Error = $"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}";
return;
}
diff --git a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
index 0fb841e7..3562a812 100644
--- a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
+++ b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
@@ -16,22 +16,6 @@ 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>