Skip to content

Commit

Permalink
https://docs.microsoft.com/en-us/gaming/playfab/release-notes/#240315
Browse files Browse the repository at this point in the history
  • Loading branch information
PlayFab SDK Team authored and PlayFab SDK Team committed Mar 18, 2024
2 parents 42831a0 + 9b6cf0b commit 931e165
Show file tree
Hide file tree
Showing 37 changed files with 538 additions and 54 deletions.
4 changes: 2 additions & 2 deletions ExampleMacProject/Assets/PlayFabEditorExtensions/Editor/PlayFabEditor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,13 @@ private void StateUpdateHandler(EdExStates state, string status, string json)
// clear blocking requests
ProgressBar.UpdateState(ProgressBar.ProgressBarStates.error);
ClearBlockingRequest();
Debug.LogError(string.Format("<color=white>PlayFab EditorExtensions: Caught an error:</color>{0}", status));
Debug.LogError(string.Format("PlayFab EditorExtensions: Caught an error:{0}", status));
break;

case EdExStates.OnWarning:
ProgressBar.UpdateState(ProgressBar.ProgressBarStates.warning);
ClearBlockingRequest();
Debug.LogWarning(string.Format("<color=white>PlayFab EditorExtensions:</color>{0}", status ));
Debug.LogWarning(string.Format("PlayFab EditorExtensions: {0}", status));
break;

case EdExStates.OnSuccess:
Expand Down
72 changes: 66 additions & 6 deletions ...leMacProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Components/SubMenuComponent.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class SubMenuComponent : UnityEditor.Editor
{

Dictionary<string, MenuItemContainer> items = new Dictionary<string, MenuItemContainer>();

GUIStyle selectedStyle;
GUIStyle defaultStyle;
GUIStyle bgStyle;
Expand Down Expand Up @@ -43,28 +44,80 @@ public static void InputSubMenuStudiosHandler()
{
case 0:
GUI.FocusControl("API");
focusIndex = 2;
focusIndex = 1;
break;
case 1:
GUI.FocusControl("studios");
focusIndex = 2;
break;
case 2:
GUI.FocusControl("project");
focusIndex = 0;
break;
case 2:
GUI.FocusControl("studios");
}
}
else if (e.keyCode == KeyCode.UpArrow)
{
GUI.FocusControl("settings");
PlayFabEditorMenu.OnSdKsClicked();
}
else if (e.keyCode == KeyCode.DownArrow)
{
GUI.FocusControl("project");
PlayFabEditorMenu.OnSettingsClicked();
}
}
}
public static void InputDataMenuHandler()
{
var e = Event.current;
if (e.type == EventType.KeyUp)
{
if (e.keyCode == KeyCode.RightArrow)
{
switch (focusIndex)
{
case 0:
GUI.FocusControl("title");
focusIndex = 1;
break;
case 1:
GUI.FocusControl("internal");
focusIndex = 0;
break;
}
}
else if (e.keyCode == KeyCode.LeftArrow)
{
switch (focusIndex)
{
case 0:
GUI.FocusControl("title");
focusIndex = 1;
break;
case 1:
GUI.FocusControl("internal");
focusIndex = 0;
break;
}
}
else if (e.keyCode == KeyCode.UpArrow)
{
GUI.FocusControl("sdk");
PlayFabEditorMenu.OnSdKsClicked();
}
else if (e.keyCode == KeyCode.DownArrow)
{
GUI.FocusControl("title");
}
}
}

