Skip to content

Commit

Permalink
https://docs.microsoft.com/en-us/gaming/playfab/release-notes/#241014
Browse files Browse the repository at this point in the history
  • Loading branch information
PlayFab SDK Team authored and PlayFab SDK Team committed Oct 14, 2024
2 parents 71e298d + 29809cb commit 00511ea
Show file tree
Hide file tree
Showing 44 changed files with 1,178 additions and 190 deletions.
29 changes: 26 additions & 3 deletions ...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,19 @@ void OnGUI()
{
// The actual window code goes here
using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1")))
{
EditorGUILayout.LabelField(string.Format("Editing: {0}", key), PlayFabEditorHelper.uiStyle.GetStyle("orTitle"), GUILayout.MinWidth(EditorGUIUtility.currentViewWidth));

}
scrollPos = GUILayout.BeginScrollView(scrollPos, PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"));
Value = EditorGUILayout.TextArea(Value, PlayFabEditorHelper.uiStyle.GetStyle("editTxt"));
GUI.SetNextControlName("TextArea");
GUI.skin.settings.cursorColor = Color.black;
GUILayout.EndScrollView();

using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1")))
{
GUILayout.FlexibleSpace();
GUI.SetNextControlName("SaveButton");
if (GUILayout.Button("SAVE", PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxWidth(200)))
{
for (int z = 0; z < PlayFabEditorDataMenu.tdViewer.items.Count; z++)
Expand All @@ -37,13 +40,33 @@ void OnGUI()
PlayFabEditorDataMenu.tdViewer.items[z].isDirty = true;
}
}
GUI.FocusControl("SaveButton");
Close();

}
GUILayout.FlexibleSpace();
}

Repaint();
HandleFocusTrap();
}
void HandleFocusTrap()
{
if (Event.current.type == EventType.KeyDown)
{
if (Event.current.control && Event.current.keyCode == KeyCode.Tab)
{
if (GUI.GetNameOfFocusedControl() == "SaveButton")
{
GUI.FocusControl("TextArea");
Event.current.Use();
}
else
{
GUI.FocusControl("SaveButton");
Event.current.Use();
}
}
}
}

public void LoadData(string k, string v)
Expand Down
8 changes: 4 additions & 4 deletions ...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataViewer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,16 @@ public void Draw()

