update asset bundle builder
报告文件内增加资源包内嵌的资源列表
This commit is contained in:
@@ -32,10 +32,10 @@ namespace YooAsset.Editor
|
||||
if (bundleInfo.IsRawFile)
|
||||
{
|
||||
string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
|
||||
foreach (var buildAsset in bundleInfo.BuildinAssets)
|
||||
foreach (var assetInfo in bundleInfo.AllMainAssets)
|
||||
{
|
||||
if (buildAsset.IsRawAsset)
|
||||
EditorTools.CopyFile(buildAsset.AssetPath, dest, true);
|
||||
if (assetInfo.IsRawAsset)
|
||||
EditorTools.CopyFile(assetInfo.AssetPath, dest, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ namespace YooAsset.Editor
|
||||
List<PackageAsset> result = new List<PackageAsset>(1000);
|
||||
foreach (var bundleInfo in buildMapContext.Collection)
|
||||
{
|
||||
var assetInfos = bundleInfo.GetAllBuildAssetInfos();
|
||||
var assetInfos = bundleInfo.GetAllMainAssetInfos();
|
||||
foreach (var assetInfo in assetInfos)
|
||||
{
|
||||
PackageAsset packageAsset = new PackageAsset();
|
||||
|
||||
@@ -93,10 +93,11 @@ namespace YooAsset.Editor
|
||||
reportBundleInfo.FileHash = packageBundle.FileHash;
|
||||
reportBundleInfo.FileCRC = packageBundle.FileCRC;
|
||||
reportBundleInfo.FileSize = packageBundle.FileSize;
|
||||
reportBundleInfo.Tags = packageBundle.Tags;
|
||||
reportBundleInfo.ReferenceIDs = packageBundle.ReferenceIDs;
|
||||
reportBundleInfo.IsRawFile = packageBundle.IsRawFile;
|
||||
reportBundleInfo.LoadMethod = (EBundleLoadMethod)packageBundle.LoadMethod;
|
||||
reportBundleInfo.Tags = packageBundle.Tags;
|
||||
reportBundleInfo.ReferenceIDs = packageBundle.ReferenceIDs;
|
||||
reportBundleInfo.AllBuiltinAssets = GetAllBuiltinAssets(buildMapContext, packageBundle.BundleName);
|
||||
buildReport.BundleInfos.Add(reportBundleInfo);
|
||||
}
|
||||
|
||||
@@ -130,11 +131,11 @@ namespace YooAsset.Editor
|
||||
var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
|
||||
{
|
||||
BuildAssetInfo findAssetInfo = null;
|
||||
foreach (var buildinAsset in bundleInfo.BuildinAssets)
|
||||
foreach (var assetInfo in bundleInfo.AllMainAssets)
|
||||
{
|
||||
if (buildinAsset.AssetPath == assetPath)
|
||||
if (assetInfo.AssetPath == assetPath)
|
||||
{
|
||||
findAssetInfo = buildinAsset;
|
||||
findAssetInfo = assetInfo;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -150,6 +151,15 @@ namespace YooAsset.Editor
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取该资源包内的所有资源(包括零依赖资源)
|
||||
/// </summary>
|
||||
private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
|
||||
{
|
||||
var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
|
||||
return bundleInfo.GetAllBuiltinAssetPaths();
|
||||
}
|
||||
|
||||
private int GetMainAssetCount(PackageManifest manifest)
|
||||
{
|
||||
return manifest.AssetList.Count;
|
||||
|
||||
@@ -131,10 +131,10 @@ namespace YooAsset.Editor
|
||||
}
|
||||
|
||||
// 10. 构建资源包
|
||||
var allBuildinAssets = buildAssetInfoDic.Values.ToList();
|
||||
if (allBuildinAssets.Count == 0)
|
||||
var allPackAssets = buildAssetInfoDic.Values.ToList();
|
||||
if (allPackAssets.Count == 0)
|
||||
throw new Exception("构建的资源列表不能为空");
|
||||
foreach (var assetInfo in allBuildinAssets)
|
||||
foreach (var assetInfo in allPackAssets)
|
||||
{
|
||||
context.PackAsset(assetInfo);
|
||||
}
|
||||
@@ -167,13 +167,13 @@ namespace YooAsset.Editor
|
||||
bool isRawFile = bundleInfo.IsRawFile;
|
||||
if (isRawFile)
|
||||
{
|
||||
if (bundleInfo.BuildinAssets.Count != 1)
|
||||
if (bundleInfo.AllMainAssets.Count != 1)
|
||||
throw new Exception($"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
|
||||
continue;
|
||||
}
|
||||
|
||||
// 注意:原生文件不能被其它资源文件依赖
|
||||
foreach (var assetInfo in bundleInfo.BuildinAssets)
|
||||
foreach (var assetInfo in bundleInfo.AllMainAssets)
|
||||
{
|
||||
if (assetInfo.AllDependAssetInfos != null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user