Skip to content

Fixed scripting defines for dedicated server #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cabbagegod wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed scripting defines for dedicated server #884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d612c7b
Fixed scripting defines for dedicated server
cabbagegod Apr 24, 2024
86d33dc
Fixed duplicate variable name
cabbagegod Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions ...TestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Text;
using UnityEditor;
using UnityEditor.Build;
using UnityEngine;

namespace PlayFab.PfEditor
Expand Down Expand Up @@ -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 activeBuildTarget = EditorUserBuildSettings.activeBuildTarget;
BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(activeBuildTarget);
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<string, PfDefineFlag>(PlayFabEditorHelper.FLAG_LABELS);
var extraDefines = new HashSet<string>(curDefines.Split(' ', ';'));
Expand All @@ -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();
}
Expand Down