Skip to content

AASのsortOrderをLayoutRuleEditorに反映 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shairo merged 4 commits into from
Sep 24, 2025
Merged

AASのsortOrderをLayoutRuleEditorに反映 #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b14189
AASのsortOrderをLayoutRuleEditorに反映
shairo Sep 11, 2025
8d47fa8
LayoutViewerにもGroup並び順を反映
shairo Sep 19, 2025
653c332
GroupMovedイベントなら遅延更新する
shairo Sep 19, 2025
0505f05
ifdef漏れ修正
shairo Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .../SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LayoutRuleEditorPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using UnityEditor;
using UnityEditor.AddressableAssets;
using UnityEditor.AddressableAssets.Settings;
using UnityEditor.AddressableAssets.Settings.GroupSchemas;
using UnityEngine;

namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutRuleEditor
Expand Down Expand Up @@ -110,7 +111,16 @@ private void SetupActiveView(LayoutRuleData data)
_editingData.Value = data;
_assetSaveService.SetAsset(data);

if (data.LayoutRule.SyncAddressRulesWithAddressableAssetGroups(addressableAssetSettings.groups))
var groups = addressableAssetSettings.groups;

#if AAS_SORT_ORDER
var orderSettings = AddressableAssetGroupSortSettings.GetSettings(addressableAssetSettings);
groups = addressableAssetSettings.groups
.OrderBy(g => Array.IndexOf(orderSettings.sortOrder, g.Guid))
.ToList();
#endif

if (data.LayoutRule.SyncAddressRulesWithAddressableAssetGroups(groups))
_assetSaveService.MarkAsDirty();

_addressRuleEditorPresenter.SetupView(data.LayoutRule.AddressRules);
Expand Down
13 changes: 12 additions & 1 deletion Assets/SmartAddresser/Editor/SmartAddresser.Editor.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"versionDefines": [
{
"name": "com.unity.addressables",
"expression": "[1.23.1,2.0.0)",
"define": "AAS_SORT_ORDER"
},
{
"name": "com.unity.addressables",
"expression": "2.3.7",
"define": "AAS_SORT_ORDER"
}
],
"noEngineReferences": false
}