v2.1.1 (#16)

Author: hkmt-mmy

Packages/AudioConductor/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.1.1 - 2026/05/14
+
+- Fix Issues
+  - Add Unity 6000.x API compatibility for generic TreeView types and InstanceID-to-EntityId transition
+
 ## v2.1.0 - 2026/05/13
 
 - New Features

Packages/AudioConductor/Editor/Core/Tools/CodeGen/CueEnumDefinitionOpener.cs

@@ -7,16 +7,26 @@
 using AudioConductor.Editor.Core.Models;
 using UnityEditor;
 using UnityEditor.Callbacks;
+using UnityEngine;
 
 namespace AudioConductor.Editor.Core.Tools.CodeGen
 {
     internal static class CueEnumDefinitionOpener
     {
+#if UNITY_6000_5_OR_NEWER
+        [OnOpenAsset(0)]
+        public static bool OnOpen(UnityEngine.EntityId entityId, int line)
+            => OnOpenImpl(EditorUtility.EntityIdToObject(entityId));
+#else
         [OnOpenAsset(0)]
         public static bool OnOpen(int instanceID, int line)
         {
-            var asset = EditorUtility.InstanceIDToObject(instanceID);
+            return OnOpenImpl(EditorUtility.InstanceIDToObject(instanceID));
+        }
+#endif
 
+        private static bool OnOpenImpl(Object asset)
+        {
             if (asset is not CueEnumDefinition definition)
                 return false;
 

Packages/AudioConductor/Editor/Core/Tools/CodeGen/CueEnumDefinitionTreeItem.cs

@@ -4,10 +4,14 @@
 
 #nullable enable
 
+#if UNITY_6000_2_OR_NEWER
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
+#else
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem;
+#endif
 using System.Collections.Generic;
 using AudioConductor.Core.Models;
 using AudioConductor.Editor.Core.Models;
-using UnityEditor.IMGUI.Controls;
 
 namespace AudioConductor.Editor.Core.Tools.CodeGen
 {

Packages/AudioConductor/Editor/Core/Tools/CodeGen/CueEnumDefinitionTreeView.State.cs

@@ -4,6 +4,11 @@
 
 #nullable enable
 
+#if UNITY_6000_2_OR_NEWER
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
+#else
+using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState;
+#endif
 using System;
 using UnityEditor.IMGUI.Controls;
 

Packages/AudioConductor/Editor/Core/Tools/CodeGen/CueEnumDefinitionTreeView.cs

@@ -14,6 +14,13 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using Object = UnityEngine.Object;
+#if UNITY_6000_2_OR_NEWER
+using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
+#else
+using TreeView = UnityEditor.IMGUI.Controls.TreeView;
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem;
+#endif
 
 namespace AudioConductor.Editor.Core.Tools.CodeGen
 {

Packages/AudioConductor/Editor/Core/Tools/CueSheetEditor/CueSheetAssetOpener.cs

@@ -7,16 +7,26 @@
 using AudioConductor.Core.Models;
 using UnityEditor;
 using UnityEditor.Callbacks;
+using UnityEngine;
 
 namespace AudioConductor.Editor.Core.Tools.CueSheetEditor
 {
     internal static class CueSheetAssetOpener
     {
+#if UNITY_6000_5_OR_NEWER
+        [OnOpenAsset(0)]
+        public static bool OnOpen(EntityId entityId, int line)
+            => OnOpenImpl(EditorUtility.EntityIdToObject(entityId));
+#else
         [OnOpenAsset(0)]
         public static bool OnOpen(int instanceID, int line)
         {
-            var asset = EditorUtility.InstanceIDToObject(instanceID);
+            return OnOpenImpl(EditorUtility.InstanceIDToObject(instanceID));
+        }
+#endif
 
+        private static bool OnOpenImpl(Object asset)
+        {
             if (asset is not CueSheetAsset data)
                 return false;
 

Packages/AudioConductor/Editor/Core/Tools/CueSheetEditor/Models/CueListItem.cs

@@ -4,10 +4,14 @@
 
 #nullable enable
 
+#if UNITY_6000_2_OR_NEWER
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
+#else
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem;
+#endif
 using System.Collections.Generic;
 using AudioConductor.Core.Enums;
 using AudioConductor.Editor.Core.Tools.CueSheetEditor.Enums;
-using UnityEditor.IMGUI.Controls;
 
 namespace AudioConductor.Editor.Core.Tools.CueSheetEditor.Models
 {

Packages/AudioConductor/Editor/Core/Tools/CueSheetEditor/Models/CueListModel.cs

@@ -4,6 +4,11 @@
 
 #nullable enable
 
+#if UNITY_6000_2_OR_NEWER
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
+#else
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem;
+#endif
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -13,7 +18,6 @@
 using AudioConductor.Editor.Core.Tools.Shared;
 using AudioConductor.Editor.Foundation.CommandBasedUndo;
 using AudioConductor.Editor.Foundation.TinyRx;
-using UnityEditor.IMGUI.Controls;
 
 namespace AudioConductor.Editor.Core.Tools.CueSheetEditor.Models
 {

Packages/AudioConductor/Editor/Core/Tools/CueSheetEditor/Models/Interfaces/ICueListModel.cs

@@ -4,11 +4,15 @@
 
 #nullable enable
 
+#if UNITY_6000_2_OR_NEWER
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
+#else
+using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem;
+#endif
 using System;
 using AudioConductor.Editor.Core.Tools.CueSheetEditor.DataTransferObjects;
 using AudioConductor.Editor.Core.Tools.CueSheetEditor.Views;
 using AudioConductor.Editor.Foundation.TinyRx;
-using UnityEditor.IMGUI.Controls;
 
 namespace AudioConductor.Editor.Core.Tools.CueSheetEditor.Models.Interfaces
 {

Packages/AudioConductor/Editor/Core/Tools/CueSheetEditor/Models/TrackInspectorModel.cs

@@ -236,8 +236,13 @@ public AudioClip? AudioClip
             set
             {
                 var actionTypeId = value == null
+#if UNITY_6000_4_OR_NEWER
+                    ? $"{_tag} Unset Track {nameof(AudioClip)} {(AudioClip == null ? default : AudioClip.GetEntityId())}"
+                    : $"{_tag} Set Track {nameof(AudioClip)} {value.GetEntityId()}";
+#else
                     ? $"{_tag} Unset Track {nameof(AudioClip)} {(AudioClip == null ? 0 : AudioClip.GetInstanceID())}"
                     : $"{_tag} Set Track {nameof(AudioClip)} {value.GetInstanceID()}";
+#endif
 
                 var old = _target.Select(track => new AudioClipAndDependencyValueBackup(track)).ToArray();
                 _history.Register(actionTypeId, Redo, Undo);