diff --git a/Editor/EditorWindow/GameFrameworkPreferenceWindow.cs b/Editor/EditorWindow/GameFrameworkPreferenceWindow.cs index 071d045..4a0d651 100644 --- a/Editor/EditorWindow/GameFrameworkPreferenceWindow.cs +++ b/Editor/EditorWindow/GameFrameworkPreferenceWindow.cs @@ -20,8 +20,9 @@ namespace AlicizaX.Editor GetWindow(true, "Preference Window"); } - private void OnEnable() + protected override void OnEnable() { + base.OnEnable(); this.position = new Rect(this.position.x, this.position.y, 800, 600); var assemblies = Utility.Assembly.GetAssemblies(); diff --git a/Editor/HybridCLR/HybridCLRSettingTab.cs b/Editor/HybridCLR/HybridCLRSettingTab.cs index 8c799b1..69bff7e 100644 --- a/Editor/HybridCLR/HybridCLRSettingTab.cs +++ b/Editor/HybridCLR/HybridCLRSettingTab.cs @@ -22,11 +22,11 @@ namespace AlicizaX.Runtime } [Sirenix.OdinInspector.Button(ButtonSizes.Large)] - protected void RefreshAssembly() + private void RefreshAssembly() { SyncAssemblyContent.RefreshAssembly(); } - + protected internal override void Save() { base.Save(); @@ -34,4 +34,4 @@ namespace AlicizaX.Runtime AssetDatabase.SaveAssets(); } } -} \ No newline at end of file +} diff --git a/Editor/Misc/ScriptingDefineSymbols.cs b/Editor/Misc/ScriptingDefineSymbols.cs index 2485736..23caeba 100644 --- a/Editor/Misc/ScriptingDefineSymbols.cs +++ b/Editor/Misc/ScriptingDefineSymbols.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using UnityEditor; +using UnityEditor.Build; namespace AlicizaX.Editor { @@ -134,7 +135,11 @@ namespace AlicizaX.Editor /// 平台的脚本宏定义。 public static string[] GetScriptingDefineSymbols(BuildTargetGroup buildTargetGroup) { +#if UNITY_6000_0_OR_NEWER + return PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup)).Split(';'); +#else return PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup).Split(';'); +#endif } /// @@ -144,7 +149,11 @@ namespace AlicizaX.Editor /// 要设置的脚本宏定义。 public static void SetScriptingDefineSymbols(BuildTargetGroup buildTargetGroup, string[] scriptingDefineSymbols) { +#if UNITY_6000_0_OR_NEWER + PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup), string.Join(";", scriptingDefineSymbols)); +#else PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, string.Join(";", scriptingDefineSymbols)); +#endif } } }