Update logic code
优化补丁清单格式为二进制。
This commit is contained in:
@@ -105,7 +105,7 @@ namespace YooAsset
|
||||
|
||||
if (_steps == ESteps.LoadWebManifest)
|
||||
{
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageVersion);
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_packageName, _packageVersion);
|
||||
string webURL = GetPatchManifestRequestURL(fileName);
|
||||
YooLogger.Log($"Beginning to request patch manifest : {webURL}");
|
||||
_downloader = new UnityWebDataRequester();
|
||||
@@ -131,7 +131,8 @@ namespace YooAsset
|
||||
// 解析补丁清单
|
||||
try
|
||||
{
|
||||
_remotePatchManifest = PatchManifest.Deserialize(_downloader.GetText());
|
||||
byte[] bytesData = _downloader.GetData();
|
||||
_remotePatchManifest = PatchManifest.DeserializeFromBinary(bytesData);
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Succeed;
|
||||
}
|
||||
|
||||
@@ -56,8 +56,8 @@ namespace YooAsset
|
||||
try
|
||||
{
|
||||
YooLogger.Log($"Load simulation manifest file : {_simulatePatchManifestPath}");
|
||||
string jsonContent = FileUtility.ReadFile(_simulatePatchManifestPath);
|
||||
var manifest = PatchManifest.Deserialize(jsonContent);
|
||||
byte[] bytesData = FileUtility.ReadAllBytes(_simulatePatchManifestPath);
|
||||
var manifest = PatchManifest.DeserializeFromBinary(bytesData);
|
||||
InitializedPackageVersion = manifest.PackageVersion;
|
||||
_impl.SetSimulatePatchManifest(manifest);
|
||||
_steps = ESteps.Done;
|
||||
@@ -491,7 +491,7 @@ namespace YooAsset
|
||||
|
||||
if (_steps == ESteps.LoadAppManifest)
|
||||
{
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageVersion);
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
|
||||
string filePath = PathHelper.MakeStreamingLoadPath(fileName);
|
||||
string url = PathHelper.ConvertToWWWPath(filePath);
|
||||
_downloader = new UnityWebDataRequester();
|
||||
@@ -513,7 +513,8 @@ namespace YooAsset
|
||||
// 解析APP里的补丁清单
|
||||
try
|
||||
{
|
||||
Manifest = PatchManifest.Deserialize(_downloader.GetText());
|
||||
byte[] bytesData = _downloader.GetData();
|
||||
Manifest = PatchManifest.DeserializeFromBinary(bytesData);
|
||||
}
|
||||
catch (System.Exception e)
|
||||
{
|
||||
@@ -590,7 +591,7 @@ namespace YooAsset
|
||||
if (_steps == ESteps.CopyAppManifest)
|
||||
{
|
||||
string savePath = PersistentHelper.GetCacheManifestFilePath(_buildinPackageName);
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageVersion);
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
|
||||
string filePath = PathHelper.MakeStreamingLoadPath(fileName);
|
||||
string url = PathHelper.ConvertToWWWPath(filePath);
|
||||
_downloader = new UnityWebFileRequester();
|
||||
|
||||
@@ -171,7 +171,7 @@ namespace YooAsset
|
||||
|
||||
if (_steps == ESteps.LoadWebManifest)
|
||||
{
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageVersion);
|
||||
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_packageName, _packageVersion);
|
||||
string webURL = GetPatchManifestRequestURL(fileName);
|
||||
YooLogger.Log($"Beginning to request patch manifest : {webURL}");
|
||||
_downloader2 = new UnityWebDataRequester();
|
||||
@@ -194,8 +194,8 @@ namespace YooAsset
|
||||
{
|
||||
try
|
||||
{
|
||||
string content = _downloader2.GetText();
|
||||
var manifest = PersistentHelper.SaveCacheManifestFile(_packageName, content);
|
||||
byte[] bytesData = _downloader2.GetData();
|
||||
var manifest = PersistentHelper.SaveCacheManifestFile(_packageName, bytesData);
|
||||
_impl.SetLocalPatchManifest(manifest);
|
||||
FoundNewManifest = true;
|
||||
_steps = ESteps.InitVerifyingCache;
|
||||
|
||||
@@ -109,15 +109,8 @@ namespace YooAsset
|
||||
}
|
||||
|
||||
|
||||
public PatchBundle(string bundleName, string fileHash, string fileCRC, long fileSize, bool isRawFile, byte loadMethod, string[] tags)
|
||||
public PatchBundle()
|
||||
{
|
||||
BundleName = bundleName;
|
||||
FileHash = fileHash;
|
||||
FileCRC = fileCRC;
|
||||
FileSize = fileSize;
|
||||
IsRawFile = isRawFile;
|
||||
LoadMethod = loadMethod;
|
||||
Tags = tags;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -266,48 +266,147 @@ namespace YooAsset
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 序列化
|
||||
/// 序列化(JSON文件)
|
||||
/// </summary>
|
||||
public static void Serialize(string savePath, PatchManifest patchManifest)
|
||||
public static void SerializeToJson(string savePath, PatchManifest manifest)
|
||||
{
|
||||
string json = JsonUtility.ToJson(patchManifest);
|
||||
string json = JsonUtility.ToJson(manifest, true);
|
||||
FileUtility.CreateFile(savePath, json);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 反序列化
|
||||
/// 序列化(二进制文件)
|
||||
/// </summary>
|
||||
public static PatchManifest Deserialize(string jsonData)
|
||||
public static void SerializeToBinary(string savePath, PatchManifest patchManifest)
|
||||
{
|
||||
PatchManifest patchManifest = JsonUtility.FromJson<PatchManifest>(jsonData);
|
||||
if (patchManifest == null)
|
||||
throw new System.Exception($"{nameof(PatchManifest)} deserialize object is null !");
|
||||
using (FileStream fs = new FileStream(savePath, FileMode.Create))
|
||||
{
|
||||
// 创建缓存器
|
||||
BufferWriter buffer = new BufferWriter(YooAssetSettings.PatchManifestFileMaxSize);
|
||||
|
||||
// 检测文件版本
|
||||
if (patchManifest.FileVersion != YooAssetSettings.PatchManifestFileVersion)
|
||||
throw new Exception($"The manifest file version are not compatible : {patchManifest.FileVersion} != {YooAssetSettings.PatchManifestFileVersion}");
|
||||
// 写入文件标记
|
||||
buffer.WriteUInt32(YooAssetSettings.PatchManifestFileSign);
|
||||
|
||||
// 写入文件版本
|
||||
buffer.WriteUTF8(patchManifest.FileVersion);
|
||||
|
||||
// 写入文件头信息
|
||||
buffer.WriteBool(patchManifest.EnableAddressable);
|
||||
buffer.WriteInt32(patchManifest.OutputNameStyle);
|
||||
buffer.WriteUTF8(patchManifest.PackageName);
|
||||
buffer.WriteUTF8(patchManifest.PackageVersion);
|
||||
|
||||
// 写入资源列表
|
||||
buffer.WriteInt32(patchManifest.AssetList.Count);
|
||||
for (int i = 0; i < patchManifest.AssetList.Count; i++)
|
||||
{
|
||||
var patchAsset = patchManifest.AssetList[i];
|
||||
buffer.WriteUTF8(patchAsset.Address);
|
||||
buffer.WriteUTF8(patchAsset.AssetPath);
|
||||
buffer.WriteUTF8Array(patchAsset.AssetTags);
|
||||
buffer.WriteInt32(patchAsset.BundleID);
|
||||
buffer.WriteInt32Array(patchAsset.DependIDs);
|
||||
}
|
||||
|
||||
// 写入资源包列表
|
||||
buffer.WriteInt32(patchManifest.BundleList.Count);
|
||||
for (int i = 0; i < patchManifest.BundleList.Count; i++)
|
||||
{
|
||||
var patchBundle = patchManifest.BundleList[i];
|
||||
buffer.WriteUTF8(patchBundle.BundleName);
|
||||
buffer.WriteUTF8(patchBundle.FileHash);
|
||||
buffer.WriteUTF8(patchBundle.FileCRC);
|
||||
buffer.WriteInt64(patchBundle.FileSize);
|
||||
buffer.WriteBool(patchBundle.IsRawFile);
|
||||
buffer.WriteByte(patchBundle.LoadMethod);
|
||||
buffer.WriteUTF8Array(patchBundle.Tags);
|
||||
}
|
||||
|
||||
// 写入文件流
|
||||
buffer.WriteToStream(fs);
|
||||
fs.Flush();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 反序列化(二进制文件)
|
||||
/// </summary>
|
||||
public static PatchManifest DeserializeFromBinary(byte[] binaryData)
|
||||
{
|
||||
// 创建缓存器
|
||||
BufferReader buffer = new BufferReader(binaryData);
|
||||
|
||||
// 读取文件标记
|
||||
uint fileSign = buffer.ReadUInt32();
|
||||
if (fileSign != YooAssetSettings.PatchManifestFileSign)
|
||||
throw new Exception("Invalid manifest file !");
|
||||
|
||||
PatchManifest manifest = new PatchManifest();
|
||||
{
|
||||
// 读取文件版本
|
||||
manifest.FileVersion = buffer.ReadUTF8();
|
||||
if (manifest.FileVersion != YooAssetSettings.PatchManifestFileVersion)
|
||||
throw new Exception($"The manifest file version are not compatible : {manifest.FileVersion} != {YooAssetSettings.PatchManifestFileVersion}");
|
||||
|
||||
// 读取文件头信息
|
||||
manifest.EnableAddressable = buffer.ReadBool();
|
||||
manifest.OutputNameStyle = buffer.ReadInt32();
|
||||
manifest.PackageName = buffer.ReadUTF8();
|
||||
manifest.PackageVersion = buffer.ReadUTF8();
|
||||
|
||||
// 读取资源列表
|
||||
int patchAssetCount = buffer.ReadInt32();
|
||||
manifest.AssetList = new List<PatchAsset>(patchAssetCount);
|
||||
for (int i = 0; i < patchAssetCount; i++)
|
||||
{
|
||||
var patchAsset = new PatchAsset();
|
||||
patchAsset.Address = buffer.ReadUTF8();
|
||||
patchAsset.AssetPath = buffer.ReadUTF8();
|
||||
patchAsset.AssetTags = buffer.ReadUTF8Array();
|
||||
patchAsset.BundleID = buffer.ReadInt32();
|
||||
patchAsset.DependIDs = buffer.ReadInt32Array();
|
||||
manifest.AssetList.Add(patchAsset);
|
||||
}
|
||||
|
||||
// 读取资源包列表
|
||||
int patchBundleCount = buffer.ReadInt32();
|
||||
manifest.BundleList = new List<PatchBundle>(patchBundleCount);
|
||||
for (int i = 0; i < patchBundleCount; i++)
|
||||
{
|
||||
var patchBundle = new PatchBundle();
|
||||
patchBundle.BundleName = buffer.ReadUTF8();
|
||||
patchBundle.FileHash = buffer.ReadUTF8();
|
||||
patchBundle.FileCRC = buffer.ReadUTF8();
|
||||
patchBundle.FileSize = buffer.ReadInt64();
|
||||
patchBundle.IsRawFile = buffer.ReadBool();
|
||||
patchBundle.LoadMethod = buffer.ReadByte();
|
||||
patchBundle.Tags = buffer.ReadUTF8Array();
|
||||
manifest.BundleList.Add(patchBundle);
|
||||
}
|
||||
}
|
||||
|
||||
// BundleList
|
||||
foreach (var patchBundle in patchManifest.BundleList)
|
||||
foreach (var patchBundle in manifest.BundleList)
|
||||
{
|
||||
patchBundle.ParseBundle(patchManifest.PackageName, patchManifest.OutputNameStyle);
|
||||
patchManifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
|
||||
patchBundle.ParseBundle(manifest.PackageName, manifest.OutputNameStyle);
|
||||
manifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
|
||||
}
|
||||
|
||||
// AssetList
|
||||
foreach (var patchAsset in patchManifest.AssetList)
|
||||
foreach (var patchAsset in manifest.AssetList)
|
||||
{
|
||||
// 注意:我们不允许原始路径存在重名
|
||||
string assetPath = patchAsset.AssetPath;
|
||||
if (patchManifest.AssetDic.ContainsKey(assetPath))
|
||||
if (manifest.AssetDic.ContainsKey(assetPath))
|
||||
throw new Exception($"AssetPath have existed : {assetPath}");
|
||||
else
|
||||
patchManifest.AssetDic.Add(assetPath, patchAsset);
|
||||
manifest.AssetDic.Add(assetPath, patchAsset);
|
||||
}
|
||||
|
||||
return patchManifest;
|
||||
return manifest;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 生成Bundle文件的正式名称
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user