pengtaihao
/
YooAsset
mirror of https://github.com/tuyoogame/YooAsset
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed asset bundle collector config error 

修复了资源收集器导出配置文件时没有导出公共设置。
pull/9/head
hevinci 2022-05-04 21:38:16 +08:00
parent eafdb8cd31
commit 713073203c
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs
View File

@ -10,7 +10,8 @@ namespace YooAsset.Editor
{ {
public class AssetBundleCollectorConfig public class AssetBundleCollectorConfig
{ {
public const string XmlShader = "Shader"; public const string XmlCommon = "Common";
public const string XmlEnableAddressable = "AutoAddressable";
public const string XmlAutoCollectShader = "AutoCollectShader"; public const string XmlAutoCollectShader = "AutoCollectShader";
public const string XmlShaderBundleName = "ShaderBundleName"; public const string XmlShaderBundleName = "ShaderBundleName";
public const string XmlGroup = "Group"; public const string XmlGroup = "Group";
@ -41,19 +42,23 @@ namespace YooAsset.Editor
XmlElement root = xml.DocumentElement; XmlElement root = xml.DocumentElement;
// 读取着色器配置 // 读取着色器配置
bool enableAddressable = false;
bool autoCollectShaders = false; bool autoCollectShaders = false;
string shaderBundleName = string.Empty; string shaderBundleName = string.Empty;
var shaderNodeList = root.GetElementsByTagName(XmlShader); var commonNodeList = root.GetElementsByTagName(XmlCommon);
if (shaderNodeList.Count > 0) if (commonNodeList.Count > 0)
{ {
XmlElement shaderElement = shaderNodeList[0] as XmlElement; XmlElement commonElement = commonNodeList[0] as XmlElement;
if (shaderElement.HasAttribute(XmlAutoCollectShader) == false) if (commonElement.HasAttribute(XmlEnableAddressable) == false)
throw new Exception($"Not found attribute {XmlAutoCollectShader} in {XmlShader}"); throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
if (shaderElement.HasAttribute(XmlShaderBundleName) == false) if (commonElement.HasAttribute(XmlAutoCollectShader) == false)
throw new Exception($"Not found attribute {XmlShaderBundleName} in {XmlShader}"); throw new Exception($"Not found attribute {XmlAutoCollectShader} in {XmlCommon}");
if (commonElement.HasAttribute(XmlShaderBundleName) == false)
throw new Exception($"Not found attribute {XmlShaderBundleName} in {XmlCommon}");
autoCollectShaders = shaderElement.GetAttribute(XmlAutoCollectShader) == "True" ? true : false; enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
shaderBundleName = shaderElement.GetAttribute(XmlShaderBundleName); autoCollectShaders = commonElement.GetAttribute(XmlAutoCollectShader) == "True" ? true : false;
shaderBundleName = commonElement.GetAttribute(XmlShaderBundleName);
} }
// 读取分组配置 // 读取分组配置
@ -106,6 +111,7 @@ namespace YooAsset.Editor
// 保存配置数据 // 保存配置数据
AssetBundleCollectorSettingData.ClearAll(); AssetBundleCollectorSettingData.ClearAll();
AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
AssetBundleCollectorSettingData.Setting.AutoCollectShaders = autoCollectShaders; AssetBundleCollectorSettingData.Setting.AutoCollectShaders = autoCollectShaders;
AssetBundleCollectorSettingData.Setting.ShadersBundleName = shaderBundleName; AssetBundleCollectorSettingData.Setting.ShadersBundleName = shaderBundleName;
AssetBundleCollectorSettingData.Setting.Groups.AddRange(groupTemper); AssetBundleCollectorSettingData.Setting.Groups.AddRange(groupTemper);
@ -131,9 +137,11 @@ namespace YooAsset.Editor
XmlElement root = xmlDoc.DocumentElement; XmlElement root = xmlDoc.DocumentElement;
// 设置着色器配置 // 设置着色器配置
var shaderElement = xmlDoc.CreateElement(XmlShader); var commonElement = xmlDoc.CreateElement(XmlCommon);
shaderElement.SetAttribute(XmlAutoCollectShader, AssetBundleCollectorSettingData.Setting.AutoCollectShaders.ToString()); commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
shaderElement.SetAttribute(XmlShaderBundleName, AssetBundleCollectorSettingData.Setting.ShadersBundleName); commonElement.SetAttribute(XmlAutoCollectShader, AssetBundleCollectorSettingData.Setting.AutoCollectShaders.ToString());
commonElement.SetAttribute(XmlShaderBundleName, AssetBundleCollectorSettingData.Setting.ShadersBundleName);
root.AppendChild(commonElement);
// 设置分组配置 // 设置分组配置
foreach (var group in AssetBundleCollectorSettingData.Setting.Groups) foreach (var group in AssetBundleCollectorSettingData.Setting.Groups)