浼樺寲

Editor/EditorWindow/GameFrameworkPreferenceWindow.cs

@@ -20,8 +20,9 @@ namespace AlicizaX.Editor
             GetWindow<GameFrameworkPreferenceWindow>(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();

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();
         }
     }
-}
+}

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
         /// <returns>平台的脚本宏定义。</returns>
         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
         }
 
         /// <summary>
@@ -144,7 +149,11 @@ namespace AlicizaX.Editor
         /// <param name="scriptingDefineSymbols">要设置的脚本宏定义。</param>
         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
         }
     }
 }