diff --git a/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs b/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs index 9d744cf8..e02c6418 100644 --- a/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs +++ b/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs @@ -261,7 +261,11 @@ internal static void UpdateDrawers(IToolboxInspectorSettings settings) /// internal static bool HasNativeTypeDrawer(Type type) { +#if UNITY_2023_3_OR_NEWER + var parameters = new object[] { type, null, false }; +#else var parameters = new object[] { type }; +#endif var result = getDrawerTypeForTypeMethod.Invoke(null, parameters) as Type; return result != null && typeof(PropertyDrawer).IsAssignableFrom(result); } diff --git a/Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs b/Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs index 70b4ed13..c73770c8 100644 --- a/Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs +++ b/Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs @@ -2,6 +2,7 @@ using System.Linq; using UnityEditor; +using UnityEditor.Build; namespace Toolbox.Editor { @@ -9,14 +10,24 @@ public static class ScriptingUtility { public static List GetDefines() { +#if UNITY_2023_1_OR_NEWER + var target = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup); + var defines = PlayerSettings.GetScriptingDefineSymbols(target); +#else var defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup); +#endif return defines.Split(';').ToList(); } public static void SetDefines(List definesList) { var defines = string.Join(";", definesList.ToArray()); +#if UNITY_2023_1_OR_NEWER + var target = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup); + PlayerSettings.SetScriptingDefineSymbols(target, defines); +#else PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, defines); +#endif } public static void AppendDefine(string define)