Skip to content

Commit 9b5bbe8

Browse files
author
Paul Gilmore
authored
* 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 build from Jenkins
1 parent 831ef2b commit 9b5bbe8

File tree

19 files changed

+869
-12
lines changed

19 files changed

+869
-12
lines changed

GameServerSource/Assets/Contexts/PlayFabContext/Commands/PlayFabCommands.cs

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,22 @@ public override void Execute(){
236236
}
237237
}
238238

239+
///<summary>
240+
///Returns whatever info is requested in the response for the user. Note that PII (like email address, facebook id) may be returned. All parameters default to false.
241+
///</summary>
242+
public class GetPlayerCombinedInfoCommand : Command {
243+
[Inject] public GetPlayerCombinedInfoResponseSignal ResponseSignal {get; set;}
244+
[Inject] public GetPlayerCombinedInfoRequest Request {get; set;}
245+
public override void Execute(){
246+
Retain();
247+
PlayFabServerAPI.GetPlayerCombinedInfo(Request,(result)=>{
248+
//TODO: Map Result data to PlayFabDataStore.
249+
Release();
250+
ResponseSignal.Dispatch(result);
251+
}, PlayFabErrorHandler.HandlePlayFabError);
252+
}
253+
}
254+
239255
///<summary>
240256
///Retrieves the current version and values for the indicated statistics, for the local player.
241257
///</summary>
@@ -1517,5 +1533,57 @@ public override void Execute(){
15171533
#region Guilds
15181534

15191535
#endregion
1536+
//PlayStream
1537+
#region PlayStream
1538+
1539+
///<summary>
1540+
///Retrieves an array of player segment definitions. Results from this can be used in subsequent API calls such as GetPlayersInSegment which requires a Segment ID. While segment names can change the ID for that segment will not change.
1541+
///</summary>
1542+
public class GetAllSegmentsCommand : Command {
1543+
[Inject] public GetAllSegmentsResponseSignal ResponseSignal {get; set;}
1544+
[Inject] public GetAllSegmentsRequest Request {get; set;}
1545+
public override void Execute(){
1546+
Retain();
1547+
PlayFabServerAPI.GetAllSegments(Request,(result)=>{
1548+
//TODO: Map Result data to PlayFabDataStore.
1549+
Release();
1550+
ResponseSignal.Dispatch(result);
1551+
}, PlayFabErrorHandler.HandlePlayFabError);
1552+
}
1553+
}
1554+
1555+
///<summary>
1556+
///List all segments that a player currently belongs to at this moment in time.
1557+
///</summary>
1558+
public class GetPlayerSegmentsCommand : Command {
1559+
[Inject] public GetPlayerSegmentsResponseSignal ResponseSignal {get; set;}
1560+
[Inject] public GetPlayersSegmentsRequest Request {get; set;}
1561+
public override void Execute(){
1562+
Retain();
1563+
PlayFabServerAPI.GetPlayerSegments(Request,(result)=>{
1564+
//TODO: Map Result data to PlayFabDataStore.
1565+
Release();
1566+
ResponseSignal.Dispatch(result);
1567+
}, PlayFabErrorHandler.HandlePlayFabError);
1568+
}
1569+
}
1570+
1571+
///<summary>
1572+
///Allows for paging through all players in a given segment. This API creates a snapshot of all player profiles that match the segment definition at the time of its creation and lives through the Total Seconds to Live, refreshing its life span on each subsequent use of the Continuation Token. Profiles that change during the course of paging will not be reflected in the results. AB Test segments are currently not supported by this operation.
1573+
///</summary>
1574+
public class GetPlayersInSegmentCommand : Command {
1575+
[Inject] public GetPlayersInSegmentResponseSignal ResponseSignal {get; set;}
1576+
[Inject] public GetPlayersInSegmentRequest Request {get; set;}
1577+
public override void Execute(){
1578+
Retain();
1579+
PlayFabServerAPI.GetPlayersInSegment(Request,(result)=>{
1580+
//TODO: Map Result data to PlayFabDataStore.
1581+
Release();
1582+
ResponseSignal.Dispatch(result);
1583+
}, PlayFabErrorHandler.HandlePlayFabError);
1584+
}
1585+
}
1586+
1587+
#endregion
15201588

15211589

GameServerSource/Assets/Contexts/PlayFabContext/Factory/PlayFabBindingsFactory.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ public static void Create(ICommandBinder commandBinder){
9999
commandBinder.Bind<GetLeaderboardAroundUserSignal>().To<GetLeaderboardAroundUserCommand>();
100100
commandBinder.Bind<GetLeaderboardAroundUserResponseSignal>(); //Create empty overrideable binding.
101101

102+
///<summary>
103+
///Returns whatever info is requested in the response for the user. Note that PII (like email address, facebook id) may be returned. All parameters default to false.
104+
///</summary>
105+
commandBinder.Bind<GetPlayerCombinedInfoSignal>().To<GetPlayerCombinedInfoCommand>();
106+
commandBinder.Bind<GetPlayerCombinedInfoResponseSignal>(); //Create empty overrideable binding.
107+
102108
///<summary>
103109
///Retrieves the current version and values for the indicated statistics, for the local player.
104110
///</summary>
@@ -621,6 +627,29 @@ public static void Create(ICommandBinder commandBinder){
621627
//Guilds
622628
#region Guilds
623629

630+
#endregion
631+
632+
//PlayStream
633+
#region PlayStream
634+
635+
///<summary>
636+
///Retrieves an array of player segment definitions. Results from this can be used in subsequent API calls such as GetPlayersInSegment which requires a Segment ID. While segment names can change the ID for that segment will not change.
637+
///</summary>
638+
commandBinder.Bind<GetAllSegmentsSignal>().To<GetAllSegmentsCommand>();
639+
commandBinder.Bind<GetAllSegmentsResponseSignal>(); //Create empty overrideable binding.
640+
641+
///<summary>
642+
///List all segments that a player currently belongs to at this moment in time.
643+
///</summary>
644+
commandBinder.Bind<GetPlayerSegmentsSignal>().To<GetPlayerSegmentsCommand>();
645+
commandBinder.Bind<GetPlayerSegmentsResponseSignal>(); //Create empty overrideable binding.
646+
647+
///<summary>
648+
///Allows for paging through all players in a given segment. This API creates a snapshot of all player profiles that match the segment definition at the time of its creation and lives through the Total Seconds to Live, refreshing its life span on each subsequent use of the Continuation Token. Profiles that change during the course of paging will not be reflected in the results. AB Test segments are currently not supported by this operation.
649+
///</summary>
650+
commandBinder.Bind<GetPlayersInSegmentSignal>().To<GetPlayersInSegmentCommand>();
651+
commandBinder.Bind<GetPlayersInSegmentResponseSignal>(); //Create empty overrideable binding.
652+
624653
#endregion
625654

626655
}

GameServerSource/Assets/Contexts/PlayFabContext/PlayFabContext.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ protected override void mapBindings()
6060
injectionBinder.Bind<GetLeaderboardResponseSignal>().CrossContext();
6161
injectionBinder.Bind<GetLeaderboardAroundUserSignal>().CrossContext();
6262
injectionBinder.Bind<GetLeaderboardAroundUserResponseSignal>().CrossContext();
63+
injectionBinder.Bind<GetPlayerCombinedInfoSignal>().CrossContext();
64+
injectionBinder.Bind<GetPlayerCombinedInfoResponseSignal>().CrossContext();
6365
injectionBinder.Bind<GetPlayerStatisticsSignal>().CrossContext();
6466
injectionBinder.Bind<GetPlayerStatisticsResponseSignal>().CrossContext();
6567
injectionBinder.Bind<GetPlayerStatisticVersionsSignal>().CrossContext();
@@ -251,5 +253,14 @@ protected override void mapBindings()
251253
//Guilds
252254
#region Guilds
253255
#endregion
256+
//PlayStream
257+
#region PlayStream
258+
injectionBinder.Bind<GetAllSegmentsSignal>().CrossContext();
259+
injectionBinder.Bind<GetAllSegmentsResponseSignal>().CrossContext();
260+
injectionBinder.Bind<GetPlayerSegmentsSignal>().CrossContext();
261+
injectionBinder.Bind<GetPlayerSegmentsResponseSignal>().CrossContext();
262+
injectionBinder.Bind<GetPlayersInSegmentSignal>().CrossContext();
263+
injectionBinder.Bind<GetPlayersInSegmentResponseSignal>().CrossContext();
264+
#endregion
254265
}
255266
}

