From c43443d73702f7cc0eb431bfd3afbf67ec2e279a Mon Sep 17 00:00:00 2001
From: thejinchao <thejinchao@gmail.com>
Date: Sat, 25 Mar 2023 15:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Client/Source/TurboLinkTest/TurboLinkTestController.cpp   | 4 ++--
 Client/Source/TurboLinkTest/TurboLinkTestGameInstance.cpp | 7 +------
 Client/Source/TurboLinkTest/TurboLinkTestGameInstance.h   | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Client/Source/TurboLinkTest/TurboLinkTestController.cpp b/Client/Source/TurboLinkTest/TurboLinkTestController.cpp
index da6778d..ea271a9 100644
--- a/Client/Source/TurboLinkTest/TurboLinkTestController.cpp
+++ b/Client/Source/TurboLinkTest/TurboLinkTestController.cpp
@@ -30,7 +30,7 @@ void ATurboLinkTestController::GetLifetimeReplicatedProps(TArray <FLifetimePrope
 void ATurboLinkTestController::ConnectToTimeService_Implementation()
 {
     if (TimeService != nullptr) return;
-    UTurboLinkGrpcManager* turboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager();
+    UTurboLinkGrpcManager* turboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager(this);
 
     //create service adapter
     TimeService = Cast<UTimeService>(turboLinkManager->MakeService("TimeService"));
@@ -58,7 +58,7 @@ void ATurboLinkTestController::ShutdownTimeService_Implementation()
         }
 
         TimeService->OnServiceStateChanged.RemoveDynamic(this, &ATurboLinkTestController::OnTimeServiceStateChanged);
-        UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager()->ReleaseService(TimeService);
+        UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager(this)->ReleaseService(TimeService);
         TimeService = nullptr;
 
         bIsClientCreated = false;
diff --git a/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.cpp b/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.cpp
index 6783f43..6cec4c9 100644
--- a/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.cpp
+++ b/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.cpp
@@ -8,16 +8,11 @@
 void UTurboLinkTestGameInstance::Init()
 {
     Super::Init();
-
-    TurboLinkManager = UTurboLinkGrpcUtilities::GetTurboLinkGrpcManager();
-    TurboLinkManager->InitManager();
 }
 
 void UTurboLinkTestGameInstance::Shutdown()
 {
-    // Unregister ticker delegate
-    TurboLinkManager->Shutdown();
-    TurboLinkManager = nullptr;
+    Super::Shutdown();
 }
 
 FString UTurboLinkTestGameInstance::DumpBytes(const FBytes& Bytes)
diff --git a/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.h b/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.h
index 65f7512..6c6f471 100644
--- a/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.h
+++ b/Client/Source/TurboLinkTest/TurboLinkTestGameInstance.h
@@ -25,8 +25,4 @@ public:
 	void DumpMessage(const FGrpcUserRegisterRequest& Message);
 protected:
 	FString DumpBytes(const FBytes& Bytes);
-
-protected:
-	UPROPERTY()
-	UTurboLinkGrpcManager* TurboLinkManager;
 };