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

update AssetBundleBuilder 

修复了内置着色器Tag未正确传染给依赖资源包的问题。
pull/122/head
hevinci 2023-05-25 16:38:02 +08:00
parent 34f553b9e3
commit d448026250
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateManifest.cs
View File

@ -205,6 +205,7 @@ namespace YooAsset.Editor
throw new Exception("没有发现着色器资源包！"); throw new Exception("没有发现着色器资源包！");
// 检测依赖交集并更新依赖ID // 检测依赖交集并更新依赖ID
HashSet<string> tagTemps = new HashSet<string>();
foreach (var packageAsset in manifest.AssetList) foreach (var packageAsset in manifest.AssetList)
{ {
List<string> dependBundles = GetPackageAssetAllDependBundles(manifest, packageAsset); List<string> dependBundles = GetPackageAssetAllDependBundles(manifest, packageAsset);
@ -215,8 +216,23 @@ namespace YooAsset.Editor
if (newDependIDs.Contains(shaderBundleId) == false) if (newDependIDs.Contains(shaderBundleId) == false)
newDependIDs.Add(shaderBundleId); newDependIDs.Add(shaderBundleId);
packageAsset.DependIDs = newDependIDs.ToArray(); packageAsset.DependIDs = newDependIDs.ToArray();
foreach (var tag in packageAsset.AssetTags)
{
if (tagTemps.Contains(tag) == false)
tagTemps.Add(tag);
}
} }
} }
// 更新资源包标签
var packageBundle = manifest.BundleList[shaderBundleId];
List<string> newTags = new List<string>(packageBundle.Tags);
foreach (var tag in tagTemps)
{
if (newTags.Contains(tag) == false)
newTags.Add(tag);
}
packageBundle.Tags = newTags.ToArray();
} }
private List<string> GetPackageAssetAllDependBundles(PackageManifest manifest, PackageAsset packageAsset) private List<string> GetPackageAssetAllDependBundles(PackageManifest manifest, PackageAsset packageAsset)
{ {
@ -302,7 +318,7 @@ namespace YooAsset.Editor
{ {
if (packageBundle.IsRawFile) if (packageBundle.IsRawFile)
{ {
_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { } ); _cachedBundleDepends.Add(packageBundle.BundleName, new string[] { });
continue; continue;
} }
@ -321,7 +337,7 @@ namespace YooAsset.Editor
} }
EditorTools.ClearProgressBar(); EditorTools.ClearProgressBar();
} }
private int[] GetBundleRefrenceIDs(PackageManifest manifest, PackageBundle targetBundle) private int[] GetBundleRefrenceIDs(PackageManifest manifest, PackageBundle targetBundle)
{ {
List<string> referenceList = new List<string>(); List<string> referenceList = new List<string>();