From d612c7b3713f6de7f71df5a89f7e1f0dc8a78106 Mon Sep 17 00:00:00 2001 From: CabbageGod Date: Wed, 24 Apr 2024 01:32:19 -0400 Subject: [PATCH 1/2] Fixed scripting defines for dedicated server --- .../Scripts/Panels/PlayFabEditorSettings.cs | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs b/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs index bb9dad972..5bc62cb4c 100644 --- a/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs +++ b/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using UnityEditor; +using UnityEditor.Build; using UnityEngine; namespace PlayFab.PfEditor @@ -43,7 +44,23 @@ private static void DrawApiSubPanel() { using (new UnityVertical(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"))) { - var curDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup); +#if UNITY_2021_2_OR_NEWER +#if UNITY_SERVER + NamedBuildTarget buildTarget = NamedBuildTarget.Server; +#else + BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget; + BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); + NamedBuildTarget buildTarget = NamedBuildTarget.FromBuildTargetGroup(targetGroup); +#endif +#else + BuildTargetGroup buildTarget = EditorUserBuildSettings.selectedBuildTargetGroup; +#endif + +#if UNITY_2021_2_OR_NEWER + var curDefines = PlayerSettings.GetScriptingDefineSymbols(buildTarget); +#else + var curDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTarget); +#endif var changedFlags = false; var allFlags = new Dictionary(PlayFabEditorHelper.FLAG_LABELS); var extraDefines = new HashSet(curDefines.Split(' ', ';')); @@ -69,7 +86,12 @@ private static void DrawApiSubPanel() if (changedFlags) { - PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, curDefines); +#if UNITY_2021_2_OR_NEWER + PlayerSettings.SetScriptingDefineSymbols(buildTarget, curDefines); +#else + PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTarget, curDefines); +#endif + Debug.Log("Updating Defines: " + curDefines); AssetDatabase.Refresh(); } From 86d33dcab505adb47c01b2f153529b4277bee125 Mon Sep 17 00:00:00 2001 From: CabbageGod Date: Wed, 24 Apr 2024 18:22:50 -0400 Subject: [PATCH 2/2] Fixed duplicate variable name --- .../Editor/Scripts/Panels/PlayFabEditorSettings.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs b/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs index 5bc62cb4c..cf4d12692 100644 --- a/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs +++ b/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs @@ -48,8 +48,8 @@ private static void DrawApiSubPanel() #if UNITY_SERVER NamedBuildTarget buildTarget = NamedBuildTarget.Server; #else - BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget; - BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); + BuildTarget activeBuildTarget = EditorUserBuildSettings.activeBuildTarget; + BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(activeBuildTarget); NamedBuildTarget buildTarget = NamedBuildTarget.FromBuildTargetGroup(targetGroup); #endif #else