Skip to content

Commit

Permalink
Merge pull request #57 from PlayFab/master
Browse files Browse the repository at this point in the history 
Weekly Versioning PR: 160307
  • Loading branch information
@zac-playfab
zac-playfab committed Mar 7, 2016
2 parents 0fb591e + c1d1cba commit 14b39e5
Show file tree
Hide file tree
Showing 20 changed files with 598 additions and 2,403 deletions.
592 changes: 61 additions & 531 deletions AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java
View file

Large diffs are not rendered by default.

211 changes: 55 additions & 156 deletions AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,27 +432,6 @@ public static class ConsumeItemResult {

}

public static class ConsumePSNEntitlementsRequest {
/**
* Which catalog to match granted entitlements against. If null, defaults to title default catalog
*/
public String CatalogVersion;
/**
* Id of the PSN service label to consume entitlements from
*/
public Integer ServiceLabel;

}

public static class ConsumePSNEntitlementsResult {
/**
* Array of items granted to the player as a result of consuming entitlements.
*/
@Unordered("ItemInstanceId")
public ArrayList<ItemInstance> ItemsGranted;

}

public static class CreateSharedGroupRequest {
/**
* Unique identifier for the shared group (a random identifier will be assigned, if one is not specified).
Expand Down Expand Up @@ -1242,9 +1221,13 @@ public static class GetPhotonAuthenticationTokenResult {

public static class GetPlayerStatisticsRequest {
/**
* statistics to return
* statistics to return (current version will be returned for each)
*/
public ArrayList<String> StatisticNames;
/**
* statistics to return, if StatisticNames is not set (only statistics which have a version matching that provided will be returned)
*/
public ArrayList<StatisticNameVersion> StatisticNameVersions;

}

Expand All @@ -1256,6 +1239,22 @@ public static class GetPlayerStatisticsResult {

}

public static class GetPlayerStatisticVersionsRequest {
/**
* unique name of the statistic
*/
public String StatisticName;

}

public static class GetPlayerStatisticVersionsResult {
/**
* version change history of the statistic
*/
public ArrayList<PlayerStatisticVersion> StatisticVersions;

}

public static class GetPlayerTradesRequest {
/**
* Returns only trades with the given status. If null, returns all trades.
Expand Down Expand Up @@ -1340,26 +1339,6 @@ public static class GetPlayFabIDsFromKongregateIDsResult {

}

public static class GetPlayFabIDsFromPSNAccountIDsRequest {
/**
* Array of unique PlayStation Network identifiers for which the title needs to get PlayFab identifiers.
*/
public ArrayList<String> PSNAccountIDs;
/**
* Id of the PSN issuer environment. If null, defaults to 256 (production)
*/
public Integer IssuerId;

}

public static class GetPlayFabIDsFromPSNAccountIDsResult {
/**
* Mapping of PlayStation Network identifiers to PlayFab identifiers.
*/
public ArrayList<PSNAccountPlayFabIdPair> Data;

}

public static class GetPlayFabIDsFromSteamIDsRequest {
/**
* Deprecated: Please use SteamStringIDs
Expand Down Expand Up @@ -1939,26 +1918,6 @@ public static class LinkKongregateAccountResult {

}

public static class LinkPSNAccountRequest {
/**
* Authentication code provided by the PlayStation Network.
*/
public String AuthCode;
/**
* Redirect URI supplied to PSN when requesting an auth code
*/
public String RedirectUri;
/**
* Id of the PSN issuer environment. If null, defaults to 256 (production)
*/
public Integer IssuerId;

}

public static class LinkPSNAccountResult {

}

public static class LinkSteamAccountRequest {
/**
* Authentication token for the user, returned as a byte array from Steam, and converted to a string (for example, the byte 0x08 should become "08").
Expand All @@ -1971,18 +1930,6 @@ public static class LinkSteamAccountResult {

}

public static class LinkXboxAccountRequest {
/**
* Token provided by the Xbox Live SDK/XDK method GetTokenAndSignatureAsync("POST", "https://playfabapi.com", "").
*/
public String XboxToken;

}

public static class LinkXboxAccountResult {

}

public static class ListUsersCharactersRequest {
/**
* Unique PlayFab assigned ID of the user on whom the operation will be performed.
Expand Down Expand Up @@ -2215,30 +2162,6 @@ public static class LoginWithPlayFabRequest {

}

public static class LoginWithPSNRequest {
/**
* Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
*/
public String TitleId;
/**
* Auth code provided by the PSN OAuth provider.
*/
public String AuthCode;
/**
* Redirect URI supplied to PSN when requesting an auth code
*/
public String RedirectUri;
/**
* Id of the PSN issuer environment. If null, defaults to 256 (production)
*/
public Integer IssuerId;
/**
* Automatically create a PlayFab account if one is not currently linked to this PSN account.
*/
public Boolean CreateAccount;

}

