2
0
Эх сурвалжийг харах

Update for new OnPlayerJoin params

Signed-off-by: puvvadar <[email protected]>
puvvadar 3 жил өмнө
parent
commit
f858933fbe

+ 5 - 1
Gem/Code/Source/MultiplayerSampleSystemComponent.cpp

@@ -11,6 +11,7 @@
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 #include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzFramework/Session/ISessionHandlingRequests.h>
 
 
 #include <Source/AutoGen/AutoComponentTypes.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
 #include <Source/Weapons/WeaponTypes.h>
 #include <Source/Weapons/WeaponTypes.h>
@@ -107,7 +108,10 @@ namespace MultiplayerSample
         return AZ::TICK_PLACEMENT + 2;
         return AZ::TICK_PLACEMENT + 2;
     }
     }
 
 
-    AZStd::pair<Multiplayer::PrefabEntityId, AZ::Transform> MultiplayerSampleSystemComponent::OnPlayerJoin(uint64_t userId)
+    AZStd::pair<Multiplayer::PrefabEntityId, AZ::Transform> MultiplayerSampleSystemComponent::OnPlayerJoin(
+        uint64_t userId,
+        [[maybe_unused]] AzFramework::PlayerConnectionConfig config,
+        [[maybe_unused]] Multiplayer::LongNetworkString ticket)
     {
     {
         auto sv_playerSpawnAssetLowerCase = static_cast<AZ::CVarFixedString>(sv_playerSpawnAsset);
         auto sv_playerSpawnAssetLowerCase = static_cast<AZ::CVarFixedString>(sv_playerSpawnAsset);
         AZStd::to_lower(sv_playerSpawnAssetLowerCase.begin(), sv_playerSpawnAssetLowerCase.end());
         AZStd::to_lower(sv_playerSpawnAssetLowerCase.begin(), sv_playerSpawnAssetLowerCase.end());

+ 9 - 1
Gem/Code/Source/MultiplayerSampleSystemComponent.h

@@ -12,6 +12,11 @@
 
 
 #include <Multiplayer/IMultiplayerSpawner.h>
 #include <Multiplayer/IMultiplayerSpawner.h>
 
 
+namespace AzFramework
+{
+    struct PlayerConnectionConfig;
+}
+
 namespace Multiplayer
 namespace Multiplayer
 {
 {
     struct EntityReplicationData;
     struct EntityReplicationData;
@@ -50,7 +55,10 @@ namespace MultiplayerSample
 
 
         ////////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////////
         // IMultiplayerSpawner overrides
         // IMultiplayerSpawner overrides
-        AZStd::pair<Multiplayer::PrefabEntityId, AZ::Transform> OnPlayerJoin(uint64_t userId) override;
+        AZStd::pair<Multiplayer::PrefabEntityId, AZ::Transform> OnPlayerJoin(
+            uint64_t userId,
+            AzFramework::PlayerConnectionConfig config,
+            Multiplayer::LongNetworkString ticket) override;
         void OnPlayerLeave(
         void OnPlayerLeave(
             Multiplayer::ConstNetworkEntityHandle entityHandle,
             Multiplayer::ConstNetworkEntityHandle entityHandle,
             const Multiplayer::ReplicationSet& replicationSet,
             const Multiplayer::ReplicationSet& replicationSet,