GameServerSource/Assets/Contexts/PlayFabContext/Signals/PlayFabSignals.cs

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ public class GetLeaderboardSignal : Signal<GetLeaderboardRequest> { }
8989
///</summary>
9090
public class GetLeaderboardAroundUserSignal : Signal<GetLeaderboardAroundUserRequest> { }
9191

92+
///<summary>
93+
///Returns whatever info is requested in the response for the user. Note that PII (like email address, facebook id) may be returned. All parameters default to false.
94+
///</summary>
95+
public class GetPlayerCombinedInfoSignal : Signal<GetPlayerCombinedInfoRequest> { }
96+
9297
///<summary>
9398
///Retrieves the current version and values for the indicated statistics, for the local player.
9499
///</summary>
@@ -534,6 +539,26 @@ public class UpdateCharacterReadOnlyDataSignal : Signal<UpdateCharacterDataReque
534539
//Guilds
535540
#region Guilds
536541

542+
#endregion
543+
544+
//PlayStream
545+
#region PlayStream
546+
547+
///<summary>
548+
///Retrieves an array of player segment definitions. Results from this can be used in subsequent API calls such as GetPlayersInSegment which requires a Segment ID. While segment names can change the ID for that segment will not change.
549+
///</summary>
550+
public class GetAllSegmentsSignal : Signal<GetAllSegmentsRequest> { }
551+
552+
///<summary>
553+
///List all segments that a player currently belongs to at this moment in time.
554+
///</summary>
555+
public class GetPlayerSegmentsSignal : Signal<GetPlayersSegmentsRequest> { }
556+
557+
///<summary>
558+
///Allows for paging through all players in a given segment. This API creates a snapshot of all player profiles that match the segment definition at the time of its creation and lives through the Total Seconds to Live, refreshing its life span on each subsequent use of the Continuation Token. Profiles that change during the course of paging will not be reflected in the results. AB Test segments are currently not supported by this operation.
559+
///</summary>
560+
public class GetPlayersInSegmentSignal : Signal<GetPlayersInSegmentRequest> { }
561+
537562
#endregion
538563
#endregion
539564