if (items[z].Value != null)
{
var keyStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("listKey_dirty") : PlayFabEditorHelper.uiStyle.GetStyle("listKey");
var valStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("listValue_dirty") : PlayFabEditorHelper.uiStyle.GetStyle("listValue");
var keyStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("TextField") : PlayFabEditorHelper.uiStyle.GetStyle("listKey");
var valStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("TextField") : PlayFabEditorHelper.uiStyle.GetStyle("listValue");

using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
{
GUI.SetNextControlName("new_value_text_field");
items[z].Key = EditorGUILayout.TextField(items[z].Key, keyStyle, GUILayout.Width(keyInputBoxWidth));
items[z].Key = EditorGUILayout.TextField(items[z].Key, keyStyle, GUILayout.Width(keyInputBoxWidth), GUILayout.MaxHeight(20));

EditorGUILayout.LabelField(":", GUILayout.MaxWidth(10));
EditorGUILayout.LabelField("" + items[z].Value, valStyle, GUILayout.MaxWidth(valueInputBoxWidth), GUILayout.MaxHeight(25));
EditorGUILayout.LabelField("" + items[z].Value, valStyle, GUILayout.MaxWidth(valueInputBoxWidth), GUILayout.MaxHeight(20));
GUI.SetNextControlName("edit");
if (GUILayout.Button("EDIT", PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxHeight(19), GUILayout.MinWidth(35)))
{
Expand Down
33 changes: 33 additions & 0 deletions ...oject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.ComponentModel.Design;
using UnityEditor;
using UnityEngine;

Expand All @@ -17,17 +18,21 @@ void OnGUI()
{
// The actual window code goes here
using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1")))
{
EditorGUILayout.LabelField(string.Format("Editing: {0}", key), PlayFabEditorHelper.uiStyle.GetStyle("orTitle"), GUILayout.MinWidth(EditorGUIUtility.currentViewWidth));

}
scrollPos = GUILayout.BeginScrollView(scrollPos, PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"));
Value = EditorGUILayout.TextArea(Value, PlayFabEditorHelper.uiStyle.GetStyle("editTxt"));
GUI.SetNextControlName("TextArea");
GUI.skin.settings.cursorColor = Color.black;
GUILayout.EndScrollView();


using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
{
GUILayout.FlexibleSpace();
GUI.SetNextControlName("SaveButton");
if (GUILayout.Button("Save", PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxWidth(200)))
{
for (int z = 0; z < PlayFabEditorDataMenu.tdInternalViewer.items.Count; z++)
Expand All @@ -38,14 +43,42 @@ void OnGUI()
PlayFabEditorDataMenu.tdInternalViewer.items[z].isDirty = true;
}
}
GUI.FocusControl("SaveButton");
Close();

}
GUILayout.FlexibleSpace();
}

Repaint();
HandleFocusTrap();
}
void HandleFocusTrap()
{
if (Event.current.type == EventType.KeyDown)
{
if (Event.current.control && Event.current.keyCode == KeyCode.Tab)
{
if (GUI.GetNameOfFocusedControl() == "SaveButton")
{
GUI.FocusControl("TextArea");
Event.current.Use();
}
else
{
GUI.FocusControl("SaveButton");
Event.current.Use();
}
}
else if((Event.current.keyCode == KeyCode.Escape))
{
Close();
}
}
}




public void LoadData(string k, string v)
{
Expand Down
8 changes: 4 additions & 4 deletions ...oject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataViewer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ public void Draw()

if (items[z].Value != null)
{
var keyStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("listKey_dirty") : PlayFabEditorHelper.uiStyle.GetStyle("listKey");
var valStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("listValue_dirty") : PlayFabEditorHelper.uiStyle.GetStyle("listValue");
var keyStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("TextField") : PlayFabEditorHelper.uiStyle.GetStyle("TextField");
var valStyle = items[z].isDirty ? PlayFabEditorHelper.uiStyle.GetStyle("TextField") : PlayFabEditorHelper.uiStyle.GetStyle("TextField");

using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
{
items[z].Key = EditorGUILayout.TextField(items[z].Key, keyStyle, GUILayout.Width(keyInputBoxWidth));
items[z].Key = EditorGUILayout.TextField(items[z].Key, keyStyle, GUILayout.Width(keyInputBoxWidth), GUILayout.MaxHeight(20));

EditorGUILayout.LabelField(":", GUILayout.MaxWidth(10));
EditorGUILayout.LabelField("" + items[z].Value, valStyle, GUILayout.MaxWidth(valueInputBoxWidth), GUILayout.MaxHeight(25));
EditorGUILayout.LabelField("" + items[z].Value, valStyle, GUILayout.MaxWidth(valueInputBoxWidth), GUILayout.MaxHeight(20));

if (GUILayout.Button("EDIT", PlayFabEditorHelper.uiStyle.GetStyle("Button"), GUILayout.MaxHeight(19), GUILayout.MinWidth(35)))
{
Expand Down
149 changes: 82 additions & 67 deletions ExampleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,16 @@ internal enum MenuStates
internal static MenuStates _menuState = MenuStates.Sdks;
#endregion
public static void DrawMenu()
{
mainMenuHandler();
{
if (PlayFabEditorSDKTools.IsInstalled && PlayFabEditorSDKTools.isSdkSupported)
{
mainMenuHandler();
}
else
{
subMenuHandler();
}


if (PlayFabEditorSDKTools.IsInstalled && PlayFabEditorSDKTools.isSdkSupported)
_menuState = (MenuStates)PlayFabEditorPrefsSO.Instance.curMainMenuIdx;
Expand Down Expand Up @@ -54,14 +62,15 @@ public static void DrawMenu()

using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1"), GUILayout.Height(25), GUILayout.ExpandWidth(true)))
{
GUILayout.Space(5);
GUI.SetNextControlName("sdk");
GUILayout.Space(5);
GUI.SetNextControlName("sdk");
if (GUILayout.Button("SDK", sdksButtonStyle, GUILayout.MaxWidth(35)))
{
OnSdKsClicked();
}
if (PlayFabEditorSDKTools.IsInstalled && PlayFabEditorSDKTools.isSdkSupported)
{

GUI.SetNextControlName("settings");
if (GUILayout.Button("SETTINGS", settingsButtonStyle, GUILayout.MaxWidth(65)))
{
Expand Down Expand Up @@ -97,85 +106,91 @@ public static void DrawMenu()
}
}

public static void OnToolsClicked()
{
_menuState = MenuStates.Tools;
PlayFabEditor.RaiseStateUpdate(PlayFabEditor.EdExStates.OnMenuItemClicked, MenuStates.Tools.ToString());
PlayFabEditorPrefsSO.Instance.curMainMenuIdx = (int)_menuState;
}
public static void mainMenuHandler()
{
var e = Event.current;
if (e.type == EventType.KeyUp && e.keyCode == KeyCode.RightArrow)
if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.RightArrow))
{
switch (focusIndex)
string[] controlNames = { "sdk", "settings", "data", "tools", "packages", "help", "logOut" };
int direction = e.keyCode == KeyCode.RightArrow ? 1 : -1;
for (int i = 0; i < controlNames.Length; i++)
{
case 0:
EditorGUI.FocusTextInControl("sdk");
focusIndex = 1;
break;
case 1:
EditorGUI.FocusTextInControl("settings");
focusIndex = 2;
break;
case 2:
EditorGUI.FocusTextInControl("data");
focusIndex = 3;
break;
case 3:
EditorGUI.FocusTextInControl("tools");
focusIndex = 4;
break;
case 4:
EditorGUI.FocusTextInControl("packages");
focusIndex = 5;
break;
case 5:
EditorGUI.FocusTextInControl("help");
focusIndex = 6;
break;
case 6:
EditorGUI.FocusTextInControl("logOut");
focusIndex = 0;
focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
if (IsControlVisible(controlNames[focusIndex]))
{
EditorGUI.FocusTextInControl(controlNames[focusIndex]);
break;
}
}

}
if (e.type == EventType.KeyUp && e.keyCode == KeyCode.LeftArrow)
else if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.LeftArrow))
{
switch (focusIndex)
string[] controlNames = { "logOut", "help", "packages", "tools", "data", "settings", "sdk" };
int direction = e.keyCode == KeyCode.LeftArrow ? 1 : -1;
for (int i = 0; i < controlNames.Length; i++)
{
case 0:
EditorGUI.FocusTextInControl("logOut");
focusIndex = 1;
break;
case 1:
EditorGUI.FocusTextInControl("help");
focusIndex = 2;
break;
case 2:
EditorGUI.FocusTextInControl("packages");
focusIndex = 3;
break;
case 3:
EditorGUI.FocusTextInControl("tools");
focusIndex = 4;
break;
case 4:
EditorGUI.FocusTextInControl("data");
focusIndex = 5;
focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
if (IsControlVisible(controlNames[focusIndex]))
{
EditorGUI.FocusTextInControl(controlNames[focusIndex]);
break;
case 5:
EditorGUI.FocusTextInControl("settings");
focusIndex = 6;
}
}
}
}

private static bool IsControlVisible(string controlName)
{
Rect controlRect = GetControlRectByName(controlName);
return controlRect.xMin < Screen.width && controlRect.xMax > 0 &&
controlRect.yMin < Screen.height && controlRect.yMax > 0;
}
private static Rect GetControlRectByName(string controlName)
{
return new Rect(0, 0, 100, 20);
}

public static void subMenuHandler()
{
var e = Event.current;
if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.RightArrow))
{
string[] controlNamesnoSDK = { "sdk", "help", "logOut" };
int direction = e.keyCode == KeyCode.RightArrow ? 1 : -1;
for (int i = 0; i < controlNamesnoSDK.Length; i++)
{
focusIndex = (focusIndex + direction + controlNamesnoSDK.Length) % controlNamesnoSDK.Length;
if (IsControlVisible(controlNamesnoSDK[focusIndex]))
{
EditorGUI.FocusTextInControl(controlNamesnoSDK[focusIndex]);
break;
case 6:
EditorGUI.FocusTextInControl("sdk");
focusIndex = 0;
}
}
}
else if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.LeftArrow))
{
string[] controlNamesnoSDK = { "logOut", "help", "sdk" };
int direction = e.keyCode == KeyCode.RightArrow ? 1 : -1;
for (int i = 0; i < controlNamesnoSDK.Length; i++)
{
focusIndex = (focusIndex + direction + controlNamesnoSDK.Length) % controlNamesnoSDK.Length;
if (IsControlVisible(controlNamesnoSDK[focusIndex]))
{
EditorGUI.FocusTextInControl(controlNamesnoSDK[focusIndex]);
break;
}
}
}

}

public static void OnToolsClicked()
{
_menuState = MenuStates.Tools;
PlayFabEditor.RaiseStateUpdate(PlayFabEditor.EdExStates.OnMenuItemClicked, MenuStates.Tools.ToString());
PlayFabEditorPrefsSO.Instance.curMainMenuIdx = (int)_menuState;
}

public static void OnDataClicked()
{
_menuState = MenuStates.Data;
Expand Down
2 changes: 1 addition & 1 deletion ...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorVersion.cs
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
namespace PlayFab.PfEditor { public static partial class PlayFabEditorHelper { public static string EDEX_VERSION = "2.202.240913"; } }
namespace PlayFab.PfEditor { public static partial class PlayFabEditorHelper { public static string EDEX_VERSION = "2.203.241014"; } }
Binary file added ...leMacProject/Assets/PlayFabEditorExtensions/Editor/UI/Images/TextFieldHover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 00511ea

Please sign in to comment.