This commit is contained in:
何冠峰
2025-08-27 10:27:12 +08:00
parent 89e23e0df8
commit addb0ecdfe
2 changed files with 88 additions and 72 deletions
@@ -139,13 +139,6 @@ namespace YooAsset.Editor
/// </summary> /// </summary>
public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group) public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
{ {
// 注意:模拟构建模式下只收集主资源
if (command.SimulateBuild)
{
if (CollectorType != ECollectorType.MainAssetCollector)
return new List<CollectAssetInfo>();
}
Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000); Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000);
// 收集打包资源路径 // 收集打包资源路径
@@ -831,7 +831,7 @@ namespace YooAsset.Editor
var foldout = new Foldout(); var foldout = new Foldout();
foldout.name = "Foldout1"; foldout.name = "Foldout1";
foldout.value = false; foldout.value = false;
foldout.text = "Main Assets"; foldout.text = "Assets";
elementFoldout.Add(foldout); elementFoldout.Add(foldout);
} }
@@ -864,11 +864,9 @@ namespace YooAsset.Editor
var foldout = element.Q<Foldout>("Foldout1"); var foldout = element.Q<Foldout>("Foldout1");
foldout.RegisterValueChangedCallback(evt => foldout.RegisterValueChangedCallback(evt =>
{ {
if (evt.newValue) RefreshFoldoutContent(foldout, selectGroup, collector);
RefreshFoldout(foldout, selectGroup, collector);
else
foldout.Clear();
}); });
RefreshFoldoutName(foldout, collector.CollectorType);
// Remove Button // Remove Button
var removeBtn = element.Q<Button>("Button1"); var removeBtn = element.Q<Button>("Button1");
@@ -885,10 +883,7 @@ namespace YooAsset.Editor
collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue); collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath); collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath);
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector); AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value) RefreshFoldoutContent(foldout, selectGroup, collector);
{
RefreshFoldout(foldout, selectGroup, collector);
}
}); });
UIElementsTools.RefreshObjectFieldShowPath(objectField1); UIElementsTools.RefreshObjectFieldShowPath(objectField1);
@@ -899,10 +894,7 @@ namespace YooAsset.Editor
{ {
collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue); collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue);
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector); AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value) RefreshFoldoutContent(foldout, selectGroup, collector);
{
RefreshFoldout(foldout, selectGroup, collector);
}
if (collector.CollectorType == ECollectorType.MainAssetCollector) if (collector.CollectorType == ECollectorType.MainAssetCollector)
textTags.SetEnabled(true); textTags.SetEnabled(true);
@@ -921,10 +913,7 @@ namespace YooAsset.Editor
{ {
collector.AddressRuleName = evt.newValue.ClassName; collector.AddressRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector); AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value) RefreshFoldoutContent(foldout, selectGroup, collector);
{
RefreshFoldout(foldout, selectGroup, collector);
}
}); });
} }
@@ -937,10 +926,7 @@ namespace YooAsset.Editor
{ {
collector.PackRuleName = evt.newValue.ClassName; collector.PackRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector); AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value) RefreshFoldoutContent(foldout, selectGroup, collector);
{
RefreshFoldout(foldout, selectGroup, collector);
}
}); });
// Filter Rule // Filter Rule
@@ -952,10 +938,7 @@ namespace YooAsset.Editor
{ {
collector.FilterRuleName = evt.newValue.ClassName; collector.FilterRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector); AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value) RefreshFoldoutContent(foldout, selectGroup, collector);
{
RefreshFoldout(foldout, selectGroup, collector);
}
}); });
// UserData // UserData
@@ -976,19 +959,55 @@ namespace YooAsset.Editor
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector); AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
}); });
} }
private void RefreshFoldout(Foldout foldout, AssetBundleCollectorGroup group, AssetBundleCollector collector) private void RefreshFoldoutName(Foldout foldout, ECollectorType collectorType, int elementNumber = -1)
{ {
if (collectorType == ECollectorType.MainAssetCollector)
{
if (elementNumber >= 0)
foldout.text = $"Main Assets ({elementNumber})";
else
foldout.text = $"Main Assets";
}
else if (collectorType == ECollectorType.StaticAssetCollector)
{
if (elementNumber >= 0)
foldout.text = $"Static Assets ({elementNumber})";
else
foldout.text = $"Static Assets";
}
else if (collectorType == ECollectorType.DependAssetCollector)
{
if (elementNumber >= 0)
foldout.text = $"Depend Assets ({elementNumber})";
else
foldout.text = $"Depend Assets";
}
else
{
throw new System.NotImplementedException(collectorType.ToString());
}
}
private void RefreshFoldoutContent(Foldout foldout, AssetBundleCollectorGroup group, AssetBundleCollector collector)
{
RefreshFoldoutName(foldout, collector.CollectorType);
// 折叠栏不可见
if (foldout.value == false)
{
foldout.Clear();
return;
}
// 清空旧元素 // 清空旧元素
foldout.Clear(); foldout.Clear();
// 检测配置是否有效
if (collector.IsValid() == false) if (collector.IsValid() == false)
{ {
collector.CheckConfigError(); collector.CheckConfigError();
return; return;
} }
if (collector.CollectorType == ECollectorType.MainAssetCollector || collector.CollectorType == ECollectorType.StaticAssetCollector)
{
List<CollectAssetInfo> collectAssetInfos = null; List<CollectAssetInfo> collectAssetInfos = null;
try try
@@ -1014,6 +1033,11 @@ namespace YooAsset.Editor
if (collectAssetInfos != null) if (collectAssetInfos != null)
{ {
bool showAdress = false;
if (_enableAddressableToogle.value && collector.CollectorType == ECollectorType.MainAssetCollector)
showAdress = true;
RefreshFoldoutName(foldout, collector.CollectorType, collectAssetInfos.Count);
foreach (var collectAsset in collectAssetInfos) foreach (var collectAsset in collectAssetInfos)
{ {
VisualElement elementRow = new VisualElement(); VisualElement elementRow = new VisualElement();
@@ -1021,7 +1045,7 @@ namespace YooAsset.Editor
foldout.Add(elementRow); foldout.Add(elementRow);
string showInfo = collectAsset.AssetInfo.AssetPath; string showInfo = collectAsset.AssetInfo.AssetPath;
if (_enableAddressableToogle.value) if (showAdress)
showInfo = $"[{collectAsset.Address}] {collectAsset.AssetInfo.AssetPath}"; showInfo = $"[{collectAsset.Address}] {collectAsset.AssetInfo.AssetPath}";
var label = new Label(); var label = new Label();
@@ -1033,7 +1057,6 @@ namespace YooAsset.Editor
} }
} }
} }
}
private void AddCollectorBtn_clicked() private void AddCollectorBtn_clicked()
{ {
var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup; var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;