From b8843c7a181987633e7410120ec9d948030b1e58 Mon Sep 17 00:00:00 2001 From: PlayFab SDK Team Date: Tue, 8 Nov 2022 21:10:48 +0000 Subject: [PATCH] https://docs.microsoft.com/en-us/gaming/playfab/release-notes/#221107 --- .../include/playfab/PlayFabClientDataModels.h | 228 +++++++++++++++++- .../playfab/PlayFabMultiplayerDataModels.h | 212 +++++++++++++++- .../include/playfab/PlayFabServerDataModels.h | 213 ++++++++++++++++ code/source/playfab/PlayFabSettings.cpp | 6 +- com.playfab.xplatcppsdk.v141.autopkg | 4 +- com.playfab.xplatcppsdk.v141.nuspec | 4 +- com.playfab.xplatcppsdk.v142.autopkg | 4 +- com.playfab.xplatcppsdk.v142.nuspec | 4 +- com.playfab.xplatxboxsdk.v141.autopkg | 4 +- 9 files changed, 654 insertions(+), 25 deletions(-) diff --git a/code/include/playfab/PlayFabClientDataModels.h b/code/include/playfab/PlayFabClientDataModels.h index 0095c048..eebc68a7 100644 --- a/code/include/playfab/PlayFabClientDataModels.h +++ b/code/include/playfab/PlayFabClientDataModels.h @@ -4814,6 +4814,209 @@ namespace PlayFab } } + enum class ExternalFriendSources + { + ExternalFriendSourcesNone, + ExternalFriendSourcesSteam, + ExternalFriendSourcesFacebook, + ExternalFriendSourcesSteamOrFacebook, + ExternalFriendSourcesXbox, + ExternalFriendSourcesSteamOrXbox, + ExternalFriendSourcesFacebookOrXbox, + ExternalFriendSourcesSteamOrFacebookOrXbox, + ExternalFriendSourcesPsn, + ExternalFriendSourcesSteamOrPsn, + ExternalFriendSourcesFacebookOrPsn, + ExternalFriendSourcesSteamOrFacebookOrPsn, + ExternalFriendSourcesXboxOrPsn, + ExternalFriendSourcesSteamOrXboxOrPsn, + ExternalFriendSourcesFacebookOrXboxOrPsn, + ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn, + ExternalFriendSourcesAll + }; + + inline void ToJsonEnum(const ExternalFriendSources input, Json::Value& output) + { + if (input == ExternalFriendSources::ExternalFriendSourcesNone) + { + output = Json::Value("None"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteam) + { + output = Json::Value("Steam"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebook) + { + output = Json::Value("Facebook"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebook) + { + output = Json::Value("SteamOrFacebook"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesXbox) + { + output = Json::Value("Xbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrXbox) + { + output = Json::Value("SteamOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrXbox) + { + output = Json::Value("FacebookOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXbox) + { + output = Json::Value("SteamOrFacebookOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesPsn) + { + output = Json::Value("Psn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrPsn) + { + output = Json::Value("SteamOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrPsn) + { + output = Json::Value("FacebookOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrPsn) + { + output = Json::Value("SteamOrFacebookOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesXboxOrPsn) + { + output = Json::Value("XboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrXboxOrPsn) + { + output = Json::Value("SteamOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrXboxOrPsn) + { + output = Json::Value("FacebookOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn) + { + output = Json::Value("SteamOrFacebookOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesAll) + { + output = Json::Value("All"); + return; + } + } + inline void FromJsonEnum(const Json::Value& input, ExternalFriendSources& output) + { + if (!input.isString()) + { + return; + } + const std::string& inputStr = input.asString(); + if (inputStr == "None") + { + output = ExternalFriendSources::ExternalFriendSourcesNone; + return; + } + if (inputStr == "Steam") + { + output = ExternalFriendSources::ExternalFriendSourcesSteam; + return; + } + if (inputStr == "Facebook") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebook; + return; + } + if (inputStr == "SteamOrFacebook") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebook; + return; + } + if (inputStr == "Xbox") + { + output = ExternalFriendSources::ExternalFriendSourcesXbox; + return; + } + if (inputStr == "SteamOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrXbox; + return; + } + if (inputStr == "FacebookOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrXbox; + return; + } + if (inputStr == "SteamOrFacebookOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXbox; + return; + } + if (inputStr == "Psn") + { + output = ExternalFriendSources::ExternalFriendSourcesPsn; + return; + } + if (inputStr == "SteamOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrPsn; + return; + } + if (inputStr == "FacebookOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrPsn; + return; + } + if (inputStr == "SteamOrFacebookOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrPsn; + return; + } + if (inputStr == "XboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesXboxOrPsn; + return; + } + if (inputStr == "SteamOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrXboxOrPsn; + return; + } + if (inputStr == "FacebookOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrXboxOrPsn; + return; + } + if (inputStr == "SteamOrFacebookOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn; + return; + } + if (inputStr == "All") + { + output = ExternalFriendSources::ExternalFriendSourcesAll; + return; + } + } + enum class GameInstanceState { GameInstanceStateOpen, @@ -10945,14 +11148,12 @@ namespace PlayFab struct GetCharacterLeaderboardRequest : public PlayFabRequestCommon { - std::string CharacterType; Boxed MaxResultsCount; Int32 StartPosition; std::string StatisticName; GetCharacterLeaderboardRequest() : PlayFabRequestCommon(), - CharacterType(), MaxResultsCount(), StartPosition(), StatisticName() @@ -10960,7 +11161,6 @@ namespace PlayFab GetCharacterLeaderboardRequest(const GetCharacterLeaderboardRequest& src) : PlayFabRequestCommon(), - CharacterType(src.CharacterType), MaxResultsCount(src.MaxResultsCount), StartPosition(src.StartPosition), StatisticName(src.StatisticName) @@ -10970,7 +11170,6 @@ namespace PlayFab void FromJson(const Json::Value& input) override { - FromJsonUtilS(input["CharacterType"], CharacterType); FromJsonUtilP(input["MaxResultsCount"], MaxResultsCount); FromJsonUtilP(input["StartPosition"], StartPosition); FromJsonUtilS(input["StatisticName"], StatisticName); @@ -10979,7 +11178,6 @@ namespace PlayFab Json::Value ToJson() const override { Json::Value output; - Json::Value each_CharacterType; ToJsonUtilS(CharacterType, each_CharacterType); output["CharacterType"] = each_CharacterType; Json::Value each_MaxResultsCount; ToJsonUtilP(MaxResultsCount, each_MaxResultsCount); output["MaxResultsCount"] = each_MaxResultsCount; Json::Value each_StartPosition; ToJsonUtilP(StartPosition, each_StartPosition); output["StartPosition"] = each_StartPosition; Json::Value each_StatisticName; ToJsonUtilS(StatisticName, each_StatisticName); output["StatisticName"] = each_StatisticName; @@ -11254,6 +11452,7 @@ namespace PlayFab struct GetFriendLeaderboardAroundPlayerRequest : public PlayFabRequestCommon { std::map CustomTags; + Boxed ExternalPlatformFriends; Boxed IncludeFacebookFriends; Boxed IncludeSteamFriends; Boxed MaxResultsCount; @@ -11266,6 +11465,7 @@ namespace PlayFab GetFriendLeaderboardAroundPlayerRequest() : PlayFabRequestCommon(), CustomTags(), + ExternalPlatformFriends(), IncludeFacebookFriends(), IncludeSteamFriends(), MaxResultsCount(), @@ -11279,6 +11479,7 @@ namespace PlayFab GetFriendLeaderboardAroundPlayerRequest(const GetFriendLeaderboardAroundPlayerRequest& src) : PlayFabRequestCommon(), CustomTags(src.CustomTags), + ExternalPlatformFriends(src.ExternalPlatformFriends), IncludeFacebookFriends(src.IncludeFacebookFriends), IncludeSteamFriends(src.IncludeSteamFriends), MaxResultsCount(src.MaxResultsCount), @@ -11294,6 +11495,7 @@ namespace PlayFab void FromJson(const Json::Value& input) override { FromJsonUtilS(input["CustomTags"], CustomTags); + FromJsonUtilE(input["ExternalPlatformFriends"], ExternalPlatformFriends); FromJsonUtilP(input["IncludeFacebookFriends"], IncludeFacebookFriends); FromJsonUtilP(input["IncludeSteamFriends"], IncludeSteamFriends); FromJsonUtilP(input["MaxResultsCount"], MaxResultsCount); @@ -11308,6 +11510,7 @@ namespace PlayFab { Json::Value output; Json::Value each_CustomTags; ToJsonUtilS(CustomTags, each_CustomTags); output["CustomTags"] = each_CustomTags; + Json::Value each_ExternalPlatformFriends; ToJsonUtilE(ExternalPlatformFriends, each_ExternalPlatformFriends); output["ExternalPlatformFriends"] = each_ExternalPlatformFriends; Json::Value each_IncludeFacebookFriends; ToJsonUtilP(IncludeFacebookFriends, each_IncludeFacebookFriends); output["IncludeFacebookFriends"] = each_IncludeFacebookFriends; Json::Value each_IncludeSteamFriends; ToJsonUtilP(IncludeSteamFriends, each_IncludeSteamFriends); output["IncludeSteamFriends"] = each_IncludeSteamFriends; Json::Value each_MaxResultsCount; ToJsonUtilP(MaxResultsCount, each_MaxResultsCount); output["MaxResultsCount"] = each_MaxResultsCount; @@ -11411,6 +11614,7 @@ namespace PlayFab struct GetFriendLeaderboardRequest : public PlayFabRequestCommon { std::map CustomTags; + Boxed ExternalPlatformFriends; Boxed IncludeFacebookFriends; Boxed IncludeSteamFriends; Boxed MaxResultsCount; @@ -11423,6 +11627,7 @@ namespace PlayFab GetFriendLeaderboardRequest() : PlayFabRequestCommon(), CustomTags(), + ExternalPlatformFriends(), IncludeFacebookFriends(), IncludeSteamFriends(), MaxResultsCount(), @@ -11436,6 +11641,7 @@ namespace PlayFab GetFriendLeaderboardRequest(const GetFriendLeaderboardRequest& src) : PlayFabRequestCommon(), CustomTags(src.CustomTags), + ExternalPlatformFriends(src.ExternalPlatformFriends), IncludeFacebookFriends(src.IncludeFacebookFriends), IncludeSteamFriends(src.IncludeSteamFriends), MaxResultsCount(src.MaxResultsCount), @@ -11451,6 +11657,7 @@ namespace PlayFab void FromJson(const Json::Value& input) override { FromJsonUtilS(input["CustomTags"], CustomTags); + FromJsonUtilE(input["ExternalPlatformFriends"], ExternalPlatformFriends); FromJsonUtilP(input["IncludeFacebookFriends"], IncludeFacebookFriends); FromJsonUtilP(input["IncludeSteamFriends"], IncludeSteamFriends); FromJsonUtilP(input["MaxResultsCount"], MaxResultsCount); @@ -11465,6 +11672,7 @@ namespace PlayFab { Json::Value output; Json::Value each_CustomTags; ToJsonUtilS(CustomTags, each_CustomTags); output["CustomTags"] = each_CustomTags; + Json::Value each_ExternalPlatformFriends; ToJsonUtilE(ExternalPlatformFriends, each_ExternalPlatformFriends); output["ExternalPlatformFriends"] = each_ExternalPlatformFriends; Json::Value each_IncludeFacebookFriends; ToJsonUtilP(IncludeFacebookFriends, each_IncludeFacebookFriends); output["IncludeFacebookFriends"] = each_IncludeFacebookFriends; Json::Value each_IncludeSteamFriends; ToJsonUtilP(IncludeSteamFriends, each_IncludeSteamFriends); output["IncludeSteamFriends"] = each_IncludeSteamFriends; Json::Value each_MaxResultsCount; ToJsonUtilP(MaxResultsCount, each_MaxResultsCount); output["MaxResultsCount"] = each_MaxResultsCount; @@ -11480,6 +11688,7 @@ namespace PlayFab struct GetFriendsListRequest : public PlayFabRequestCommon { std::map CustomTags; + Boxed ExternalPlatformFriends; Boxed IncludeFacebookFriends; Boxed IncludeSteamFriends; Boxed ProfileConstraints; @@ -11488,6 +11697,7 @@ namespace PlayFab GetFriendsListRequest() : PlayFabRequestCommon(), CustomTags(), + ExternalPlatformFriends(), IncludeFacebookFriends(), IncludeSteamFriends(), ProfileConstraints(), @@ -11497,6 +11707,7 @@ namespace PlayFab GetFriendsListRequest(const GetFriendsListRequest& src) : PlayFabRequestCommon(), CustomTags(src.CustomTags), + ExternalPlatformFriends(src.ExternalPlatformFriends), IncludeFacebookFriends(src.IncludeFacebookFriends), IncludeSteamFriends(src.IncludeSteamFriends), ProfileConstraints(src.ProfileConstraints), @@ -11508,6 +11719,7 @@ namespace PlayFab void FromJson(const Json::Value& input) override { FromJsonUtilS(input["CustomTags"], CustomTags); + FromJsonUtilE(input["ExternalPlatformFriends"], ExternalPlatformFriends); FromJsonUtilP(input["IncludeFacebookFriends"], IncludeFacebookFriends); FromJsonUtilP(input["IncludeSteamFriends"], IncludeSteamFriends); FromJsonUtilO(input["ProfileConstraints"], ProfileConstraints); @@ -11518,6 +11730,7 @@ namespace PlayFab { Json::Value output; Json::Value each_CustomTags; ToJsonUtilS(CustomTags, each_CustomTags); output["CustomTags"] = each_CustomTags; + Json::Value each_ExternalPlatformFriends; ToJsonUtilE(ExternalPlatformFriends, each_ExternalPlatformFriends); output["ExternalPlatformFriends"] = each_ExternalPlatformFriends; Json::Value each_IncludeFacebookFriends; ToJsonUtilP(IncludeFacebookFriends, each_IncludeFacebookFriends); output["IncludeFacebookFriends"] = each_IncludeFacebookFriends; Json::Value each_IncludeSteamFriends; ToJsonUtilP(IncludeSteamFriends, each_IncludeSteamFriends); output["IncludeSteamFriends"] = each_IncludeSteamFriends; Json::Value each_ProfileConstraints; ToJsonUtilO(ProfileConstraints, each_ProfileConstraints); output["ProfileConstraints"] = each_ProfileConstraints; @@ -11558,14 +11771,12 @@ namespace PlayFab struct GetLeaderboardAroundCharacterRequest : public PlayFabRequestCommon { std::string CharacterId; - std::string CharacterType; Boxed MaxResultsCount; std::string StatisticName; GetLeaderboardAroundCharacterRequest() : PlayFabRequestCommon(), CharacterId(), - CharacterType(), MaxResultsCount(), StatisticName() {} @@ -11573,7 +11784,6 @@ namespace PlayFab GetLeaderboardAroundCharacterRequest(const GetLeaderboardAroundCharacterRequest& src) : PlayFabRequestCommon(), CharacterId(src.CharacterId), - CharacterType(src.CharacterType), MaxResultsCount(src.MaxResultsCount), StatisticName(src.StatisticName) {} @@ -11583,7 +11793,6 @@ namespace PlayFab void FromJson(const Json::Value& input) override { FromJsonUtilS(input["CharacterId"], CharacterId); - FromJsonUtilS(input["CharacterType"], CharacterType); FromJsonUtilP(input["MaxResultsCount"], MaxResultsCount); FromJsonUtilS(input["StatisticName"], StatisticName); } @@ -11592,7 +11801,6 @@ namespace PlayFab { Json::Value output; Json::Value each_CharacterId; ToJsonUtilS(CharacterId, each_CharacterId); output["CharacterId"] = each_CharacterId; - Json::Value each_CharacterType; ToJsonUtilS(CharacterType, each_CharacterType); output["CharacterType"] = each_CharacterType; Json::Value each_MaxResultsCount; ToJsonUtilP(MaxResultsCount, each_MaxResultsCount); output["MaxResultsCount"] = each_MaxResultsCount; Json::Value each_StatisticName; ToJsonUtilS(StatisticName, each_StatisticName); output["StatisticName"] = each_StatisticName; return output; diff --git a/code/include/playfab/PlayFabMultiplayerDataModels.h b/code/include/playfab/PlayFabMultiplayerDataModels.h index b8cb879e..f73b4c6c 100644 --- a/code/include/playfab/PlayFabMultiplayerDataModels.h +++ b/code/include/playfab/PlayFabMultiplayerDataModels.h @@ -1382,6 +1382,209 @@ namespace PlayFab } } + enum class ExternalFriendSources + { + ExternalFriendSourcesNone, + ExternalFriendSourcesSteam, + ExternalFriendSourcesFacebook, + ExternalFriendSourcesSteamOrFacebook, + ExternalFriendSourcesXbox, + ExternalFriendSourcesSteamOrXbox, + ExternalFriendSourcesFacebookOrXbox, + ExternalFriendSourcesSteamOrFacebookOrXbox, + ExternalFriendSourcesPsn, + ExternalFriendSourcesSteamOrPsn, + ExternalFriendSourcesFacebookOrPsn, + ExternalFriendSourcesSteamOrFacebookOrPsn, + ExternalFriendSourcesXboxOrPsn, + ExternalFriendSourcesSteamOrXboxOrPsn, + ExternalFriendSourcesFacebookOrXboxOrPsn, + ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn, + ExternalFriendSourcesAll + }; + + inline void ToJsonEnum(const ExternalFriendSources input, Json::Value& output) + { + if (input == ExternalFriendSources::ExternalFriendSourcesNone) + { + output = Json::Value("None"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteam) + { + output = Json::Value("Steam"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebook) + { + output = Json::Value("Facebook"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebook) + { + output = Json::Value("SteamOrFacebook"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesXbox) + { + output = Json::Value("Xbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrXbox) + { + output = Json::Value("SteamOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrXbox) + { + output = Json::Value("FacebookOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXbox) + { + output = Json::Value("SteamOrFacebookOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesPsn) + { + output = Json::Value("Psn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrPsn) + { + output = Json::Value("SteamOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrPsn) + { + output = Json::Value("FacebookOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrPsn) + { + output = Json::Value("SteamOrFacebookOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesXboxOrPsn) + { + output = Json::Value("XboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrXboxOrPsn) + { + output = Json::Value("SteamOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrXboxOrPsn) + { + output = Json::Value("FacebookOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn) + { + output = Json::Value("SteamOrFacebookOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesAll) + { + output = Json::Value("All"); + return; + } + } + inline void FromJsonEnum(const Json::Value& input, ExternalFriendSources& output) + { + if (!input.isString()) + { + return; + } + const std::string& inputStr = input.asString(); + if (inputStr == "None") + { + output = ExternalFriendSources::ExternalFriendSourcesNone; + return; + } + if (inputStr == "Steam") + { + output = ExternalFriendSources::ExternalFriendSourcesSteam; + return; + } + if (inputStr == "Facebook") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebook; + return; + } + if (inputStr == "SteamOrFacebook") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebook; + return; + } + if (inputStr == "Xbox") + { + output = ExternalFriendSources::ExternalFriendSourcesXbox; + return; + } + if (inputStr == "SteamOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrXbox; + return; + } + if (inputStr == "FacebookOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrXbox; + return; + } + if (inputStr == "SteamOrFacebookOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXbox; + return; + } + if (inputStr == "Psn") + { + output = ExternalFriendSources::ExternalFriendSourcesPsn; + return; + } + if (inputStr == "SteamOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrPsn; + return; + } + if (inputStr == "FacebookOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrPsn; + return; + } + if (inputStr == "SteamOrFacebookOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrPsn; + return; + } + if (inputStr == "XboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesXboxOrPsn; + return; + } + if (inputStr == "SteamOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrXboxOrPsn; + return; + } + if (inputStr == "FacebookOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrXboxOrPsn; + return; + } + if (inputStr == "SteamOrFacebookOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn; + return; + } + if (inputStr == "All") + { + output = ExternalFriendSources::ExternalFriendSourcesAll; + return; + } + } + enum class MembershipLock { MembershipLockUnlocked, @@ -4932,8 +5135,9 @@ namespace PlayFab struct FindFriendLobbiesRequest : public PlayFabRequestCommon { std::map CustomTags; - bool ExcludeFacebookFriends; - bool ExcludeSteamFriends; + Boxed ExcludeFacebookFriends; + Boxed ExcludeSteamFriends; + Boxed ExternalPlatformFriends; std::string Filter; std::string OrderBy; Boxed Pagination; @@ -4944,6 +5148,7 @@ namespace PlayFab CustomTags(), ExcludeFacebookFriends(), ExcludeSteamFriends(), + ExternalPlatformFriends(), Filter(), OrderBy(), Pagination(), @@ -4955,6 +5160,7 @@ namespace PlayFab CustomTags(src.CustomTags), ExcludeFacebookFriends(src.ExcludeFacebookFriends), ExcludeSteamFriends(src.ExcludeSteamFriends), + ExternalPlatformFriends(src.ExternalPlatformFriends), Filter(src.Filter), OrderBy(src.OrderBy), Pagination(src.Pagination), @@ -4968,6 +5174,7 @@ namespace PlayFab FromJsonUtilS(input["CustomTags"], CustomTags); FromJsonUtilP(input["ExcludeFacebookFriends"], ExcludeFacebookFriends); FromJsonUtilP(input["ExcludeSteamFriends"], ExcludeSteamFriends); + FromJsonUtilE(input["ExternalPlatformFriends"], ExternalPlatformFriends); FromJsonUtilS(input["Filter"], Filter); FromJsonUtilS(input["OrderBy"], OrderBy); FromJsonUtilO(input["Pagination"], Pagination); @@ -4980,6 +5187,7 @@ namespace PlayFab Json::Value each_CustomTags; ToJsonUtilS(CustomTags, each_CustomTags); output["CustomTags"] = each_CustomTags; Json::Value each_ExcludeFacebookFriends; ToJsonUtilP(ExcludeFacebookFriends, each_ExcludeFacebookFriends); output["ExcludeFacebookFriends"] = each_ExcludeFacebookFriends; Json::Value each_ExcludeSteamFriends; ToJsonUtilP(ExcludeSteamFriends, each_ExcludeSteamFriends); output["ExcludeSteamFriends"] = each_ExcludeSteamFriends; + Json::Value each_ExternalPlatformFriends; ToJsonUtilE(ExternalPlatformFriends, each_ExternalPlatformFriends); output["ExternalPlatformFriends"] = each_ExternalPlatformFriends; Json::Value each_Filter; ToJsonUtilS(Filter, each_Filter); output["Filter"] = each_Filter; Json::Value each_OrderBy; ToJsonUtilS(OrderBy, each_OrderBy); output["OrderBy"] = each_OrderBy; Json::Value each_Pagination; ToJsonUtilO(Pagination, each_Pagination); output["Pagination"] = each_Pagination; diff --git a/code/include/playfab/PlayFabServerDataModels.h b/code/include/playfab/PlayFabServerDataModels.h index a7d5d9c0..00091e7c 100644 --- a/code/include/playfab/PlayFabServerDataModels.h +++ b/code/include/playfab/PlayFabServerDataModels.h @@ -4754,6 +4754,209 @@ namespace PlayFab } } + enum class ExternalFriendSources + { + ExternalFriendSourcesNone, + ExternalFriendSourcesSteam, + ExternalFriendSourcesFacebook, + ExternalFriendSourcesSteamOrFacebook, + ExternalFriendSourcesXbox, + ExternalFriendSourcesSteamOrXbox, + ExternalFriendSourcesFacebookOrXbox, + ExternalFriendSourcesSteamOrFacebookOrXbox, + ExternalFriendSourcesPsn, + ExternalFriendSourcesSteamOrPsn, + ExternalFriendSourcesFacebookOrPsn, + ExternalFriendSourcesSteamOrFacebookOrPsn, + ExternalFriendSourcesXboxOrPsn, + ExternalFriendSourcesSteamOrXboxOrPsn, + ExternalFriendSourcesFacebookOrXboxOrPsn, + ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn, + ExternalFriendSourcesAll + }; + + inline void ToJsonEnum(const ExternalFriendSources input, Json::Value& output) + { + if (input == ExternalFriendSources::ExternalFriendSourcesNone) + { + output = Json::Value("None"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteam) + { + output = Json::Value("Steam"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebook) + { + output = Json::Value("Facebook"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebook) + { + output = Json::Value("SteamOrFacebook"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesXbox) + { + output = Json::Value("Xbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrXbox) + { + output = Json::Value("SteamOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrXbox) + { + output = Json::Value("FacebookOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXbox) + { + output = Json::Value("SteamOrFacebookOrXbox"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesPsn) + { + output = Json::Value("Psn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrPsn) + { + output = Json::Value("SteamOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrPsn) + { + output = Json::Value("FacebookOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrPsn) + { + output = Json::Value("SteamOrFacebookOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesXboxOrPsn) + { + output = Json::Value("XboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrXboxOrPsn) + { + output = Json::Value("SteamOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesFacebookOrXboxOrPsn) + { + output = Json::Value("FacebookOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn) + { + output = Json::Value("SteamOrFacebookOrXboxOrPsn"); + return; + } + if (input == ExternalFriendSources::ExternalFriendSourcesAll) + { + output = Json::Value("All"); + return; + } + } + inline void FromJsonEnum(const Json::Value& input, ExternalFriendSources& output) + { + if (!input.isString()) + { + return; + } + const std::string& inputStr = input.asString(); + if (inputStr == "None") + { + output = ExternalFriendSources::ExternalFriendSourcesNone; + return; + } + if (inputStr == "Steam") + { + output = ExternalFriendSources::ExternalFriendSourcesSteam; + return; + } + if (inputStr == "Facebook") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebook; + return; + } + if (inputStr == "SteamOrFacebook") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebook; + return; + } + if (inputStr == "Xbox") + { + output = ExternalFriendSources::ExternalFriendSourcesXbox; + return; + } + if (inputStr == "SteamOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrXbox; + return; + } + if (inputStr == "FacebookOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrXbox; + return; + } + if (inputStr == "SteamOrFacebookOrXbox") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXbox; + return; + } + if (inputStr == "Psn") + { + output = ExternalFriendSources::ExternalFriendSourcesPsn; + return; + } + if (inputStr == "SteamOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrPsn; + return; + } + if (inputStr == "FacebookOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrPsn; + return; + } + if (inputStr == "SteamOrFacebookOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrPsn; + return; + } + if (inputStr == "XboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesXboxOrPsn; + return; + } + if (inputStr == "SteamOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrXboxOrPsn; + return; + } + if (inputStr == "FacebookOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesFacebookOrXboxOrPsn; + return; + } + if (inputStr == "SteamOrFacebookOrXboxOrPsn") + { + output = ExternalFriendSources::ExternalFriendSourcesSteamOrFacebookOrXboxOrPsn; + return; + } + if (inputStr == "All") + { + output = ExternalFriendSources::ExternalFriendSourcesAll; + return; + } + } + enum class GameInstanceState { GameInstanceStateOpen, @@ -17868,6 +18071,7 @@ namespace PlayFab struct GetFriendLeaderboardRequest : public PlayFabRequestCommon { std::map CustomTags; + Boxed ExternalPlatformFriends; Boxed IncludeFacebookFriends; Boxed IncludeSteamFriends; Int32 MaxResultsCount; @@ -17881,6 +18085,7 @@ namespace PlayFab GetFriendLeaderboardRequest() : PlayFabRequestCommon(), CustomTags(), + ExternalPlatformFriends(), IncludeFacebookFriends(), IncludeSteamFriends(), MaxResultsCount(), @@ -17895,6 +18100,7 @@ namespace PlayFab GetFriendLeaderboardRequest(const GetFriendLeaderboardRequest& src) : PlayFabRequestCommon(), CustomTags(src.CustomTags), + ExternalPlatformFriends(src.ExternalPlatformFriends), IncludeFacebookFriends(src.IncludeFacebookFriends), IncludeSteamFriends(src.IncludeSteamFriends), MaxResultsCount(src.MaxResultsCount), @@ -17911,6 +18117,7 @@ namespace PlayFab void FromJson(const Json::Value& input) override { FromJsonUtilS(input["CustomTags"], CustomTags); + FromJsonUtilE(input["ExternalPlatformFriends"], ExternalPlatformFriends); FromJsonUtilP(input["IncludeFacebookFriends"], IncludeFacebookFriends); FromJsonUtilP(input["IncludeSteamFriends"], IncludeSteamFriends); FromJsonUtilP(input["MaxResultsCount"], MaxResultsCount); @@ -17926,6 +18133,7 @@ namespace PlayFab { Json::Value output; Json::Value each_CustomTags; ToJsonUtilS(CustomTags, each_CustomTags); output["CustomTags"] = each_CustomTags; + Json::Value each_ExternalPlatformFriends; ToJsonUtilE(ExternalPlatformFriends, each_ExternalPlatformFriends); output["ExternalPlatformFriends"] = each_ExternalPlatformFriends; Json::Value each_IncludeFacebookFriends; ToJsonUtilP(IncludeFacebookFriends, each_IncludeFacebookFriends); output["IncludeFacebookFriends"] = each_IncludeFacebookFriends; Json::Value each_IncludeSteamFriends; ToJsonUtilP(IncludeSteamFriends, each_IncludeSteamFriends); output["IncludeSteamFriends"] = each_IncludeSteamFriends; Json::Value each_MaxResultsCount; ToJsonUtilP(MaxResultsCount, each_MaxResultsCount); output["MaxResultsCount"] = each_MaxResultsCount; @@ -17942,6 +18150,7 @@ namespace PlayFab struct GetFriendsListRequest : public PlayFabRequestCommon { std::map CustomTags; + Boxed ExternalPlatformFriends; Boxed IncludeFacebookFriends; Boxed IncludeSteamFriends; std::string PlayFabId; @@ -17951,6 +18160,7 @@ namespace PlayFab GetFriendsListRequest() : PlayFabRequestCommon(), CustomTags(), + ExternalPlatformFriends(), IncludeFacebookFriends(), IncludeSteamFriends(), PlayFabId(), @@ -17961,6 +18171,7 @@ namespace PlayFab GetFriendsListRequest(const GetFriendsListRequest& src) : PlayFabRequestCommon(), CustomTags(src.CustomTags), + ExternalPlatformFriends(src.ExternalPlatformFriends), IncludeFacebookFriends(src.IncludeFacebookFriends), IncludeSteamFriends(src.IncludeSteamFriends), PlayFabId(src.PlayFabId), @@ -17973,6 +18184,7 @@ namespace PlayFab void FromJson(const Json::Value& input) override { FromJsonUtilS(input["CustomTags"], CustomTags); + FromJsonUtilE(input["ExternalPlatformFriends"], ExternalPlatformFriends); FromJsonUtilP(input["IncludeFacebookFriends"], IncludeFacebookFriends); FromJsonUtilP(input["IncludeSteamFriends"], IncludeSteamFriends); FromJsonUtilS(input["PlayFabId"], PlayFabId); @@ -17984,6 +18196,7 @@ namespace PlayFab { Json::Value output; Json::Value each_CustomTags; ToJsonUtilS(CustomTags, each_CustomTags); output["CustomTags"] = each_CustomTags; + Json::Value each_ExternalPlatformFriends; ToJsonUtilE(ExternalPlatformFriends, each_ExternalPlatformFriends); output["ExternalPlatformFriends"] = each_ExternalPlatformFriends; Json::Value each_IncludeFacebookFriends; ToJsonUtilP(IncludeFacebookFriends, each_IncludeFacebookFriends); output["IncludeFacebookFriends"] = each_IncludeFacebookFriends; Json::Value each_IncludeSteamFriends; ToJsonUtilP(IncludeSteamFriends, each_IncludeSteamFriends); output["IncludeSteamFriends"] = each_IncludeSteamFriends; Json::Value each_PlayFabId; ToJsonUtilS(PlayFabId, each_PlayFabId); output["PlayFabId"] = each_PlayFabId; diff --git a/code/source/playfab/PlayFabSettings.cpp b/code/source/playfab/PlayFabSettings.cpp index f6ef2dcf..5ae81c5e 100644 --- a/code/source/playfab/PlayFabSettings.cpp +++ b/code/source/playfab/PlayFabSettings.cpp @@ -7,9 +7,9 @@ namespace PlayFab // Control whether all callbacks are threaded or whether the user manually controls callback timing from their main-thread // Note ANY api call may synchronously throw an exception if the title id is not set bool PlayFabSettings::threadedCallbacks = false; - const std::string PlayFabSettings::sdkVersion = "3.96.221024"; - const std::string PlayFabSettings::buildIdentifier = "adobuild_xplatcppsdk_114"; - const std::string PlayFabSettings::versionString = "XPlatCppSdk-3.96.221024"; + const std::string PlayFabSettings::sdkVersion = "3.97.221107"; + const std::string PlayFabSettings::buildIdentifier = "adobuild_xplatcppsdk_117"; + const std::string PlayFabSettings::versionString = "XPlatCppSdk-3.97.221107"; std::string PlayFabSettings::productionEnvironmentURL = ".playfabapi.com"; ErrorCallback PlayFabSettings::globalErrorHandler = nullptr; diff --git a/com.playfab.xplatcppsdk.v141.autopkg b/com.playfab.xplatcppsdk.v141.autopkg index 03e19b98..e7962527 100644 --- a/com.playfab.xplatcppsdk.v141.autopkg +++ b/com.playfab.xplatcppsdk.v141.autopkg @@ -8,7 +8,7 @@ configurations { nuget { nuspec { id = "com.playfab.xplatcppsdk.v141"; - version : 3.96.221024; + version : 3.97.221107; title: "PlayFab Cross Platform C++ Sdk for Visual Studio 2017"; summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience."; authors: "PlayFab"; @@ -18,7 +18,7 @@ nuget { iconUrl: "https://playfab.com/assets/img/playfab-mark.png"; requireLicenseAcceptance: false; description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services."; - releaseNotes: "https://api.playfab.com/releaseNotes/#221024"; + releaseNotes: "https://api.playfab.com/releaseNotes/#221107"; copyright: "Copyright 2022"; language: "C++"; tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native }; diff --git a/com.playfab.xplatcppsdk.v141.nuspec b/com.playfab.xplatcppsdk.v141.nuspec index 617dfab6..be215f0d 100644 --- a/com.playfab.xplatcppsdk.v141.nuspec +++ b/com.playfab.xplatcppsdk.v141.nuspec @@ -2,14 +2,14 @@ com.playfab.xplatcppsdk.v141 - 3.96.221024 + 3.97.221107 Microsoft Microsoft http://github.com/PlayFab/XPlatCppSdk Apache-2.0 ./images/icon.png false - https://api.playfab.com/releaseNotes/#3.96.221024 + https://api.playfab.com/releaseNotes/#3.97.221107 Microsoft Azure PlayFab XPlatCppSdk © Microsoft Corporation. All rights reserved. Microsoft Azure PlayFab Baas Paas JSON REST HTTP SSL API cloud liveops game gamedev native nativepackage diff --git a/com.playfab.xplatcppsdk.v142.autopkg b/com.playfab.xplatcppsdk.v142.autopkg index d81cc17a..c497bf31 100644 --- a/com.playfab.xplatcppsdk.v142.autopkg +++ b/com.playfab.xplatcppsdk.v142.autopkg @@ -8,7 +8,7 @@ configurations { nuget { nuspec { id = "com.playfab.xplatcppsdk.v142"; - version : 3.96.221024; + version : 3.97.221107; title: "PlayFab Cross Platform C++ Sdk for Visual Studio 2019+"; summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience."; authors: "PlayFab"; @@ -18,7 +18,7 @@ nuget { iconUrl: "https://playfab.com/assets/img/playfab-mark.png"; requireLicenseAcceptance: false; description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services."; - releaseNotes: "https://api.playfab.com/releaseNotes/#221024"; + releaseNotes: "https://api.playfab.com/releaseNotes/#221107"; copyright: "Copyright 2022"; language: "C++"; tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native }; diff --git a/com.playfab.xplatcppsdk.v142.nuspec b/com.playfab.xplatcppsdk.v142.nuspec index 580afff9..e8a86ad0 100644 --- a/com.playfab.xplatcppsdk.v142.nuspec +++ b/com.playfab.xplatcppsdk.v142.nuspec @@ -2,14 +2,14 @@ com.playfab.xplatcppsdk.v142 - 3.96.221024 + 3.97.221107 Microsoft Microsoft http://github.com/PlayFab/XPlatCppSdk Apache-2.0 ./images/icon.png false - https://api.playfab.com/releaseNotes/#3.96.221024 + https://api.playfab.com/releaseNotes/#3.97.221107 Microsoft Azure PlayFab XPlatCppSdk © Microsoft Corporation. All rights reserved. Microsoft Azure PlayFab Baas Paas JSON REST HTTP SSL API cloud liveops game gamedev native nativepackage diff --git a/com.playfab.xplatxboxsdk.v141.autopkg b/com.playfab.xplatxboxsdk.v141.autopkg index a5eca94a..4fd8a395 100644 --- a/com.playfab.xplatxboxsdk.v141.autopkg +++ b/com.playfab.xplatxboxsdk.v141.autopkg @@ -18,7 +18,7 @@ configurations { nuget { nuspec { id = "com.playfab.xplatxboxsdk.v141"; - version : 3.96.221024; + version : 3.97.221107; title: "PlayFab Xbox Platform C++ Sdk for Visual Studio 2017"; summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience."; authors: "PlayFab"; @@ -28,7 +28,7 @@ nuget { iconUrl: "https://playfab.com/assets/img/playfab-mark.png"; requireLicenseAcceptance: false; description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services."; - releaseNotes: "https://api.playfab.com/releaseNotes/#221024"; + releaseNotes: "https://api.playfab.com/releaseNotes/#221107"; copyright: "Copyright 2022"; language: "C++"; tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native, xbox };