@@ -623,6 +648,11 @@ public class GetLeaderboardResponseSignal : Signal<GetLeaderboardResult> { }
623648
///</summary>
624649
public class GetLeaderboardAroundUserResponseSignal : Signal<GetLeaderboardAroundUserResult> { }
625650

651+
///<summary>
652+
///Returns whatever info is requested in the response for the user. Note that PII (like email address, facebook id) may be returned. All parameters default to false.
653+
///</summary>
654+
public class GetPlayerCombinedInfoResponseSignal : Signal<GetPlayerCombinedInfoResult> { }
655+
626656
///<summary>
627657
///Retrieves the current version and values for the indicated statistics, for the local player.
628658
///</summary>
@@ -1070,4 +1100,24 @@ public class UpdateCharacterReadOnlyDataResponseSignal : Signal<UpdateCharacterD
10701100

10711101
#endregion
10721102

1103+
//PlayStream
1104+
#region PlayStream
1105+
1106+
///<summary>
1107+
///Retrieves an array of player segment definitions. Results from this can be used in subsequent API calls such as GetPlayersInSegment which requires a Segment ID. While segment names can change the ID for that segment will not change.
1108+
///</summary>
1109+
public class GetAllSegmentsResponseSignal : Signal<GetAllSegmentsResult> { }
1110+
1111+
///<summary>
1112+
///List all segments that a player currently belongs to at this moment in time.
1113+
///</summary>
1114+
public class GetPlayerSegmentsResponseSignal : Signal<GetPlayerSegmentsResult> { }
1115+
1116+
///<summary>
1117+
///Allows for paging through all players in a given segment. This API creates a snapshot of all player profiles that match the segment definition at the time of its creation and lives through the Total Seconds to Live, refreshing its life span on each subsequent use of the Continuation Token. Profiles that change during the course of paging will not be reflected in the results. AB Test segments are currently not supported by this operation.
1118+
///</summary>
1119+
public class GetPlayersInSegmentResponseSignal : Signal<GetPlayersInSegmentResult> { }
1120+
1121+
#endregion
1122+
10731123
#endregion

GameServerSource/Assets/PlayFabSDK/Internal/PlayFabVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace PlayFab.Internal
33
{
44
public class PlayFabVersion
55
{
6-
public static string SdkVersion = "0.0.160725";
6+
public static string SdkVersion = "0.0.160801";
77

88
public static string getVersionString()
99
{

GameServerSource/Assets/PlayFabSDK/Public/PlayFabErrors.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,16 @@ public enum PlayFabErrorCode
235235
InvalidTwitchToken = 1232,
236236
TwitchResponseError = 1233,
237237
ProfaneDisplayName = 1234,
238-
UserAlreadyAdded = 1235
238+
UserAlreadyAdded = 1235,
239+
InvalidVirtualCurrencyCode = 1236,
240+
VirtualCurrencyCannotBeDeleted = 1237,
241+
IdentifierAlreadyClaimed = 1238,
242+
IdentifierNotLinked = 1239,
243+
InvalidContinuationToken = 1240,
244+
ExpiredContinuationToken = 1241,
245+
InvalidSegment = 1242,
246+
InvalidSessionId = 1243,
247+
SessionLogNotFound = 1244
239248
}
240249

241250
public delegate void ErrorCallback(PlayFabError error);

GameServerSource/Assets/PlayFabSDK/Public/PlayFabMatchmakerModels.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class AuthUserResponse : PlayFabResultCommon
2828
}
2929

3030
/// <summary>
31-
/// A unique instance of an item in a user's inventory
31+
/// A unique instance of an item in a user's inventory. Note, To retrieve additional information for an item instance (such as Tags, Description, or Custom Data that are set on the root catalog item), a call to GetCatalogItems is required. The Item ID of the instance can then be matched to a catalog entry, which contains the additional information.
3232
/// </summary>
3333
public class ItemInstance
3434
{

0 commit comments

Comments
 (0)