diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 6c4d42d..d428a26 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -4,6 +4,11 @@ GameName=OdinUnrealSample [/Script/Engine.Engine] +ActiveClassRedirects=(OldClassName="/Script/PhotonDemoParticle.PhotonLBClient",NewClassName="/Script/OdinUnrealSample.PhotonLBClient") +[/Script/Engine.Engine] +!NetDriverDefinitions=ClearArray ++NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="/Script/OnlineSubsystemEOS.NetDriverEOS",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver") ++NetDriverDefinitions=(DefName="DemoNetDriver",DriverClassName="/Script/Engine.DemoNetDriver",DriverClassNameFallback="/Script/Engine.DemoNetDriver") + [/Script/EngineSettings.GameMapsSettings] EditorStartupMap=/Game/Maps/Lobby.Lobby TransitionMap= @@ -290,13 +295,14 @@ ManualIPAddress= [/Script/OnlineSubsystemEOS.EOSSettings] CacheDir=CacheDir DefaultArtifactName=OdinTechDemo +RTCBackgroundMode= TickBudgetInMilliseconds=0 bEnableOverlay=True bEnableSocialOverlay=False bEnableEditorOverlay=True -bUseLauncherChecks=true +bPreferPersistentAuth=False TitleStorageReadChunkLength=0 -+Artifacts=(ArtifactName="OdinTechDemo",ClientId="xyza7891sGny9XgwwoemBhEtcdqBLJzF",ClientSecret="PuhTi6v+f1CJZ4U6ciXomR5mqszjvMtIaJZtUb3MFvc",ProductId="d32c08ed3f8748ed9acd524f76a0984f",SandboxId="28c4620348f946829cfa7dd482ea5b2b",DeploymentId="d3c8d8c7ed0d4d87ab7a50c2a0094c45",ClientEncryptionKey="ab7adf02eb4473d8ee6296275acc4ef426492705021963df282ef37915abe8b9") ++Artifacts=(ArtifactName="OdinTechDemo",ClientId="xyza7891Cuze2kv36y1wIGenT7FgzWma",ClientSecret="Ey5yR1Fsy49Z/U5uPhUVtpu4HwxRKito24mGLiEWVPA",ProductId="2082b359b5594412b2e9730a2e1ce26d",SandboxId="ce2a6d01a5124712b6b6de49f84631ed",DeploymentId="3f586ca0c3e340f69a53d7d0b08f08cf",ClientEncryptionKey="ab7adf02eb4473d8ee6296275acc4ef426492705021963df282ef37915abe8b9") -AuthScopeFlags=BasicProfile -AuthScopeFlags=FriendsList -AuthScopeFlags=Presence @@ -306,6 +312,7 @@ bMirrorStatsToEOS=False bMirrorAchievementsToEOS=False bUseEOSSessions=True bMirrorPresenceToEAS=False +SteamTokenType=Session [OnlineSubsystemEOS] bEnabled=true @@ -317,11 +324,6 @@ DefaultPlatformService=EOS !NetDriverDefinitions=ClearArray +NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="OnlineSubsystemEOS.NetDriverEOS",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver") -[/Script/Engine.Engine] -!NetDriverDefinitions=ClearArray -+NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="/Script/OnlineSubsystemEOS.NetDriverEOS",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver") -+NetDriverDefinitions=(DefName="DemoNetDriver",DriverClassName="/Script/Engine.DemoNetDriver",DriverClassNameFallback="/Script/Engine.DemoNetDriver") - [/Script/OnlineSubsystemEOS.NetDriverEOSBase] bIsUsingP2PSockets=true diff --git a/Content/Blueprints/Game/GameInstance_TD.uasset b/Content/Blueprints/Game/GameInstance_TD.uasset index 122223d..6aaeb47 100644 Binary files a/Content/Blueprints/Game/GameInstance_TD.uasset and b/Content/Blueprints/Game/GameInstance_TD.uasset differ diff --git a/Content/Blueprints/Odin/OdinClientComponent.uasset b/Content/Blueprints/Odin/OdinClientComponent.uasset index cbfeec0..614212e 100644 Binary files a/Content/Blueprints/Odin/OdinClientComponent.uasset and b/Content/Blueprints/Odin/OdinClientComponent.uasset differ diff --git a/Content/Blueprints/Widgets/LobbyMenu.uasset b/Content/Blueprints/Widgets/LobbyMenu.uasset index b6c3497..2a8b6fe 100644 Binary files a/Content/Blueprints/Widgets/LobbyMenu.uasset and b/Content/Blueprints/Widgets/LobbyMenu.uasset differ diff --git a/Source/OdinUnrealSample/Private/EosPlayerController.cpp b/Source/OdinUnrealSample/Private/EosPlayerController.cpp index 76e7db8..f400778 100644 --- a/Source/OdinUnrealSample/Private/EosPlayerController.cpp +++ b/Source/OdinUnrealSample/Private/EosPlayerController.cpp @@ -2,6 +2,7 @@ #include "EosPlayerController.h" +#include "Misc/ConfigCacheIni.h" #include "OnlineSubsystem.h" #include "OnlineSubsystemUtils.h" #include "OnlineSubsystemTypes.h" @@ -129,6 +130,8 @@ void AEosPlayerController::BeginPlay() // Tutorial 2: On BeginPlay call our login function. This is only on the GameClient, not on the DedicatedServer. Super::BeginPlay(); // Call parent class BeginPlay() function //Login(); //Call login function + + GConfig->GetString(TEXT("OnlineSubsystem"), TEXT("DefaultPlatformService"), SelectedSubsystem, GEngineIni); } void AEosPlayerController::CreateLobby(FName KeyName, FString KeyValue) diff --git a/Source/OdinUnrealSample/Private/EosPlayerController.h b/Source/OdinUnrealSample/Private/EosPlayerController.h index 5c918dc..684c8cf 100644 --- a/Source/OdinUnrealSample/Private/EosPlayerController.h +++ b/Source/OdinUnrealSample/Private/EosPlayerController.h @@ -21,6 +21,9 @@ class AEosPlayerController : public APlayerController // Class constructor. We won't use this in this tutorial. AEosPlayerController(); + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FString SelectedSubsystem; + protected: // Function called when play begins virtual void BeginPlay();