public void DrawMenu()
{
InputSubMenuStudiosHandler();
selectedStyle = selectedStyle ?? PlayFabEditorHelper.uiStyle.GetStyle("textButton_selected");
defaultStyle = defaultStyle ?? PlayFabEditorHelper.uiStyle.GetStyle("textButton");
bgStyle = bgStyle ?? PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1");

using (new UnityHorizontal(bgStyle, GUILayout.ExpandWidth(true)))
{
foreach (var item in items)
Expand All @@ -77,13 +130,21 @@ public void DrawMenu()
{
case "PROJECT":
GUI.SetNextControlName("project");
InputSubMenuStudiosHandler();
break;
case "STUDIOS":
GUI.SetNextControlName("studios");
break;
case "API":
GUI.SetNextControlName("API");
break;
case "TITLE":
InputDataMenuHandler();
GUI.SetNextControlName("title");
break;
case "INTERNAL":
GUI.SetNextControlName("internal");
break;
}
if (GUILayout.Button(item.Value.displayName, styleToUse, GUILayout.Width(size.x + 1)))
{
Expand All @@ -105,7 +166,6 @@ public void RegisterMenuItem(string n, System.Action m)
items.Add(n, new MenuItemContainer() { displayName = n, method = m, isSelected = selectState });
}
}

private void OnMenuItemClicked(string key)
{
if (!items.ContainsKey(key))
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.189.240301"; } }
namespace PlayFab.PfEditor { public static partial class PlayFabEditorHelper { public static string EDEX_VERSION = "2.190.240315"; } }
16 changes: 8 additions & 8 deletions ExampleMacProject/Assets/PlayFabEditorExtensions/Editor/UI/PlayFabStyles.guiskin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ MonoBehaviour:
m_ScaledBackgrounds: []
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_Hover:
m_Background: {fileID: 2800000, guid: 5f32aedbadeff4790a54248a66f0b89d, type: 3}
m_Background: {fileID: 2800000, guid: c4d407ba6647ef243a229b29b14aa546, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Active:
m_Background: {fileID: 2800000, guid: 2e064f0948b52496983fa0597fa61a0a, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 1, g: 0.427451, b: 0.12941177, a: 1}
m_Focused:
m_Background: {fileID: 2800000, guid: 61f4c4ef58cc05945b35ff9c916beded, type: 3}
m_Background: {fileID: 2800000, guid: c4d407ba6647ef243a229b29b14aa546, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_OnNormal:
Expand Down Expand Up @@ -162,19 +162,19 @@ MonoBehaviour:
m_ScaledBackgrounds: []
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Focused:
m_Background: {fileID: 2800000, guid: d8499cae272132c46b235ac4a04742bb, type: 3}
m_Background: {fileID: 2800000, guid: 692521e232889a3438276d4b965553ca, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 0, g: 0, b: 0, a: 1}
m_OnNormal:
m_Background: {fileID: 2800000, guid: a2f13c216f2649d49b892cade7f4e5f0, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 0.8901961, g: 0.8901961, b: 0.8901961, a: 1}
m_OnHover:
m_Background: {fileID: 2800000, guid: 13b7213bfaf5dc540bdb24634df99864, type: 3}
m_Background: {fileID: 2800000, guid: a777bdcf45e9c6849983499fa9f550cd, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_OnActive:
m_Background: {fileID: 2800000, guid: a2f13c216f2649d49b892cade7f4e5f0, type: 3}
m_Background: {fileID: 2800000, guid: a777bdcf45e9c6849983499fa9f550cd, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_OnFocused:
Expand Down Expand Up @@ -1426,9 +1426,9 @@ MonoBehaviour:
m_ScaledBackgrounds: []
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Hover:
m_Background: {fileID: 2800000, guid: 61f4c4ef58cc05945b35ff9c916beded, type: 3}
m_Background: {fileID: 2800000, guid: c4d407ba6647ef243a229b29b14aa546, type: 3}
m_ScaledBackgrounds: []
m_TextColor: {r: 0.09411765, g: 0.7058824, b: 0.7607843, a: 1}
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
m_Active:
m_Background: {fileID: 2800000, guid: d03222342209e43daaf2ca8d1364e47a, type: 3}
m_ScaledBackgrounds: []
Expand Down
14 changes: 14 additions & 0 deletions ExampleMacProject/Assets/PlayFabSDK/Admin/PlayFabAdminModels.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,10 @@ public class BanInfo : PlayFabBaseModel
/// </summary>
public DateTime? Expires;
/// <summary>
/// Whether or not the Microsoft family members are included in the ban.
/// </summary>
public bool? IncludeMicrosoftFamily;
/// <summary>
/// The IP address on which the ban was applied. May affect multiple players.
/// </summary>
public string IPAddress;
Expand Down Expand Up @@ -459,6 +463,10 @@ public class BanRequest : PlayFabBaseModel
/// </summary>
public uint? DurationInHours;
/// <summary>
/// Whether the Microsoft family members should be included in the ban. May affect multiple players.
/// </summary>
public bool? IncludeMicrosoftFamily;
/// <summary>
/// IP address to be banned. May affect multiple players.
/// </summary>
public string IPAddress;
Expand Down Expand Up @@ -2617,6 +2625,8 @@ public enum GenericErrorCodes
LeaderboardNameConflict,
LinkedStatisticColumnMismatch,
NoLinkedStatisticToLeaderboard,
StatDefinitionAlreadyLinkedToLeaderboard,
LinkingStatsNotAllowedForEntityType,
MatchmakingEntityInvalid,
MatchmakingPlayerAttributesInvalid,
MatchmakingQueueNotFound,
Expand Down Expand Up @@ -6656,6 +6666,10 @@ public class UpdateBanRequest : PlayFabBaseModel
/// </summary>
public DateTime? Expires;
/// <summary>
/// The updated decision to ban the Microsoft family members to be updated. Null for no change.
/// </summary>
public bool? IncludeMicrosoftFamily;
/// <summary>
/// The updated IP address for the ban. Null for no change.
/// </summary>
public string IPAddress;
Expand Down
4 changes: 1 addition & 3 deletions ExampleMacProject/Assets/PlayFabSDK/Economy/PlayFabEconomyAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,9 +593,7 @@ public static void TakedownItemReviews(TakedownItemReviewsRequest request, Actio
/// <summary>
/// Transfer inventory items. When transferring across collections, a 202 response indicates that the transfer did not
/// complete within the timeframe of the request. You can identify the pending operations by looking for OperationStatus =
/// 'InProgress'. You can check on the operation status at anytime within 30 days of the request by passing the
/// TransactionToken to the GetInventoryOperationStatus API. More information about item transfer scenarios can be found
/// here:
/// 'InProgress'. More information about item transfer scenarios can be found here:
/// https://learn.microsoft.com/en-us/gaming/playfab/features/economy-v2/inventory/?tabs=inventory-game-manager#transfer-inventory-items
/// </summary>
public static void TransferInventoryItems(TransferInventoryItemsRequest request, Action<TransferInventoryItemsResponse> resultCallback, Action<PlayFabError> errorCallback, object customData = null, Dictionary<string, string> extraHeaders = null)
Expand Down
4 changes: 1 addition & 3 deletions ExampleMacProject/Assets/PlayFabSDK/Economy/PlayFabEconomyInstanceAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,7 @@ public void TakedownItemReviews(TakedownItemReviewsRequest request, Action<Taked
/// <summary>
/// Transfer inventory items. When transferring across collections, a 202 response indicates that the transfer did not
/// complete within the timeframe of the request. You can identify the pending operations by looking for OperationStatus =
/// 'InProgress'. You can check on the operation status at anytime within 30 days of the request by passing the
/// TransactionToken to the GetInventoryOperationStatus API. More information about item transfer scenarios can be found
/// here:
/// 'InProgress'. More information about item transfer scenarios can be found here:
/// https://learn.microsoft.com/en-us/gaming/playfab/features/economy-v2/inventory/?tabs=inventory-game-manager#transfer-inventory-items
/// </summary>
public void TransferInventoryItems(TransferInventoryItemsRequest request, Action<TransferInventoryItemsResponse> resultCallback, Action<PlayFabError> errorCallback, object customData = null, Dictionary<string, string> extraHeaders = null)
Expand Down
19 changes: 19 additions & 0 deletions ExampleMacProject/Assets/PlayFabSDK/Economy/PlayFabEconomyModels.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,11 @@ public class GetTransactionHistoryRequest : PlayFabRequestCommon
/// and (apiname eq 'AddInventoryItems')". By default, a 6 month timespan from the current date is used.
/// </summary>
public string Filter;
/// <summary>
/// An OData orderby to order TransactionHistory results. The only supported values are 'timestamp asc' or 'timestamp desc'.
/// Default orderby is 'timestamp asc'
/// </summary>
public string OrderBy;
}

[Serializable]
Expand Down Expand Up @@ -1780,6 +1785,16 @@ public class PayoutDetails : PlayFabBaseModel
{
}

[Serializable]
public class Permissions : PlayFabBaseModel
{
/// <summary>
/// The list of ids of Segments that the a player can be in to purchase from the store. When a value is provided, the player
/// must be in at least one of the segments listed for the purchase to be allowed.
/// </summary>
public List<string> SegmentIds;
}

/// <summary>
/// The call kicks off a workflow to publish the item to the public catalog. The Publish Status API should be used to
/// monitor the publish job.
Expand Down Expand Up @@ -2583,6 +2598,10 @@ public class StoreDetails : PlayFabBaseModel
/// </summary>
public FilterOptions FilterOptions;
/// <summary>
/// The permissions that control which players can purchase from the store.
/// </summary>
public Permissions Permissions;
/// <summary>
/// The global prices utilized in the store. These options are mutually exclusive with price options in item references.
/// </summary>
public CatalogPriceOptionsOverride PriceOptionsOverride;
Expand Down
14 changes: 14 additions & 0 deletions ExampleMacProject/Assets/PlayFabSDK/Server/PlayFabServerModels.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ public class BanInfo : PlayFabBaseModel
/// </summary>
public DateTime? Expires;
/// <summary>
/// Whether or not the Microsoft family members are included in the ban.
/// </summary>
public bool? IncludeMicrosoftFamily;
/// <summary>
/// The IP address on which the ban was applied. May affect multiple players.
/// </summary>
public string IPAddress;
Expand All @@ -297,6 +301,10 @@ public class BanRequest : PlayFabBaseModel
/// </summary>
public uint? DurationInHours;
/// <summary>
/// Whether the Microsoft family members should be included in the ban. May affect multiple players.
/// </summary>
public bool? IncludeMicrosoftFamily;
/// <summary>
/// IP address to be banned. May affect multiple players.
/// </summary>
public string IPAddress;
Expand Down Expand Up @@ -1985,6 +1993,8 @@ public enum GenericErrorCodes
LeaderboardNameConflict,
LinkedStatisticColumnMismatch,
NoLinkedStatisticToLeaderboard,
StatDefinitionAlreadyLinkedToLeaderboard,
LinkingStatsNotAllowedForEntityType,
MatchmakingEntityInvalid,
MatchmakingPlayerAttributesInvalid,
MatchmakingQueueNotFound,
Expand Down Expand Up @@ -6315,6 +6325,10 @@ public class UpdateBanRequest : PlayFabBaseModel
/// </summary>
public DateTime? Expires;
/// <summary>
/// The updated decision to ban the Microsoft family members to be updated. Null for no change.
/// </summary>
public bool? IncludeMicrosoftFamily;
/// <summary>
/// The updated IP address for the ban. Null for no change.
/// </summary>
public string IPAddress;
Expand Down
2 changes: 2 additions & 0 deletions ExampleMacProject/Assets/PlayFabSDK/Shared/Internal/PlayFabErrors.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,8 @@ public enum PlayFabErrorCode
LeaderboardNameConflict = 1569,
LinkedStatisticColumnMismatch = 1570,
NoLinkedStatisticToLeaderboard = 1571,
StatDefinitionAlreadyLinkedToLeaderboard = 1572,
LinkingStatsNotAllowedForEntityType = 1573,
MatchmakingEntityInvalid = 2001,
MatchmakingPlayerAttributesInvalid = 2002,
MatchmakingQueueNotFound = 2016,
Expand Down
Loading

0 comments on commit 931e165

Please sign in to comment.