AASのsortOrderをLayoutRuleEditorに反映

Author: shairo

Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LayoutRuleEditorPresenter.cs

@@ -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
@@ -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);

Assets/SmartAddresser/Editor/SmartAddresser.Editor.asmdef

@@ -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
 }