public static class LoginWithSteamRequest {
/**
* Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
Expand All @@ -2255,22 +2178,6 @@ public static class LoginWithSteamRequest {

}

public static class LoginWithXboxRequest {
/**
* Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
*/
public String TitleId;
/**
* Token provided by the Xbox Live SDK/XDK method GetTokenAndSignatureAsync("POST", "https://playfabapi.com", "").
*/
public String XboxToken;
/**
* Automatically create a PlayFab account if one is not currently linked to this Xbox Live account.
*/
public Boolean CreateAccount;

}

public static class MatchmakeRequest {
/**
* build version to match against [Note: Required if LobbyId is not specified]
Expand Down Expand Up @@ -2485,15 +2392,31 @@ public static class PlayerLeaderboardEntry {

}

public static class PSNAccountPlayFabIdPair {
public static class PlayerStatisticVersion {
/**
* Unique PlayStation Network identifier for a user.
* name of the statistic when the version became active
*/
public String PSNAccountId;
public String StatisticName;
/**
* Unique PlayFab identifier for a user, or null if no PlayFab account is linked to the PlayStation Network identifier.
* version of the statistic
*/
public String PlayFabId;
public Long Version;
/**
* time at which the statistic version was scheduled to become active, based on the configured ResetInterval
*/
public Date ScheduledActivationTime;
/**
* time when the statistic version became active
*/
public Date ActivationTime;
/**
* time at which the statistic version was scheduled to become inactive, based on the configured ResetInterval
*/
public Date ScheduledDeactivationTime;
/**
* time when the statistic version became inactive due to statistic version incrementing
*/
public Date DeactivationTime;

}

Expand Down Expand Up @@ -2553,22 +2476,6 @@ public static class RedeemCouponResult {

}

public static class RefreshPSNAuthTokenRequest {
/**
* Auth code returned by PSN OAuth system.
*/
public String AuthCode;
/**
* Redirect URI supplied to PSN when requesting an auth code
*/
public String RedirectUri;
/**
* Id of the PSN issuer environment. If null, defaults to 256 (production)
*/
public Integer IssuerId;

}

public static enum Region {
USCentral,
USEast,
Expand Down Expand Up @@ -2931,6 +2838,18 @@ public static class StartPurchaseResult {

}

public static class StatisticNameVersion {
/**
* unique name of the statistic
*/
public String StatisticName;
/**
* the version of the statistic to be returned
*/
public Long Version;

}

public static class StatisticUpdate {
/**
* unique name of the statistic
Expand Down Expand Up @@ -2959,7 +2878,7 @@ public static class StatisticValue {
/**
* for updates to an existing statistic value for a player, the version of the statistic when it was loaded
*/
public String Version;
public Long Version;

}

Expand Down Expand Up @@ -3200,14 +3119,6 @@ public static class UnlinkKongregateAccountResult {

}

public static class UnlinkPSNAccountRequest {

}

public static class UnlinkPSNAccountResult {

}

public static class UnlinkSteamAccountRequest {

}
Expand All @@ -3216,18 +3127,6 @@ public static class UnlinkSteamAccountResult {

}

public static class UnlinkXboxAccountRequest {
/**
* Token provided by the Xbox Live SDK/XDK method GetTokenAndSignatureAsync("POST", "https://playfabapi.com", "").
*/
public String XboxToken;

}

public static class UnlinkXboxAccountResult {

}

public static class UnlockContainerInstanceRequest {
/**
* Unique PlayFab assigned ID for a specific character owned by a user
Expand Down
3 changes: 2 additions & 1 deletion AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@ public static enum PlayFabErrorCode {
StatisticVersionAlreadyIncrementedForScheduledInterval(1202),
StatisticCountLimitExceeded(1203),
StatisticVersionIncrementRateExceeded(1204),
ContainerKeyInvalid(1205);
ContainerKeyInvalid(1205),
CloudScriptExecutionTimeLimitExceeded(1206);

public int id;

Expand Down
2 changes: 1 addition & 1 deletion AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.playfab.internal;

public class PlayFabVersion {
public static String SdkRevision = "0.18.160222";
public static String SdkRevision = "0.19.160307";
public static String getVersionString() {
return "JavaSDK-" + SdkRevision;
}
Expand Down
Loading

0 comments on commit 14b39e5

Please sign in to comment.