From 6a76bf783dc53cb923035819bd9f7697219407f1 Mon Sep 17 00:00:00 2001 From: tomtanak14 <63957856+tomtanak14@users.noreply.github.com> Date: Thu, 16 Apr 2026 16:17:24 +0900 Subject: [PATCH] fix: obsolete API use on Unity 6.2 or newer --- .../Core/Models/LayoutRules/LayoutRuleDataOpener.cs | 9 +++++++++ .../AssetGroupBasedAssetFilterAsset.cs.meta | 11 +++++++++++ .../AddressRuleEditor/AddressRuleListTreeView.cs | 4 ++++ .../LabelRuleEditor/LabelRuleEditorPresenter.cs | 3 +++ .../LabelRuleEditor/LabelRuleListTreeView.cs | 4 ++++ .../VersionRuleEditor/VersionRuleEditorPresenter.cs | 3 +++ .../VersionRuleEditor/VersionRuleListTreeView.cs | 4 ++++ .../Addresser/LayoutViewer/LayoutViewerTreeView.cs | 4 ++++ .../Editor/Foundation/EasyTreeView/TreeViewBase.cs | 5 +++++ 9 files changed, 47 insertions(+) create mode 100644 Assets/SmartAddresser/Editor/Core/Models/Shared/AssetGroups/AssetFilterImpl/AssetGroupBasedAssetFilterAsset.cs.meta diff --git a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRuleDataOpener.cs b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRuleDataOpener.cs index 16e7dfb..c6b82b4 100644 --- a/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRuleDataOpener.cs +++ b/Assets/SmartAddresser/Editor/Core/Models/LayoutRules/LayoutRuleDataOpener.cs @@ -2,15 +2,24 @@ using SmartAddresser.Editor.Core.Tools.Addresser.Shared; using UnityEditor; using UnityEditor.Callbacks; +#if UNITY_6000_2_OR_NEWER +using UnityEngine; +#endif namespace SmartAddresser.Editor.Core.Models.LayoutRules { public static class LayoutRuleDataOpener { [OnOpenAsset(0)] +#if UNITY_6000_2_OR_NEWER + public static bool OnOpen(EntityId entityId, int line) + { + var asset = EditorUtility.EntityIdToObject(entityId); +#else public static bool OnOpen(int instanceID, int line) { var asset = EditorUtility.InstanceIDToObject(instanceID); +#endif if (asset is LayoutRuleData data) { diff --git a/Assets/SmartAddresser/Editor/Core/Models/Shared/AssetGroups/AssetFilterImpl/AssetGroupBasedAssetFilterAsset.cs.meta b/Assets/SmartAddresser/Editor/Core/Models/Shared/AssetGroups/AssetFilterImpl/AssetGroupBasedAssetFilterAsset.cs.meta new file mode 100644 index 0000000..1000968 --- /dev/null +++ b/Assets/SmartAddresser/Editor/Core/Models/Shared/AssetGroups/AssetFilterImpl/AssetGroupBasedAssetFilterAsset.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e922a45dca58c54db06900c786608c1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/AddressRuleEditor/AddressRuleListTreeView.cs b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/AddressRuleEditor/AddressRuleListTreeView.cs index 9847ad4..fc15dd0 100644 --- a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/AddressRuleEditor/AddressRuleListTreeView.cs +++ b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/AddressRuleEditor/AddressRuleListTreeView.cs @@ -6,6 +6,10 @@ using UnityEditor; using UnityEditor.IMGUI.Controls; using UnityEngine; +#if UNITY_6000_2_OR_NEWER +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState; +#endif namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutRuleEditor.AddressRuleEditor { diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleEditorPresenter.cs b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleEditorPresenter.cs index d00df97..83326e8 100644 --- a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleEditorPresenter.cs +++ b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleEditorPresenter.cs @@ -6,6 +6,9 @@ using SmartAddresser.Editor.Foundation.CommandBasedUndo; using SmartAddresser.Editor.Foundation.TinyRx.ObservableCollection; using UnityEditor.IMGUI.Controls; +#if UNITY_6000_2_OR_NEWER +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +#endif namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutRuleEditor.LabelRuleEditor { diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleListTreeView.cs b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleListTreeView.cs index 6bb6df0..8d6a247 100644 --- a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleListTreeView.cs +++ b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/LabelRuleEditor/LabelRuleListTreeView.cs @@ -7,6 +7,10 @@ using UnityEditor; using UnityEditor.IMGUI.Controls; using UnityEngine; +#if UNITY_6000_2_OR_NEWER +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState; +#endif namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutRuleEditor.LabelRuleEditor { diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleEditorPresenter.cs b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleEditorPresenter.cs index e9038dc..e502a6f 100644 --- a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleEditorPresenter.cs +++ b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleEditorPresenter.cs @@ -6,6 +6,9 @@ using SmartAddresser.Editor.Foundation.CommandBasedUndo; using SmartAddresser.Editor.Foundation.TinyRx.ObservableCollection; using UnityEditor.IMGUI.Controls; +#if UNITY_6000_2_OR_NEWER +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +#endif namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutRuleEditor.VersionRuleEditor { diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleListTreeView.cs b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleListTreeView.cs index 4634453..af007d6 100644 --- a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleListTreeView.cs +++ b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutRuleEditor/VersionRuleEditor/VersionRuleListTreeView.cs @@ -7,6 +7,10 @@ using UnityEditor; using UnityEditor.IMGUI.Controls; using UnityEngine; +#if UNITY_6000_2_OR_NEWER +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState; +#endif namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutRuleEditor.VersionRuleEditor { diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutViewer/LayoutViewerTreeView.cs b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutViewer/LayoutViewerTreeView.cs index 3484379..56b3c7a 100644 --- a/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutViewer/LayoutViewerTreeView.cs +++ b/Assets/SmartAddresser/Editor/Core/Tools/Addresser/LayoutViewer/LayoutViewerTreeView.cs @@ -6,6 +6,10 @@ using UnityEditor; using UnityEditor.IMGUI.Controls; using UnityEngine; +#if UNITY_6000_2_OR_NEWER +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState; +#endif namespace SmartAddresser.Editor.Core.Tools.Addresser.LayoutViewer { diff --git a/Assets/SmartAddresser/Editor/Foundation/EasyTreeView/TreeViewBase.cs b/Assets/SmartAddresser/Editor/Foundation/EasyTreeView/TreeViewBase.cs index ba0ca2b..2f9fcc1 100644 --- a/Assets/SmartAddresser/Editor/Foundation/EasyTreeView/TreeViewBase.cs +++ b/Assets/SmartAddresser/Editor/Foundation/EasyTreeView/TreeViewBase.cs @@ -8,6 +8,11 @@ using UnityEditor; using UnityEditor.IMGUI.Controls; using UnityEngine; +#if UNITY_6000_2_OR_NEWER +using TreeView = UnityEditor.IMGUI.Controls.TreeView; +using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem; +using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState; +#endif namespace SmartAddresser.Editor.Foundation.EasyTreeView {