Skip to content

Commit 28d7082

Browse files
author
Paul Gilmore
authored
* Automated pf-main build from Jenkins * PlayFab/SDKGenerator@a549733 * Automated pf-main build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@5789b15 * Automated build from Jenkins * PlayFab/SDKGenerator@d4bf0dd * Automated build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@9c61ecd * PlayFab/SDKGenerator@db13b86 * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@81e550e * Automated build from Jenkins * Hotfix the unitypackage (PlayFab#143) (PlayFab#144) * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@a549733 * Automated pf-main build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@5789b15 * Automated build from Jenkins * PlayFab/SDKGenerator@d4bf0dd * Automated build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@9c61ecd * PlayFab/SDKGenerator@db13b86 * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@81e550e * Automated build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@19cb954 * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@9e3bef8 * Automated pf-main build from Jenkins * Automated build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@80f10a6 * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@d450ad2 * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * Automated pf-main build from Jenkins * PlayFab/SDKGenerator@f64b368 * Automated build from Jenkins * Automated build from Jenkins * Automated pf-main build from Jenkins
1 parent 02a2d0d commit 28d7082

File tree

15 files changed

+93
-50
lines changed

15 files changed

+93
-50
lines changed

‎PlayFabClientSDK.unitypackage

79 Bytes
Binary file not shown.

‎PlayFabClientSample/Assets/PlayFabSDK/Internal/SingletonMonoBehaviour.cs

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static void CreateInstance()
2626
{
2727
//create new instance
2828
GameObject go = new GameObject(typeof(T).Name);
29+
go.hideFlags = HideFlags.HideAndDontSave;
2930
_instance = go.AddComponent<T>();
3031
}
3132
//initialize instance if necessary

‎PlayFabClientSample/Assets/PlayFabSDK/Public/PlayFabClientAPI.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ public static void GetPlayFabIDsFromSteamIDs(GetPlayFabIDsFromSteamIDsRequest re
656656
}
657657

658658
/// <summary>
659-
/// Retrieves the unique PlayFab identifiers for the given set of Twitch identifiers. The Twitch identifiers are the IDs for the user accounts, available as "_id" from the Twitch API methods(ex: https://github.com/justintv/Twitch-API/blob/master/v3_resources/users.md#get-usersuser).
659+
/// Retrieves the unique PlayFab identifiers for the given set of Twitch identifiers. The Twitch identifiers are the IDs for the user accounts, available as "_id" from the Twitch API methods (ex: https://github.com/justintv/Twitch-API/blob/master/v3_resources/users.md#get-usersuser).
660660
/// </summary>
661661
public static void GetPlayFabIDsFromTwitchIDs(GetPlayFabIDsFromTwitchIDsRequest request, PlayFabResultCommon.ProcessApiCallback<GetPlayFabIDsFromTwitchIDsResult> resultCallback, ErrorCallback errorCallback, object customData = null)
662662
{
@@ -806,7 +806,7 @@ public static void LinkSteamAccount(LinkSteamAccountRequest request, PlayFabResu
806806
}
807807

808808
/// <summary>
809-
/// Links the Twitch account associated with the token to the user's PlayFab account
809+
/// Links the Twitch account associated with the token to the user's PlayFab account.
810810
/// </summary>
811811
public static void LinkTwitch(LinkTwitchAccountRequest request, PlayFabResultCommon.ProcessApiCallback<LinkTwitchAccountResult> resultCallback, ErrorCallback errorCallback, object customData = null)
812812
{
@@ -970,7 +970,7 @@ public static void UnlinkSteamAccount(UnlinkSteamAccountRequest request, PlayFab
970970
}
971971

972972
/// <summary>
973-
/// Unlinks the related Twitch account from the user's PlayFab account
973+
/// Unlinks the related Twitch account from the user's PlayFab account.
974974
/// </summary>
975975
public static void UnlinkTwitch(UnlinkTwitchAccountRequest request, PlayFabResultCommon.ProcessApiCallback<UnlinkTwitchAccountResult> resultCallback, ErrorCallback errorCallback, object customData = null)
976976
{

‎PlayFabClientSample/Assets/PlayFabSDK/Public/PlayFabClientModels.cs

+14-14
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ public class GameServerRegionsRequest
964964
public string BuildVersion { get; set;}
965965

966966
/// <summary>
967-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
967+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
968968
/// </summary>
969969
public string TitleId { get; set;}
970970
}
@@ -2577,7 +2577,7 @@ public class LoginWithAndroidDeviceIDRequest
25772577
{
25782578

25792579
/// <summary>
2580-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2580+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
25812581
/// </summary>
25822582
public string TitleId { get; set;}
25832583

@@ -2611,7 +2611,7 @@ public class LoginWithCustomIDRequest
26112611
{
26122612

26132613
/// <summary>
2614-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2614+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
26152615
/// </summary>
26162616
public string TitleId { get; set;}
26172617

@@ -2635,7 +2635,7 @@ public class LoginWithEmailAddressRequest
26352635
{
26362636

26372637
/// <summary>
2638-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2638+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
26392639
/// </summary>
26402640
public string TitleId { get; set;}
26412641

@@ -2659,7 +2659,7 @@ public class LoginWithFacebookRequest
26592659
{
26602660

26612661
/// <summary>
2662-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2662+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
26632663
/// </summary>
26642664
public string TitleId { get; set;}
26652665

@@ -2683,7 +2683,7 @@ public class LoginWithGameCenterRequest
26832683
{
26842684

26852685
/// <summary>
2686-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2686+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
26872687
/// </summary>
26882688
public string TitleId { get; set;}
26892689

@@ -2707,7 +2707,7 @@ public class LoginWithGoogleAccountRequest
27072707
{
27082708

27092709
/// <summary>
2710-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2710+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
27112711
/// </summary>
27122712
public string TitleId { get; set;}
27132713

@@ -2736,7 +2736,7 @@ public class LoginWithIOSDeviceIDRequest
27362736
{
27372737

27382738
/// <summary>
2739-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2739+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
27402740
/// </summary>
27412741
public string TitleId { get; set;}
27422742

@@ -2770,7 +2770,7 @@ public class LoginWithKongregateRequest
27702770
{
27712771

27722772
/// <summary>
2773-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2773+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
27742774
/// </summary>
27752775
public string TitleId { get; set;}
27762776

@@ -2799,7 +2799,7 @@ public class LoginWithPlayFabRequest
27992799
{
28002800

28012801
/// <summary>
2802-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2802+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
28032803
/// </summary>
28042804
public string TitleId { get; set;}
28052805

@@ -2823,7 +2823,7 @@ public class LoginWithSteamRequest
28232823
{
28242824

28252825
/// <summary>
2826-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2826+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
28272827
/// </summary>
28282828
public string TitleId { get; set;}
28292829

@@ -2847,7 +2847,7 @@ public class LoginWithTwitchRequest
28472847
{
28482848

28492849
/// <summary>
2850-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
2850+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
28512851
/// </summary>
28522852
public string TitleId { get; set;}
28532853

@@ -3310,7 +3310,7 @@ public class RegisterPlayFabUserRequest
33103310
{
33113311

33123312
/// <summary>
3313-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
3313+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
33143314
/// </summary>
33153315
public string TitleId { get; set;}
33163316

@@ -3527,7 +3527,7 @@ public class SendAccountRecoveryEmailRequest
35273527
public string Email { get; set;}
35283528

35293529
/// <summary>
3530-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
3530+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
35313531
/// </summary>
35323532
public string TitleId { get; set;}
35333533

‎PlayFabClientSample/Assets/PlayFabSDK/Public/PlayFabSettings.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public enum PlayFabLogLevel
1818

1919
public static class PlayFabSettings
2020
{
21-
public const string SdkVersion = "0.32.160711";
21+
public const string SdkVersion = "0.32.160714";
2222
public const string BuildIdentifier = "jbuild_unitysdk_1";
23-
public const string VersionString = "UnitySDK-0.32.160711";
23+
public const string VersionString = "UnitySDK-0.32.160714";
2424

2525
internal static bool HideCallbackErrors = false; // This should only be used by unit-tests that test deliberately throwing errors
2626
private const string GLOBAL_KEY = "GLOBAL";

‎PlayFabCombinedTestingSample/Assets/PlayFabSDK/Internal/SingletonMonoBehaviour.cs

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static void CreateInstance()
2626
{
2727
//create new instance
2828
GameObject go = new GameObject(typeof(T).Name);
29+
go.hideFlags = HideFlags.HideAndDontSave;
2930
_instance = go.AddComponent<T>();
3031
}
3132
//initialize instance if necessary

‎PlayFabCombinedTestingSample/Assets/PlayFabSDK/Public/PlayFabAdminModels.cs

+14-4
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public class AddServerBuildResult : PlayFabResultCommon
115115
public DateTime Timestamp { get; set;}
116116

117117
/// <summary>
118-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
118+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
119119
/// </summary>
120120
public string TitleId { get; set;}
121121

@@ -573,7 +573,7 @@ public class DeleteUsersRequest
573573
public List<string> PlayFabIds { get; set;}
574574

575575
/// <summary>
576-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
576+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
577577
/// </summary>
578578
public string TitleId { get; set;}
579579
}
@@ -967,7 +967,7 @@ public class GetServerBuildInfoResult : PlayFabResultCommon
967967
public DateTime Timestamp { get; set;}
968968

969969
/// <summary>
970-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
970+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
971971
/// </summary>
972972
public string TitleId { get; set;}
973973

@@ -1272,6 +1272,16 @@ public class ItemGrant
12721272
/// Unique PlayFab assigned ID for a specific character owned by a user
12731273
/// </summary>
12741274
public string CharacterId { get; set;}
1275+
1276+
/// <summary>
1277+
/// Key-value pairs to be written to the custom data. Note that keys are trimmed of whitespace, are limited in size, and may not begin with a '!' character.
1278+
/// </summary>
1279+
public Dictionary<string,string> Data { get; set;}
1280+
1281+
/// <summary>
1282+
/// Optional list of Data-keys to remove from UserData. Some SDKs cannot insert null-values into Data due to language constraints. Use this to delete the keys directly.
1283+
/// </summary>
1284+
public List<string> KeysToRemove { get; set;}
12751285
}
12761286

12771287
/// <summary>
@@ -1521,7 +1531,7 @@ public class ModifyServerBuildResult : PlayFabResultCommon
15211531
public DateTime Timestamp { get; set;}
15221532

15231533
/// <summary>
1524-
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
1534+
/// Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected.
15251535
/// </summary>
15261536
public string TitleId { get; set;}
15271537

‎PlayFabCombinedTestingSample/Assets/PlayFabSDK/Public/PlayFabClientAPI.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ public static void GetPlayFabIDsFromSteamIDs(GetPlayFabIDsFromSteamIDsRequest re
656656
}
657657

658658
/// <summary>
659-
/// Retrieves the unique PlayFab identifiers for the given set of Twitch identifiers. The Twitch identifiers are the IDs for the user accounts, available as "_id" from the Twitch API methods(ex: https://github.com/justintv/Twitch-API/blob/master/v3_resources/users.md#get-usersuser).
659+
/// Retrieves the unique PlayFab identifiers for the given set of Twitch identifiers. The Twitch identifiers are the IDs for the user accounts, available as "_id" from the Twitch API methods (ex: https://github.com/justintv/Twitch-API/blob/master/v3_resources/users.md#get-usersuser).
660660
/// </summary>
661661
public static void GetPlayFabIDsFromTwitchIDs(GetPlayFabIDsFromTwitchIDsRequest request, PlayFabResultCommon.ProcessApiCallback<GetPlayFabIDsFromTwitchIDsResult> resultCallback, ErrorCallback errorCallback, object customData = null)
662662
{
@@ -806,7 +806,7 @@ public static void LinkSteamAccount(LinkSteamAccountRequest request, PlayFabResu
806806
}
807807

808808
/// <summary>
809-
/// Links the Twitch account associated with the token to the user's PlayFab account
809+
/// Links the Twitch account associated with the token to the user's PlayFab account.
810810
/// </summary>
811811
public static void LinkTwitch(LinkTwitchAccountRequest request, PlayFabResultCommon.ProcessApiCallback<LinkTwitchAccountResult> resultCallback, ErrorCallback errorCallback, object customData = null)
812812
{
@@ -970,7 +970,7 @@ public static void UnlinkSteamAccount(UnlinkSteamAccountRequest request, PlayFab
970970
}
971971

972972
/// <summary>
973-
/// Unlinks the related Twitch account from the user's PlayFab account
973+
/// Unlinks the related Twitch account from the user's PlayFab account.
974974
/// </summary>
975975
public static void UnlinkTwitch(UnlinkTwitchAccountRequest request, PlayFabResultCommon.ProcessApiCallback<UnlinkTwitchAccountResult> resultCallback, ErrorCallback errorCallback, object customData = null)
976976
{

0 commit comments

Comments
 (0)