https://docs.microsoft.com/en-us/gaming/playfab/release-notes/#241025

PlayFab · Oct 30, 2024 · 44a67dd · 44a67dd
2 parents 00511ea + 33920b9
commit 44a67dd
Show file tree

Hide file tree

Showing 22 changed files with 270 additions and 124 deletions.
diff --git a/...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs b/...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs
@@ -49,6 +49,7 @@ void OnGUI()
             Repaint();
             HandleFocusTrap();
         }
+
         void HandleFocusTrap()
         {
             if (Event.current.type == EventType.KeyDown)
@@ -66,6 +67,11 @@ void HandleFocusTrap()
                         Event.current.Use();
                     }
                 }
+                else if ((Event.current.keyCode == KeyCode.Escape))
+                {
+                    Close();
+                    GUI.FocusControl("refresh");
+                }
             }
         }
 

diff --git a/...oject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs b/...oject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs
@@ -73,6 +73,7 @@ void HandleFocusTrap()
                 else if((Event.current.keyCode == KeyCode.Escape))
                 {
                     Close();
+                    GUI.FocusControl("refresh");
                 }
             }
         }

diff --git a/...Project/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorAuthenticate.cs b/...Project/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorAuthenticate.cs
@@ -106,74 +106,54 @@ public static void InputHandler()
                 }
             }
         }
+
+
         public static void CreateHandler()
         {
+
             var e = Event.current;
-            shiftKeyHandler(); // method calling
-            if (e.type == EventType.KeyUp && e.keyCode == KeyCode.Tab)
+            if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.Tab))
             {
-                if (!isShiftKeyPressed)
+                string[] controlNames = { "game_manger", "email", "password", "confirm_password", "studio_name", "login", "create_account","view_readme" };
+                int direction = e.keyCode == KeyCode.Tab ? 1 : -1;
+                for (int i = 0; i < controlNames.Length; i++)
                 {
-                    switch (focusIndex)
+                    focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
+                    if (IsControlVisible(controlNames[focusIndex]))
                     {
-                        case 0:
-                            EditorGUI.FocusTextInControl("email");
-                            focusIndex = 1;
-                            break;
-                        case 1:
-                            EditorGUI.FocusTextInControl("password");
-                            focusIndex = 2;
-                            break;
-                        case 2:
-                            EditorGUI.FocusTextInControl("confirm_password");
-                            focusIndex = 3;
-                            break;
-                        case 3:
-                            EditorGUI.FocusTextInControl("studio_name");
-                            focusIndex = 4;
-                            break;
-                        case 4:
-                            GUI.FocusControl("create_account");
-                            focusIndex = 5;
-                            break;
-                        case 5:
-                            GUI.FocusControl("login");
-                            focusIndex = 0;
-                            break;
+                        EditorGUI.FocusTextInControl(controlNames[focusIndex]);
+                        break;
                     }
                 }
-                else
+            }
+            else if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.LeftShift && e.keyCode == KeyCode.Tab))
+            {
+                string[] controlNames = { "view_readme", "create_account", "login", "studio_name", "confirm_password", "password", "email", "game_manger" };
+                int direction = e.keyCode == KeyCode.LeftShift && e.keyCode == KeyCode.Tab ? 1 : -1;
+                for (int i = 0; i < controlNames.Length; i++)
                 {
-                    switch (focusIndex)
+                    focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
+                    if (IsControlVisible(controlNames[focusIndex]))
                     {
-                        case 0:
-                            GUI.FocusControl("login");
-                            focusIndex = 5;
-                            break;
-                        case 1:
-                            GUI.FocusControl("email");
-                            focusIndex = 0;
-                            break;
-                        case 2:
-                            EditorGUI.FocusTextInControl("password");
-                            focusIndex = 1;
-                            break;
-                        case 3:
-                            EditorGUI.FocusTextInControl("confirm_password");
-                            focusIndex = 2;
-                            break;
-                        case 4:
-                            EditorGUI.FocusTextInControl("studio_name");
-                            focusIndex = 3;
-                            break;
-                        case 5:
-                            EditorGUI.FocusTextInControl("create_account");
-                            focusIndex = 4;
-                            break;
+                        EditorGUI.FocusTextInControl(controlNames[focusIndex]);
+                        break;
                     }
                 }
             }
