mirror of
https://github.com/tuyoogame/YooAsset.git
synced 2026-05-28 03:28:47 +00:00
@@ -67,15 +67,27 @@ namespace YooAsset.Editor
|
|||||||
EditorPrefs.SetString(key, buildinFileCopyParams);
|
EditorPrefs.SetString(key, buildinFileCopyParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
// EncyptionClassName
|
// EncyptionServicesClassName
|
||||||
public static string GetPackageEncyptionClassName(string packageName, string buildPipeline)
|
public static string GetPackageEncyptionServicesClassName(string packageName, string buildPipeline)
|
||||||
{
|
{
|
||||||
string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
|
string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionServicesClassName";
|
||||||
return EditorPrefs.GetString(key, string.Empty);
|
return EditorPrefs.GetString(key, $"{typeof(EncryptionNone).FullName}");
|
||||||
}
|
}
|
||||||
public static void SetPackageEncyptionClassName(string packageName, string buildPipeline, string encyptionClassName)
|
public static void SetPackageEncyptionServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
|
||||||
{
|
{
|
||||||
string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
|
string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionServicesClassName";
|
||||||
|
EditorPrefs.SetString(key, encyptionClassName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ManifestServicesClassName
|
||||||
|
public static string GetPackageManifestServicesClassName(string packageName, string buildPipeline)
|
||||||
|
{
|
||||||
|
string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestServicesClassName";
|
||||||
|
return EditorPrefs.GetString(key, $"{typeof(ManifestNone).FullName}");
|
||||||
|
}
|
||||||
|
public static void SetPackageManifestServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
|
||||||
|
{
|
||||||
|
string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestServicesClassName";
|
||||||
EditorPrefs.SetString(key, encyptionClassName);
|
EditorPrefs.SetString(key, encyptionClassName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -98,6 +98,11 @@ namespace YooAsset.Editor
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public IEncryptionServices EncryptionServices;
|
public IEncryptionServices EncryptionServices;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源清单服务类
|
||||||
|
/// </summary>
|
||||||
|
public IManifestServices ManifestServices;
|
||||||
|
|
||||||
|
|
||||||
private string _pipelineOutputDirectory = string.Empty;
|
private string _pipelineOutputDirectory = string.Empty;
|
||||||
private string _packageOutputDirectory = string.Empty;
|
private string _packageOutputDirectory = string.Empty;
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ namespace YooAsset.Editor
|
|||||||
{
|
{
|
||||||
string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
|
string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
|
||||||
string buildPackageName = buildParametersContext.Parameters.PackageName;
|
string buildPackageName = buildParametersContext.Parameters.PackageName;
|
||||||
DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
|
var manifestServices = buildParametersContext.Parameters.ManifestServices;
|
||||||
|
DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(manifestServices, buildPackageName, buildinRootDirectory);
|
||||||
|
|
||||||
// 刷新目录
|
// 刷新目录
|
||||||
AssetDatabase.Refresh();
|
AssetDatabase.Refresh();
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ namespace YooAsset.Editor
|
|||||||
if (processBundleDepends)
|
if (processBundleDepends)
|
||||||
ProcessBuiltinBundleDependency(context, manifest);
|
ProcessBuiltinBundleDependency(context, manifest);
|
||||||
|
|
||||||
// 创建补丁清单文本文件
|
// 创建资源清单文本文件
|
||||||
{
|
{
|
||||||
string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
|
string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
|
||||||
string filePath = $"{packageOutputDirectory}/{fileName}";
|
string filePath = $"{packageOutputDirectory}/{fileName}";
|
||||||
@@ -66,18 +66,18 @@ namespace YooAsset.Editor
|
|||||||
BuildLogger.Log($"Create package manifest file: {filePath}");
|
BuildLogger.Log($"Create package manifest file: {filePath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建补丁清单二进制文件
|
// 创建资源清单二进制文件
|
||||||
string packageHash;
|
string packageHash;
|
||||||
string packagePath;
|
string packagePath;
|
||||||
{
|
{
|
||||||
string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
|
string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
|
||||||
packagePath = $"{packageOutputDirectory}/{fileName}";
|
packagePath = $"{packageOutputDirectory}/{fileName}";
|
||||||
ManifestTools.SerializeToBinary(packagePath, manifest);
|
ManifestTools.SerializeToBinary(packagePath, manifest, buildParameters.ManifestServices);
|
||||||
packageHash = HashUtility.FileCRC32(packagePath);
|
packageHash = HashUtility.FileCRC32(packagePath);
|
||||||
BuildLogger.Log($"Create package manifest file: {packagePath}");
|
BuildLogger.Log($"Create package manifest file: {packagePath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建补丁清单哈希文件
|
// 创建资源清单哈希文件
|
||||||
{
|
{
|
||||||
string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
|
string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
|
||||||
string filePath = $"{packageOutputDirectory}/{fileName}";
|
string filePath = $"{packageOutputDirectory}/{fileName}";
|
||||||
@@ -85,7 +85,7 @@ namespace YooAsset.Editor
|
|||||||
BuildLogger.Log($"Create package manifest hash file: {filePath}");
|
BuildLogger.Log($"Create package manifest hash file: {filePath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建补丁清单版本文件
|
// 创建资源清单版本文件
|
||||||
{
|
{
|
||||||
string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
|
string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
|
||||||
string filePath = $"{packageOutputDirectory}/{fileName}";
|
string filePath = $"{packageOutputDirectory}/{fileName}";
|
||||||
@@ -97,7 +97,7 @@ namespace YooAsset.Editor
|
|||||||
{
|
{
|
||||||
ManifestContext manifestContext = new ManifestContext();
|
ManifestContext manifestContext = new ManifestContext();
|
||||||
byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
|
byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
|
||||||
manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
|
manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData, buildParameters.ManifestServices);
|
||||||
context.SetContextObject(manifestContext);
|
context.SetContextObject(manifestContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ namespace YooAsset.Editor
|
|||||||
buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
|
buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
|
||||||
buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
|
buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
|
||||||
buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
|
buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
|
||||||
buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
|
buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
|
||||||
|
buildReport.Summary.ManifestServicesClassName = buildParameters.ManifestServices == null ? "null" : buildParameters.ManifestServices.GetType().FullName;
|
||||||
if (buildParameters is BuiltinBuildParameters)
|
if (buildParameters is BuiltinBuildParameters)
|
||||||
{
|
{
|
||||||
var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
|
var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
namespace YooAsset.Editor
|
||||||
|
{
|
||||||
|
public class ManifestNone : IManifestServices
|
||||||
|
{
|
||||||
|
public byte[] ProcessManifest(byte[] fileData)
|
||||||
|
{
|
||||||
|
return fileData;
|
||||||
|
}
|
||||||
|
public byte[] RestoreManifest(byte[] fileData)
|
||||||
|
{
|
||||||
|
return fileData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 446513b0ea9f5d445ade0cfb09c5073b
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -44,19 +44,33 @@ namespace YooAsset.Editor
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建加密类实例
|
/// 创建资源加密服务类实例
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected IEncryptionServices CreateEncryptionInstance()
|
protected IEncryptionServices CreateEncryptionServicesInstance()
|
||||||
{
|
{
|
||||||
var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
|
var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
|
||||||
var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
|
var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
|
||||||
var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
|
var classType = classTypes.Find(x => x.FullName.Equals(className));
|
||||||
if (classType != null)
|
if (classType != null)
|
||||||
return (IEncryptionServices)Activator.CreateInstance(classType);
|
return (IEncryptionServices)Activator.CreateInstance(classType);
|
||||||
else
|
else
|
||||||
return null;
|
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元素通用处理方法
|
#region UI元素通用处理方法
|
||||||
protected void SetBuildOutputField(TextField textField)
|
protected void SetBuildOutputField(TextField textField)
|
||||||
{
|
{
|
||||||
@@ -149,35 +163,66 @@ namespace YooAsset.Editor
|
|||||||
});
|
});
|
||||||
UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
|
UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
|
||||||
}
|
}
|
||||||
protected PopupField<Type> CreateEncryptionField(VisualElement container)
|
protected PopupField<Type> CreateEncryptionServicesField(VisualElement container)
|
||||||
{
|
{
|
||||||
// 加密方法
|
// 加密服务类
|
||||||
var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
|
var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
|
||||||
if (encryptionClassTypes.Count > 0)
|
if (classTypes.Count > 0)
|
||||||
{
|
{
|
||||||
var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
|
var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
|
||||||
int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName));
|
int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
|
||||||
if (defaultIndex < 0)
|
if (defaultIndex < 0)
|
||||||
defaultIndex = 0;
|
defaultIndex = 0;
|
||||||
var encryptionField = new PopupField<Type>(encryptionClassTypes, defaultIndex);
|
var popupField = new PopupField<Type>(classTypes, defaultIndex);
|
||||||
encryptionField.label = "Encryption";
|
popupField.label = "Encryption Services";
|
||||||
encryptionField.style.width = StyleWidth;
|
popupField.style.width = StyleWidth;
|
||||||
encryptionField.RegisterValueChangedCallback(evt =>
|
popupField.RegisterValueChangedCallback(evt =>
|
||||||
{
|
{
|
||||||
AssetBundleBuilderSetting.SetPackageEncyptionClassName(PackageName, PipelineName, encryptionField.value.FullName);
|
AssetBundleBuilderSetting.SetPackageEncyptionServicesClassName(PackageName, PipelineName, popupField.value.FullName);
|
||||||
});
|
});
|
||||||
container.Add(encryptionField);
|
container.Add(popupField);
|
||||||
UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
|
UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
|
||||||
return encryptionField;
|
return popupField;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var encryptionField = new PopupField<Type>();
|
var popupField = new PopupField<Type>();
|
||||||
encryptionField.label = "Encryption";
|
popupField.label = "Encryption Services";
|
||||||
encryptionField.style.width = StyleWidth;
|
popupField.style.width = StyleWidth;
|
||||||
container.Add(encryptionField);
|
container.Add(popupField);
|
||||||
UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
|
UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
|
||||||
return encryptionField;
|
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
|
#endregion
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ namespace YooAsset.Editor
|
|||||||
protected TemplateContainer Root;
|
protected TemplateContainer Root;
|
||||||
protected TextField _buildOutputField;
|
protected TextField _buildOutputField;
|
||||||
protected TextField _buildVersionField;
|
protected TextField _buildVersionField;
|
||||||
protected PopupField<Type> _encryptionField;
|
protected PopupField<Type> _encryptionServicesField;
|
||||||
|
protected PopupField<Type> _manifestServicesField;
|
||||||
protected EnumField _compressionField;
|
protected EnumField _compressionField;
|
||||||
protected EnumField _outputNameStyleField;
|
protected EnumField _outputNameStyleField;
|
||||||
protected EnumField _copyBuildinFileOptionField;
|
protected EnumField _copyBuildinFileOptionField;
|
||||||
@@ -43,9 +44,10 @@ namespace YooAsset.Editor
|
|||||||
_buildVersionField = Root.Q<TextField>("BuildVersion");
|
_buildVersionField = Root.Q<TextField>("BuildVersion");
|
||||||
SetBuildVersionField(_buildVersionField);
|
SetBuildVersionField(_buildVersionField);
|
||||||
|
|
||||||
// 加密方法
|
// 服务类
|
||||||
var encryptionContainer = Root.Q("EncryptionContainer");
|
var popupContainer = Root.Q("PopupContainer");
|
||||||
_encryptionField = CreateEncryptionField(encryptionContainer);
|
_encryptionServicesField = CreateEncryptionServicesField(popupContainer);
|
||||||
|
_manifestServicesField = CreateManifestServicesField(popupContainer);
|
||||||
|
|
||||||
// 压缩方式选项
|
// 压缩方式选项
|
||||||
_compressionField = Root.Q<EnumField>("Compression");
|
_compressionField = Root.Q<EnumField>("Compression");
|
||||||
@@ -116,7 +118,8 @@ namespace YooAsset.Editor
|
|||||||
buildParameters.CompressOption = compressOption;
|
buildParameters.CompressOption = compressOption;
|
||||||
buildParameters.ClearBuildCacheFiles = clearBuildCache;
|
buildParameters.ClearBuildCacheFiles = clearBuildCache;
|
||||||
buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
|
buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
|
||||||
buildParameters.EncryptionServices = CreateEncryptionInstance();
|
buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
|
||||||
|
buildParameters.ManifestServices = CreateManifestServicesInstance();
|
||||||
|
|
||||||
BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
|
BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
|
||||||
var buildResult = pipeline.Run(buildParameters, true);
|
var buildResult = pipeline.Run(buildParameters, true);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
|
<ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
|
||||||
<ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
|
<ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
|
||||||
<ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
|
<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="Compression" value="Center" name="Compression" />
|
||||||
<uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
|
<uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
|
||||||
<uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
|
<uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ namespace YooAsset.Editor
|
|||||||
buildParameters.FileNameStyle = fileNameStyle;
|
buildParameters.FileNameStyle = fileNameStyle;
|
||||||
buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
|
buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
|
||||||
buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
|
buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
|
||||||
buildParameters.EncryptionServices = CreateEncryptionInstance();
|
|
||||||
|
|
||||||
EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
|
EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
|
||||||
var buildResult = pipeline.Run(buildParameters, true);
|
var buildResult = pipeline.Run(buildParameters, true);
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ namespace YooAsset.Editor
|
|||||||
protected TemplateContainer Root;
|
protected TemplateContainer Root;
|
||||||
protected TextField _buildOutputField;
|
protected TextField _buildOutputField;
|
||||||
protected TextField _buildVersionField;
|
protected TextField _buildVersionField;
|
||||||
protected PopupField<Type> _encryptionField;
|
protected PopupField<Type> _encryptionServicesField;
|
||||||
|
protected PopupField<Type> _manifestServicesField;
|
||||||
protected EnumField _outputNameStyleField;
|
protected EnumField _outputNameStyleField;
|
||||||
protected EnumField _copyBuildinFileOptionField;
|
protected EnumField _copyBuildinFileOptionField;
|
||||||
protected TextField _copyBuildinFileTagsField;
|
protected TextField _copyBuildinFileTagsField;
|
||||||
@@ -43,8 +44,9 @@ namespace YooAsset.Editor
|
|||||||
SetBuildVersionField(_buildVersionField);
|
SetBuildVersionField(_buildVersionField);
|
||||||
|
|
||||||
// 加密方法
|
// 加密方法
|
||||||
var encryptionContainer = Root.Q("EncryptionContainer");
|
var popupContainer = Root.Q("PopupContainer");
|
||||||
_encryptionField = CreateEncryptionField(encryptionContainer);
|
_encryptionServicesField = CreateEncryptionServicesField(popupContainer);
|
||||||
|
_manifestServicesField = CreateManifestServicesField(popupContainer);
|
||||||
|
|
||||||
// 输出文件名称样式
|
// 输出文件名称样式
|
||||||
_outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
|
_outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
|
||||||
@@ -108,7 +110,8 @@ namespace YooAsset.Editor
|
|||||||
buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
|
buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
|
||||||
buildParameters.ClearBuildCacheFiles = clearBuildCache;
|
buildParameters.ClearBuildCacheFiles = clearBuildCache;
|
||||||
buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
|
buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
|
||||||
buildParameters.EncryptionServices = CreateEncryptionInstance();
|
buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
|
||||||
|
buildParameters.ManifestServices = CreateManifestServicesInstance();
|
||||||
|
|
||||||
RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
|
RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
|
||||||
var buildResult = pipeline.Run(buildParameters, true);
|
var buildResult = pipeline.Run(buildParameters, true);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
|
<ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
|
||||||
<ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
|
<ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
|
||||||
<ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
|
<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="File Name Style" value="Center" name="FileNameStyle" />
|
||||||
<uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
|
<uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
|
||||||
<ui:TextField picking-mode="Ignore" label="Copy Buildin File Param" name="CopyBuildinFileParam" />
|
<ui:TextField picking-mode="Ignore" label="Copy Buildin File Param" name="CopyBuildinFileParam" />
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ namespace YooAsset.Editor
|
|||||||
protected TemplateContainer Root;
|
protected TemplateContainer Root;
|
||||||
protected TextField _buildOutputField;
|
protected TextField _buildOutputField;
|
||||||
protected TextField _buildVersionField;
|
protected TextField _buildVersionField;
|
||||||
protected PopupField<Type> _encryptionField;
|
protected PopupField<Type> _encryptionServicesField;
|
||||||
|
protected PopupField<Type> _manifestServicesField;
|
||||||
protected EnumField _compressionField;
|
protected EnumField _compressionField;
|
||||||
protected EnumField _outputNameStyleField;
|
protected EnumField _outputNameStyleField;
|
||||||
protected EnumField _copyBuildinFileOptionField;
|
protected EnumField _copyBuildinFileOptionField;
|
||||||
@@ -44,8 +45,9 @@ namespace YooAsset.Editor
|
|||||||
SetBuildVersionField(_buildVersionField);
|
SetBuildVersionField(_buildVersionField);
|
||||||
|
|
||||||
// 加密方法
|
// 加密方法
|
||||||
var encryptionContainer = Root.Q("EncryptionContainer");
|
var popupContainer = Root.Q("PopupContainer");
|
||||||
_encryptionField = CreateEncryptionField(encryptionContainer);
|
_encryptionServicesField = CreateEncryptionServicesField(popupContainer);
|
||||||
|
_manifestServicesField = CreateManifestServicesField(popupContainer);
|
||||||
|
|
||||||
// 压缩方式选项
|
// 压缩方式选项
|
||||||
_compressionField = Root.Q<EnumField>("Compression");
|
_compressionField = Root.Q<EnumField>("Compression");
|
||||||
@@ -118,7 +120,8 @@ namespace YooAsset.Editor
|
|||||||
buildParameters.ClearBuildCacheFiles = clearBuildCache;
|
buildParameters.ClearBuildCacheFiles = clearBuildCache;
|
||||||
buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
|
buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
|
||||||
buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
|
buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
|
||||||
buildParameters.EncryptionServices = CreateEncryptionInstance();
|
buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
|
||||||
|
buildParameters.ManifestServices = CreateManifestServicesInstance();
|
||||||
|
|
||||||
ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
|
ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
|
||||||
var buildResult = pipeline.Run(buildParameters, true);
|
var buildResult = pipeline.Run(buildParameters, true);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
|
<ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
|
||||||
<ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
|
<ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
|
||||||
<ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
|
<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="Compression" value="Center" name="Compression" />
|
||||||
<uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
|
<uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
|
||||||
<uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
|
<uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
|
||||||
|
|||||||
@@ -71,7 +71,8 @@ namespace YooAsset.Editor
|
|||||||
public bool UseAssetDependencyDB;
|
public bool UseAssetDependencyDB;
|
||||||
public bool EnableSharePackRule;
|
public bool EnableSharePackRule;
|
||||||
public bool SingleReferencedPackAlone;
|
public bool SingleReferencedPackAlone;
|
||||||
public string EncryptionClassName;
|
public string EncryptionServicesClassName;
|
||||||
|
public string ManifestServicesClassName;
|
||||||
public EFileNameStyle FileNameStyle;
|
public EFileNameStyle FileNameStyle;
|
||||||
|
|
||||||
// 引擎参数
|
// 引擎参数
|
||||||
|
|||||||
@@ -66,7 +66,8 @@ namespace YooAsset.Editor
|
|||||||
BindListViewItem("Use Asset Dependency DB", $"{buildReport.Summary.UseAssetDependencyDB}");
|
BindListViewItem("Use Asset Dependency DB", $"{buildReport.Summary.UseAssetDependencyDB}");
|
||||||
BindListViewItem("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}");
|
BindListViewItem("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}");
|
||||||
BindListViewItem("Single Referenced Pack Alone", $"{buildReport.Summary.SingleReferencedPackAlone}");
|
BindListViewItem("Single Referenced Pack Alone", $"{buildReport.Summary.SingleReferencedPackAlone}");
|
||||||
BindListViewItem("Encryption Class Name", buildReport.Summary.EncryptionClassName);
|
BindListViewItem("Encryption Services", buildReport.Summary.EncryptionServicesClassName);
|
||||||
|
BindListViewItem("Manifest Services", buildReport.Summary.ManifestServicesClassName);
|
||||||
BindListViewItem("FileNameStyle", $"{buildReport.Summary.FileNameStyle}");
|
BindListViewItem("FileNameStyle", $"{buildReport.Summary.FileNameStyle}");
|
||||||
BindListViewItem("CompressOption", $"{buildReport.Summary.CompressOption}");
|
BindListViewItem("CompressOption", $"{buildReport.Summary.CompressOption}");
|
||||||
BindListViewItem("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}");
|
BindListViewItem("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}");
|
||||||
|
|||||||
@@ -88,6 +88,11 @@ namespace YooAsset
|
|||||||
/// 自定义参数:解密方法类
|
/// 自定义参数:解密方法类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IDecryptionServices DecryptionServices { private set; get; }
|
public IDecryptionServices DecryptionServices { private set; get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自定义参数:资源清单服务类
|
||||||
|
/// </summary>
|
||||||
|
public IManifestServices ManifestServices { private set; get; }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
@@ -174,6 +179,10 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
DecryptionServices = (IDecryptionServices)value;
|
DecryptionServices = (IDecryptionServices)value;
|
||||||
}
|
}
|
||||||
|
else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
|
||||||
|
{
|
||||||
|
ManifestServices = (IManifestServices)value;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
YooLogger.Warning($"Invalid parameter : {name}");
|
YooLogger.Warning($"Invalid parameter : {name}");
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace YooAsset
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 在构建应用程序前自动生成内置资源目录文件。
|
/// 在构建应用程序前自动生成内置资源目录文件。
|
||||||
/// 原理:搜索StreamingAssets目录下的所有资源文件,然后将这些文件信息写入文件,并存储在Resources目录下。
|
/// 原理:搜索StreamingAssets目录下的所有资源文件,将这些文件信息写入文件,然后在运行时做查询用途。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
|
public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
|
||||||
{
|
{
|
||||||
@@ -21,7 +21,7 @@ namespace YooAsset
|
|||||||
DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
|
DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
|
||||||
if (rootDirectory.Exists == false)
|
if (rootDirectory.Exists == false)
|
||||||
{
|
{
|
||||||
UnityEngine.Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
|
Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,10 +31,17 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
string packageName = subDirectory.Name;
|
string packageName = subDirectory.Name;
|
||||||
string pacakgeDirectory = subDirectory.FullName;
|
string pacakgeDirectory = subDirectory.FullName;
|
||||||
bool result = CreateBuildinCatalogFile(packageName, pacakgeDirectory);
|
try
|
||||||
if (result == false)
|
|
||||||
{
|
{
|
||||||
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>
|
||||||
/// 生成包裹的内置资源目录文件
|
/// 生成包裹的内置资源目录文件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static bool CreateBuildinCatalogFile(string packageName, string pacakgeDirectory)
|
public static bool CreateBuildinCatalogFile(IManifestServices services, string packageName, string pacakgeDirectory)
|
||||||
{
|
{
|
||||||
// 获取资源清单版本
|
// 获取资源清单版本
|
||||||
string packageVersion;
|
string packageVersion;
|
||||||
@@ -70,7 +77,7 @@ namespace YooAsset
|
|||||||
}
|
}
|
||||||
|
|
||||||
var binaryData = FileUtility.ReadAllBytes(manifestFilePath);
|
var binaryData = FileUtility.ReadAllBytes(manifestFilePath);
|
||||||
packageManifest = ManifestTools.DeserializeFromBinary(binaryData);
|
packageManifest = ManifestTools.DeserializeFromBinary(binaryData, services);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取文件名映射关系
|
// 获取文件名映射关系
|
||||||
|
|||||||
@@ -106,10 +106,11 @@ namespace YooAsset
|
|||||||
if (_loadCatalogFileOp == null)
|
if (_loadCatalogFileOp == null)
|
||||||
{
|
{
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
|
/*
|
||||||
// 兼容性初始化
|
// 兼容性初始化
|
||||||
// 说明:内置文件系统在编辑器下运行时需要动态生成
|
// 说明:内置文件系统在编辑器下运行时需要动态生成
|
||||||
string packageRoot = _fileSystem.FileRoot;
|
string packageRoot = _fileSystem.FileRoot;
|
||||||
bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
|
bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.ManifestServices, _fileSystem.PackageName, packageRoot);
|
||||||
if (result == false)
|
if (result == false)
|
||||||
{
|
{
|
||||||
_steps = ESteps.Done;
|
_steps = ESteps.Done;
|
||||||
@@ -117,6 +118,7 @@ namespace YooAsset
|
|||||||
Error = $"Create package catalog file failed ! See the detail error in console !";
|
Error = $"Create package catalog file failed ! See the detail error in console !";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_loadCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
|
_loadCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
if (_deserializer == null)
|
if (_deserializer == null)
|
||||||
{
|
{
|
||||||
_deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
|
_deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
|
||||||
_deserializer.StartOperation();
|
_deserializer.StartOperation();
|
||||||
AddChildOperation(_deserializer);
|
AddChildOperation(_deserializer);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ namespace YooAsset
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:远程服务接口
|
/// 自定义参数:远程服务接口
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IRemoteServices RemoteServices { private set; get; } = null;
|
public IRemoteServices RemoteServices { private set; get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:初始化的时候缓存文件校验级别
|
/// 自定义参数:初始化的时候缓存文件校验级别
|
||||||
@@ -99,6 +99,11 @@ namespace YooAsset
|
|||||||
/// 自定义参数:解密方法类
|
/// 自定义参数:解密方法类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IDecryptionServices DecryptionServices { private set; get; }
|
public IDecryptionServices DecryptionServices { private set; get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自定义参数:资源清单服务类
|
||||||
|
/// </summary>
|
||||||
|
public IManifestServices ManifestServices { private set; get; }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
@@ -221,6 +226,10 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
DecryptionServices = (IDecryptionServices)value;
|
DecryptionServices = (IDecryptionServices)value;
|
||||||
}
|
}
|
||||||
|
else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
|
||||||
|
{
|
||||||
|
ManifestServices = (IManifestServices)value;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
YooLogger.Warning($"Invalid parameter : {name}");
|
YooLogger.Warning($"Invalid parameter : {name}");
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
if (_deserializer == null)
|
if (_deserializer == null)
|
||||||
{
|
{
|
||||||
_deserializer = new DeserializeManifestOperation(_fileData);
|
_deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _fileData);
|
||||||
_deserializer.StartOperation();
|
_deserializer.StartOperation();
|
||||||
AddChildOperation(_deserializer);
|
AddChildOperation(_deserializer);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
if (_deserializer == null)
|
if (_deserializer == null)
|
||||||
{
|
{
|
||||||
_deserializer = new DeserializeManifestOperation(_fileData);
|
_deserializer = new DeserializeManifestOperation(null, _fileData);
|
||||||
_deserializer.StartOperation();
|
_deserializer.StartOperation();
|
||||||
AddChildOperation(_deserializer);
|
AddChildOperation(_deserializer);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,12 +46,17 @@ namespace YooAsset
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:跨域下载服务接口
|
/// 自定义参数:跨域下载服务接口
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IRemoteServices RemoteServices { private set; get; } = null;
|
public IRemoteServices RemoteServices { private set; get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:解密方法类
|
/// 自定义参数:解密方法类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IWebDecryptionServices DecryptionServices { private set; get; }
|
public IWebDecryptionServices DecryptionServices { private set; get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自定义参数:资源清单服务类
|
||||||
|
/// </summary>
|
||||||
|
public IManifestServices ManifestServices { private set; get; }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
@@ -111,6 +116,10 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
DecryptionServices = (IWebDecryptionServices)value;
|
DecryptionServices = (IWebDecryptionServices)value;
|
||||||
}
|
}
|
||||||
|
else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
|
||||||
|
{
|
||||||
|
ManifestServices = (IManifestServices)value;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
YooLogger.Warning($"Invalid parameter : {name}");
|
YooLogger.Warning($"Invalid parameter : {name}");
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
if (_deserializer == null)
|
if (_deserializer == null)
|
||||||
{
|
{
|
||||||
_deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
|
_deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
|
||||||
_deserializer.StartOperation();
|
_deserializer.StartOperation();
|
||||||
AddChildOperation(_deserializer);
|
AddChildOperation(_deserializer);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,11 @@ namespace YooAsset
|
|||||||
/// 自定义参数:解密方法类
|
/// 自定义参数:解密方法类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IWebDecryptionServices DecryptionServices { private set; get; }
|
public IWebDecryptionServices DecryptionServices { private set; get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自定义参数:资源清单服务类
|
||||||
|
/// </summary>
|
||||||
|
public IManifestServices ManifestServices { private set; get; }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
@@ -116,6 +121,10 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
DecryptionServices = (IWebDecryptionServices)value;
|
DecryptionServices = (IWebDecryptionServices)value;
|
||||||
}
|
}
|
||||||
|
else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
|
||||||
|
{
|
||||||
|
ManifestServices = (IManifestServices)value;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
YooLogger.Warning($"Invalid parameter : {name}");
|
YooLogger.Warning($"Invalid parameter : {name}");
|
||||||
|
|||||||
@@ -33,10 +33,11 @@ namespace YooAsset
|
|||||||
if (_loadCatalogFileOp == null)
|
if (_loadCatalogFileOp == null)
|
||||||
{
|
{
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
|
/*
|
||||||
// 兼容性初始化
|
// 兼容性初始化
|
||||||
// 说明:内置文件系统在编辑器下运行时需要动态生成
|
// 说明:内置文件系统在编辑器下运行时需要动态生成
|
||||||
string packageRoot = _fileSystem.FileRoot;
|
string packageRoot = _fileSystem.FileRoot;
|
||||||
bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
|
bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.ManifestServices, _fileSystem.PackageName, packageRoot);
|
||||||
if (result == false)
|
if (result == false)
|
||||||
{
|
{
|
||||||
_steps = ESteps.Done;
|
_steps = ESteps.Done;
|
||||||
@@ -44,6 +45,7 @@ namespace YooAsset
|
|||||||
Error = $"Create package catalog file failed ! See the detail error in console !";
|
Error = $"Create package catalog file failed ! See the detail error in console !";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_loadCatalogFileOp = new LoadWebServerCatalogFileOperation(_fileSystem);
|
_loadCatalogFileOp = new LoadWebServerCatalogFileOperation(_fileSystem);
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
if (_deserializer == null)
|
if (_deserializer == null)
|
||||||
{
|
{
|
||||||
_deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
|
_deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
|
||||||
_deserializer.StartOperation();
|
_deserializer.StartOperation();
|
||||||
AddChildOperation(_deserializer);
|
AddChildOperation(_deserializer);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace YooAsset
|
|||||||
public const string INSTALL_CLEAR_MODE = "INSTALL_CLEAR_MODE";
|
public const string INSTALL_CLEAR_MODE = "INSTALL_CLEAR_MODE";
|
||||||
public const string REMOTE_SERVICES = "REMOTE_SERVICES";
|
public const string REMOTE_SERVICES = "REMOTE_SERVICES";
|
||||||
public const string DECRYPTION_SERVICES = "DECRYPTION_SERVICES";
|
public const string DECRYPTION_SERVICES = "DECRYPTION_SERVICES";
|
||||||
|
public const string MANIFEST_SERVICES = "MANIFEST_SERVICES";
|
||||||
public const string APPEND_FILE_EXTENSION = "APPEND_FILE_EXTENSION";
|
public const string APPEND_FILE_EXTENSION = "APPEND_FILE_EXTENSION";
|
||||||
public const string DISABLE_CATALOG_FILE = "DISABLE_CATALOG_FILE";
|
public const string DISABLE_CATALOG_FILE = "DISABLE_CATALOG_FILE";
|
||||||
public const string DISABLE_UNITY_WEB_CACHE = "DISABLE_UNITY_WEB_CACHE";
|
public const string DISABLE_UNITY_WEB_CACHE = "DISABLE_UNITY_WEB_CACHE";
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace YooAsset
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 序列化(二进制文件)
|
/// 序列化(二进制文件)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static void SerializeToBinary(string savePath, PackageManifest manifest)
|
public static void SerializeToBinary(string savePath, PackageManifest manifest, IManifestServices services)
|
||||||
{
|
{
|
||||||
using (FileStream fs = new FileStream(savePath, FileMode.Create))
|
using (FileStream fs = new FileStream(savePath, FileMode.Create))
|
||||||
{
|
{
|
||||||
@@ -96,9 +96,20 @@ namespace YooAsset
|
|||||||
buffer.WriteInt32Array(packageBundle.DependBundleIDs);
|
buffer.WriteInt32Array(packageBundle.DependBundleIDs);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 写入文件流
|
// 清单处理操作
|
||||||
buffer.WriteToStream(fs);
|
if (services != null)
|
||||||
fs.Flush();
|
{
|
||||||
|
var tempBytes = buffer.GetBytes();
|
||||||
|
var resultBytes = services.ProcessManifest(tempBytes);
|
||||||
|
fs.Write(resultBytes, 0, resultBytes.Length);
|
||||||
|
fs.Flush();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 写入文件流
|
||||||
|
buffer.WriteToStream(fs);
|
||||||
|
fs.Flush();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,10 +124,19 @@ namespace YooAsset
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 反序列化(二进制文件)
|
/// 反序列化(二进制文件)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static PackageManifest DeserializeFromBinary(byte[] binaryData)
|
public static PackageManifest DeserializeFromBinary(byte[] binaryData, IManifestServices services)
|
||||||
{
|
{
|
||||||
// 创建缓存器
|
// 创建缓存器
|
||||||
BufferReader buffer = new BufferReader(binaryData);
|
BufferReader buffer;
|
||||||
|
if (services != null)
|
||||||
|
{
|
||||||
|
var resultBytes = services.RestoreManifest(binaryData);
|
||||||
|
buffer = new BufferReader(resultBytes);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
buffer = new BufferReader(binaryData);
|
||||||
|
}
|
||||||
|
|
||||||
// 读取文件标记
|
// 读取文件标记
|
||||||
uint fileSign = buffer.ReadUInt32();
|
uint fileSign = buffer.ReadUInt32();
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace YooAsset
|
|||||||
private enum ESteps
|
private enum ESteps
|
||||||
{
|
{
|
||||||
None,
|
None,
|
||||||
|
RestoreFileData,
|
||||||
DeserializeFileHeader,
|
DeserializeFileHeader,
|
||||||
PrepareAssetList,
|
PrepareAssetList,
|
||||||
DeserializeAssetList,
|
DeserializeAssetList,
|
||||||
@@ -19,7 +20,9 @@ namespace YooAsset
|
|||||||
Done,
|
Done,
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly BufferReader _buffer;
|
private readonly IManifestServices _services;
|
||||||
|
private byte[] _sourceData;
|
||||||
|
private BufferReader _buffer;
|
||||||
private int _packageAssetCount;
|
private int _packageAssetCount;
|
||||||
private int _packageBundleCount;
|
private int _packageBundleCount;
|
||||||
private int _progressTotalValue;
|
private int _progressTotalValue;
|
||||||
@@ -30,13 +33,14 @@ namespace YooAsset
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public PackageManifest Manifest { private set; get; }
|
public PackageManifest Manifest { private set; get; }
|
||||||
|
|
||||||
public DeserializeManifestOperation(byte[] binaryData)
|
public DeserializeManifestOperation(IManifestServices services, byte[] binaryData)
|
||||||
{
|
{
|
||||||
_buffer = new BufferReader(binaryData);
|
_services = services;
|
||||||
|
_sourceData = binaryData;
|
||||||
}
|
}
|
||||||
internal override void InternalStart()
|
internal override void InternalStart()
|
||||||
{
|
{
|
||||||
_steps = ESteps.DeserializeFileHeader;
|
_steps = ESteps.RestoreFileData;
|
||||||
}
|
}
|
||||||
internal override void InternalUpdate()
|
internal override void InternalUpdate()
|
||||||
{
|
{
|
||||||
@@ -45,6 +49,19 @@ namespace YooAsset
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (_steps == ESteps.RestoreFileData)
|
||||||
|
{
|
||||||
|
if (_services != null)
|
||||||
|
{
|
||||||
|
var resultData = _services.RestoreManifest(_sourceData);
|
||||||
|
if (resultData != null)
|
||||||
|
_sourceData = resultData;
|
||||||
|
}
|
||||||
|
|
||||||
|
_buffer = new BufferReader(_sourceData);
|
||||||
|
_steps = ESteps.DeserializeFileHeader;
|
||||||
|
}
|
||||||
|
|
||||||
if (_steps == ESteps.DeserializeFileHeader)
|
if (_steps == ESteps.DeserializeFileHeader)
|
||||||
{
|
{
|
||||||
if (_buffer.IsValid == false)
|
if (_buffer.IsValid == false)
|
||||||
|
|||||||
19
Assets/YooAsset/Runtime/Services/IManifestServices.cs
Normal file
19
Assets/YooAsset/Runtime/Services/IManifestServices.cs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
|
||||||
|
namespace YooAsset
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 资源清单文件处理服务接口
|
||||||
|
/// </summary>
|
||||||
|
public interface IManifestServices
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 处理资源清单(压缩和加密)
|
||||||
|
/// </summary>
|
||||||
|
byte[] ProcessManifest(byte[] fileData);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 还原资源清单(解压和解密)
|
||||||
|
/// </summary>
|
||||||
|
byte[] RestoreManifest(byte[] fileData);
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/YooAsset/Runtime/Services/IManifestServices.cs.meta
Normal file
11
Assets/YooAsset/Runtime/Services/IManifestServices.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7378f37c14fe59b4dbb5c1259a3f19c8
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -36,6 +36,16 @@ namespace YooAsset
|
|||||||
_index = 0;
|
_index = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取有效数据
|
||||||
|
/// </summary>
|
||||||
|
public byte[] GetBytes()
|
||||||
|
{
|
||||||
|
byte[] newArray = new byte[_index];
|
||||||
|
Buffer.BlockCopy(_buffer, 0, newArray, 0, _index);
|
||||||
|
return newArray;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 将有效数据写入文件流
|
/// 将有效数据写入文件流
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user