diff --git a/CHANGELOG.md b/CHANGELOG.md index b5cd07f..d7262dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Change Log All notable changes to this project will be documented in this file. +## [2.1.0] - 2026-06-16 + +### Fixed +- Fixed Unity 6000.5 serialization warnings + +### Removed +- Removed obsolete entities window from toolbar sample + ## [2.0.3] - 2026-03-31 ### Fixed diff --git a/Editor/Favorites/Utilities/Favorites.cs b/Editor/Favorites/Utilities/Favorites.cs index 2f0e5ed..1b481b8 100644 --- a/Editor/Favorites/Utilities/Favorites.cs +++ b/Editor/Favorites/Utilities/Favorites.cs @@ -13,6 +13,9 @@ namespace Module.NavigationTool.Editor.Favorite { public static readonly string PREF_ID = "PREF_FAVORITE_LIST"; +#if UNITY_6000_5_OR_NEWER + [SerializeReference] +#endif public List entries; public Favorites() @@ -236,6 +239,9 @@ namespace Module.NavigationTool.Editor.Favorite public bool isAsset; public bool expanded; public int indentLevel; +#if UNITY_6000_5_OR_NEWER + [SerializeReference] +#endif public List children; [NonSerialized] diff --git a/Editor/Favorites/Window/EditorFavoritesWindow.cs b/Editor/Favorites/Window/EditorFavoritesWindow.cs index b0bf920..a07ab47 100644 --- a/Editor/Favorites/Window/EditorFavoritesWindow.cs +++ b/Editor/Favorites/Window/EditorFavoritesWindow.cs @@ -41,7 +41,7 @@ namespace Module.NavigationTool.Editor.Favorite return; styles.Initialize(GUI.skin); - var rectTools = new Rect(0.0f, 0.0f, position.width, EditorGUIUtility.singleLineHeight); + var rectTools = new Rect(2.0f, 0.0f, position.width - 4f, EditorGUIUtility.singleLineHeight); var rectList = new Rect(0.0f, rectTools.yMax, position.width, position.height - rectTools.height); viewTools.Initialize(); diff --git a/Editor/Favorites/Window/Styles/Styles.cs b/Editor/Favorites/Window/Styles/Styles.cs index f2b00b2..e8a3984 100644 --- a/Editor/Favorites/Window/Styles/Styles.cs +++ b/Editor/Favorites/Window/Styles/Styles.cs @@ -25,7 +25,7 @@ namespace Module.NavigationTool.Editor.Favorite toolbox = new GUIStyle(skin.box); buttonAddFolder = new GUIStyle(skin.button); - buttonAddFolder.padding = new RectOffset(4, 0, 0, 4); + buttonAddFolder.padding = new RectOffset(4, 4, 2, 2); entry = new GUIStyle(skin.label); entry.hover.textColor = entry.onHover.textColor = Color.white; diff --git a/Editor/Favorites/Window/Views/AbstractEditorFavoritesView.cs b/Editor/Favorites/Window/Views/AbstractEditorFavoritesView.cs index 7893805..ecfcb19 100644 --- a/Editor/Favorites/Window/Views/AbstractEditorFavoritesView.cs +++ b/Editor/Favorites/Window/Views/AbstractEditorFavoritesView.cs @@ -1,7 +1,9 @@ -using UnityEngine; +using System; +using UnityEngine; namespace Module.NavigationTool.Editor.Favorite { + [Serializable] internal abstract class AbstractEditorFavoritesView { public abstract void Initialize(); diff --git a/Editor/Favorites/Window/Views/EditorFavoritesViewTools.cs b/Editor/Favorites/Window/Views/EditorFavoritesViewTools.cs index 1f7b69c..5bd3787 100644 --- a/Editor/Favorites/Window/Views/EditorFavoritesViewTools.cs +++ b/Editor/Favorites/Window/Views/EditorFavoritesViewTools.cs @@ -15,17 +15,18 @@ namespace Module.NavigationTool.Editor.Favorite public override void Draw(EditorFavoritesWindow window, Rect rect, Styles styles) { - float dim = rect.height; - + float dimWidth = 24.0f; + float dimHeight = rect.height; + GUI.BeginGroup(rect, styles.toolbox); { - var r0 = new Rect(0.0f, 0.0f, rect.width - dim, dim); - var r1 = new Rect(rect.width - r0.height, 0.0f, dim, dim); + var r0 = new Rect(0.0f, 0.0f, rect.width - dimWidth, dimHeight); + var r1 = new Rect(rect.width - dimWidth, 0.0f, dimWidth, dimHeight); searchStr = EditorGUI.TextField(r0, searchStr); if (GUI.Button(r1, "+", styles.buttonAddFolder)) - EditorFavoritesPopupWindowAddFolder.Show(new Vector2(r1.xMax, dim), null); + EditorFavoritesPopupWindowAddFolder.Show(new Vector2(r1.xMax, dimHeight), null); } GUI.EndGroup(); } diff --git a/Editor/History/Window/Views/AbstractEditorHistoryView.cs b/Editor/History/Window/Views/AbstractEditorHistoryView.cs index 2c72546..4e200df 100644 --- a/Editor/History/Window/Views/AbstractEditorHistoryView.cs +++ b/Editor/History/Window/Views/AbstractEditorHistoryView.cs @@ -1,7 +1,9 @@ -using UnityEngine; +using System; +using UnityEngine; namespace Module.NavigationTool.Editor.History { + [Serializable] internal abstract class AbstractEditorHistoryView { public abstract void Initialize(); diff --git a/Samples.meta b/Samples.meta new file mode 100644 index 0000000..7ca75d2 --- /dev/null +++ b/Samples.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30f6c7eb59372144da82504da7478213 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples~/SamplesToolbarBurst.meta b/Samples~/SamplesToolbarBurst.meta new file mode 100644 index 0000000..5c7314f --- /dev/null +++ b/Samples~/SamplesToolbarBurst.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a5ce7561a51e654386a2c6ae3a67af0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples~/SamplesToolbarEntities.meta b/Samples~/SamplesToolbarEntities.meta new file mode 100644 index 0000000..f4a40d2 --- /dev/null +++ b/Samples~/SamplesToolbarEntities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 672a1d963c4b96243beb62bfd1a06938 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples~/SamplesToolbarEntities/MainToolbarEntitiesElement.cs b/Samples~/SamplesToolbarEntities/MainToolbarEntitiesElement.cs index 903bb90..4f627bd 100644 --- a/Samples~/SamplesToolbarEntities/MainToolbarEntitiesElement.cs +++ b/Samples~/SamplesToolbarEntities/MainToolbarEntitiesElement.cs @@ -19,10 +19,14 @@ namespace Module.NavigationTool.Editor.Entities.Toolbar return new List(5) { new MainToolbarButton(new MainToolbarContent(Styles.IconHierarchy, "Show/Hide entities hierarchy window"), () => ToggleWindow("HierarchyWindow")), +#if !UNITY_6000_5_OR_NEWER new MainToolbarButton(new MainToolbarContent(Styles.IconComponents, "Show/Hide entities components window"), () => ToggleWindow("ComponentsWindow")), +#endif new MainToolbarButton(new MainToolbarContent(Styles.IconSystems, "Show/Hide entities systems window"), () => ToggleWindow("SystemScheduleWindow")), +#if !UNITY_6000_5_OR_NEWER new MainToolbarButton(new MainToolbarContent(Styles.IconArchetypes, "Show/Hide entities archetypes window"), () => ToggleWindow("ArchetypesWindow")), new MainToolbarButton(new MainToolbarContent(Styles.IconJournaling, "Show/Hide entities journaling window"), () => ToggleWindow("EntitiesJournalingWindow")) +#endif }; } @@ -57,10 +61,14 @@ namespace Module.NavigationTool.Editor.Entities.Toolbar private static class Styles { public static Texture2D IconHierarchy; +#if !UNITY_6000_5_OR_NEWER public static Texture2D IconComponents; +#endif public static Texture2D IconSystems; +#if !UNITY_6000_5_OR_NEWER public static Texture2D IconArchetypes; public static Texture2D IconJournaling; +#endif private static bool _isInitialized; @@ -74,10 +82,14 @@ namespace Module.NavigationTool.Editor.Entities.Toolbar return; IconHierarchy = LoadIcon("EntityGroup/EntityGroup"); +#if !UNITY_6000_5_OR_NEWER IconComponents = LoadIcon("Component/Component"); +#endif IconSystems = LoadIcon("System/System"); +#if !UNITY_6000_5_OR_NEWER IconArchetypes = LoadIcon("Archetype/Archetype"); IconJournaling = LoadIcon("Journaling/Journaling"); +#endif _isInitialized = true; } diff --git a/package.json b/package.json index 6d61fd3..37e7fee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.module.navigationtool", - "version": "2.0.3", + "version": "2.1.0", "displayName": "Module.NavigationTool", "description": "Support for navigation tools, like favorites, history and toolbars", "unity": "2019.2",