+
+        }
+
+        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 DrawAuthPanels()
         {
             //capture enter input for login
@@ -274,6 +254,7 @@ public static void DrawAuthPanels()
                 using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
                 {
                     GUILayout.FlexibleSpace();
+                    GUI.SetNextControlName("view_readme");
                     if (GUILayout.Button("VIEW README ->", PlayFabEditorHelper.uiStyle.GetStyle("textButton")))
                     {
                         Application.OpenURL("https://github.com/PlayFab/UnityEditorExtensions#setup");

diff --git a/...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorHeader.cs b/...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorHeader.cs
@@ -25,12 +25,13 @@ public static void DrawHeader(float progress = 0f)
 
                 float gmAnchor = EditorGUIUtility.currentViewWidth - 30;
 
-
+               
                 if (EditorGUIUtility.currentViewWidth > 375)
                 {
                     gmAnchor = EditorGUIUtility.currentViewWidth - 140;
-                    GUILayout.BeginArea(new Rect(gmAnchor, 10, 140, 42));
+                    GUILayout.BeginArea(new Rect(gmAnchor, 10, 140, 42)); 
                     GUILayout.BeginHorizontal();
+                    GUI.SetNextControlName("game_manger");
                     if (GUILayout.Button("GAME MANAGER", PlayFabEditorHelper.uiStyle.GetStyle("textButton"), GUILayout.MaxWidth(105)))
                     {
                         OnDashbaordClicked();

diff --git a/...eMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs b/...eMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs
@@ -39,6 +39,67 @@ public enum WebRequestType
         #endregion
 
         #region draw calls
+        private static int focusIndex;
+        public static void subMenuHandler()
+        {
+            var e = Event.current;
+            if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.Tab))
+            {
+                string[] controlNames = { "refresh", "my_game_studio"};
+                int direction = e.keyCode == KeyCode.Tab ? 1 : -1;
+                for (int i = 0; i < controlNames.Length; i++)
+                {
+                    focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
+                    if (IsControlVisible(controlNames[focusIndex]))
+                    {
+                        EditorGUI.FocusTextInControl(controlNames[focusIndex]);
+                        break;
+                    }
+                }
+            }
+        }
+        public static void mainMenuHandler()
+        {
+            var e = Event.current;
+            if (e.type == EventType.KeyUp && (e.keyCode == KeyCode.Tab))
+            {
+                string[] controlNames = { "refresh", "my_game_studio", "my_game", "secret_key", "view_game_manager" };
+                int direction = e.keyCode == KeyCode.Tab ? 1 : -1;
+                for (int i = 0; i < controlNames.Length; i++)
+                {
+                    focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
+                    if (IsControlVisible(controlNames[focusIndex]))
+                    {
+                        EditorGUI.FocusTextInControl(controlNames[focusIndex]);
+                        break;
+                    }
+                }
+            }
+            else if (e.type == EventType.KeyUp && ((e.shift && e.keyCode == KeyCode.Tab)))
+            {
+                string[] controlNames = { "refresh", "my_game_studio", "my_game", "secret_key", "view_game_manager" };
+                int direction = e.shift ? -1 : 1;
+                for (int i = 0; i < controlNames.Length; i++)
+                {
+                    focusIndex = (focusIndex + direction + controlNames.Length) % controlNames.Length;
+                    if (IsControlVisible(controlNames[focusIndex]))
+                    {
+                        EditorGUI.FocusTextInControl(controlNames[focusIndex]);
+                        break;
+                    }
+                }
+            }
+        }
+        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);
+        }
         private static void DrawApiSubPanel()
         {
             using (new UnityVertical(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1")))
@@ -135,6 +196,7 @@ public static void DrawSettingsPanel()
 
         private static void DrawTitleSettingsSubPanel()
         {
+
             float labelWidth = 100;
 
             if (PlayFabEditorPrefsSO.Instance.StudioList != null && PlayFabEditorPrefsSO.Instance.StudioList.Count != StudioFoldOutStates.Count + 1)
@@ -158,16 +220,29 @@ private static void DrawTitleSettingsSubPanel()
             {
                 EditorGUILayout.LabelField("STUDIOS:", PlayFabEditorHelper.uiStyle.GetStyle("labelStyle"), GUILayout.Width(labelWidth));
                 GUILayout.FlexibleSpace();
+                GUI.SetNextControlName("refresh");
                 if (GUILayout.Button("REFRESH", PlayFabEditorHelper.uiStyle.GetStyle("Button")))
                     PlayFabEditorDataService.RefreshStudiosList();
             }
+            foreach (var studio in StudioFoldOutStates)
+            {
+                if (studio.Value.isCollapsed)
+                {
+                    subMenuHandler();
+                }
+                else 
+                { 
+                    mainMenuHandler(); 
+                }
+
+            }
 
             foreach (var studio in StudioFoldOutStates)
             {
+                GUI.SetNextControlName("my_game_studio");
                 var style = new GUIStyle(EditorStyles.foldout);
                 if (studio.Value.isCollapsed)
-                    style.fontStyle = FontStyle.Normal;
-
+                style.fontStyle = FontStyle.Normal;
                 studio.Value.isCollapsed = EditorGUI.Foldout(EditorGUILayout.GetControlRect(), studio.Value.isCollapsed, string.Format("{0} ({1})", studio.Value.Studio.Name, studio.Value.Studio.Titles.Length), true, PlayFabEditorHelper.uiStyle.GetStyle("foldOut_std"));
                 if (studio.Value.isCollapsed)
                     continue;
@@ -181,6 +256,7 @@ private static void DrawTitleSettingsSubPanel()
                 GUILayout.Space(5);
 
                 // draw title foldouts
+                GUI.SetNextControlName("my_game");
                 foreach (var title in studio.Value.titleFoldOutStates)
                 {
                     title.Value.isCollapsed = EditorGUI.Foldout(EditorGUILayout.GetControlRect(), title.Value.isCollapsed, string.Format("{0} [{1}]", title.Value.Title.Name, title.Value.Title.Id), true, PlayFabEditorHelper.uiStyle.GetStyle("foldOut_std"));
@@ -191,13 +267,15 @@ private static void DrawTitleSettingsSubPanel()
                     using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
                     {
                         EditorGUILayout.LabelField("SECRET KEY:", PlayFabEditorHelper.uiStyle.GetStyle("labelStyle"), GUILayout.Width(labelWidth));
-                        EditorGUILayout.TextField("" + title.Value.Title.SecretKey);
+                        GUI.SetNextControlName("secret_key");
+                        EditorGUILayout.TextField("" + title.Value.Title.SecretKey, PlayFabEditorHelper.uiStyle.GetStyle("TextField"), GUILayout.MinWidth(500)); ;
                     }
 
                     using (new UnityHorizontal(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleClear")))
                     {
                         EditorGUILayout.LabelField("URL:", PlayFabEditorHelper.uiStyle.GetStyle("labelStyle"), GUILayout.Width(labelWidth));
                         GUILayout.FlexibleSpace();
+                        GUI.SetNextControlName("view_game_manager");
                         if (GUILayout.Button("VIEW IN GAME MANAGER", PlayFabEditorHelper.uiStyle.GetStyle("textButton")))
                             Application.OpenURL(title.Value.Title.GameManagerUrl);
                         GUILayout.FlexibleSpace();

diff --git a/...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorVersion.cs b/...pleMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils/PlayFabEditorVersion.cs
@@ -1 +1 @@
-namespace PlayFab.PfEditor { public static partial class PlayFabEditorHelper { public static string EDEX_VERSION = "2.203.241014"; } }
+namespace PlayFab.PfEditor { public static partial class PlayFabEditorHelper { public static string EDEX_VERSION = "2.204.241025"; } }
diff --git a/ExampleMacProject/Assets/PlayFabSDK/Admin/PlayFabAdminModels.cs b/ExampleMacProject/Assets/PlayFabSDK/Admin/PlayFabAdminModels.cs
@@ -2647,6 +2647,8 @@ public enum GenericErrorCodes
         MaxQueryableVersionsValueNotAllowedForTier,
         StatisticDefinitionHasNullOrEmptyVersionConfiguration,
         StatisticColumnLengthMismatch,
+        InvalidExternalEntityId,
+        UpdatingStatisticsUsingTransactionIdNotAvailableForFreeTier,
         MatchmakingEntityInvalid,
         MatchmakingPlayerAttributesInvalid,
         MatchmakingQueueNotFound,

diff --git a/ExampleMacProject/Assets/PlayFabSDK/Server/PlayFabServerModels.cs b/ExampleMacProject/Assets/PlayFabSDK/Server/PlayFabServerModels.cs
@@ -2016,6 +2016,8 @@ public enum GenericErrorCodes
         MaxQueryableVersionsValueNotAllowedForTier,
         StatisticDefinitionHasNullOrEmptyVersionConfiguration,
         StatisticColumnLengthMismatch,
+        InvalidExternalEntityId,
+        UpdatingStatisticsUsingTransactionIdNotAvailableForFreeTier,
         MatchmakingEntityInvalid,
         MatchmakingPlayerAttributesInvalid,
         MatchmakingQueueNotFound,

diff --git a/ExampleMacProject/Assets/PlayFabSDK/Shared/Internal/PlayFabErrors.cs b/ExampleMacProject/Assets/PlayFabSDK/Shared/Internal/PlayFabErrors.cs
@@ -593,6 +593,8 @@ public enum PlayFabErrorCode
         MaxQueryableVersionsValueNotAllowedForTier = 1591,
         StatisticDefinitionHasNullOrEmptyVersionConfiguration = 1592,
         StatisticColumnLengthMismatch = 1593,
+        InvalidExternalEntityId = 1594,
+        UpdatingStatisticsUsingTransactionIdNotAvailableForFreeTier = 1595,
         MatchmakingEntityInvalid = 2001,
         MatchmakingPlayerAttributesInvalid = 2002,
         MatchmakingQueueNotFound = 2016,

diff --git a/ExampleMacProject/Assets/PlayFabSDK/Shared/Public/PlayFabSettings.cs b/ExampleMacProject/Assets/PlayFabSDK/Shared/Public/PlayFabSettings.cs
@@ -65,9 +65,9 @@ static PlayFabSettings()
         /// </summary>
         public static readonly PlayFabAuthenticationContext staticPlayer = new PlayFabAuthenticationContext();
 
-        public const string SdkVersion = "2.203.241014";
+        public const string SdkVersion = "2.204.241025";
         public const string BuildIdentifier = "adobuild_unitysdk_167";
-        public const string VersionString = "UnitySDK-2.203.241014";
+        public const string VersionString = "UnitySDK-2.204.241025";
         public static string EngineVersion = UnityEngine.Application.unityVersion;
         public static string PlatformString;
 

diff --git a/...leTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs b/...leTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleDataEditor.cs
@@ -49,6 +49,7 @@ void OnGUI()
             Repaint();
             HandleFocusTrap();
         }
+
         void HandleFocusTrap()
         {
             if (Event.current.type == EventType.KeyDown)
@@ -66,6 +67,11 @@ void HandleFocusTrap()
                         Event.current.Use();
                     }
                 }
+                else if ((Event.current.keyCode == KeyCode.Escape))
+                {
+                    Close();
+                    GUI.FocusControl("refresh");
+                }
             }
         }
 

diff --git a/...oject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs b/...oject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/TitleInternalDataEditor.cs
@@ -73,6 +73,7 @@ void HandleFocusTrap()
                 else if((Event.current.keyCode == KeyCode.Escape))
                 {
                     Close();
+                    GUI.FocusControl("refresh");
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ void HandleFocusTrap() @@
                     else if((Event.current.keyCode == KeyCode.Escape))
                     {
                         Close();
+                        GUI.FocusControl("refresh");
                     }
                 }
             }
@@ Expand Down @@
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.203.241014"; } }
		namespace PlayFab.PfEditor { public static partial class PlayFabEditorHelper { public static string EDEX_VERSION = "2.204.241025"; } }