오브젝트 완료 후 탈출 시 무법자 승리

타운 맵 완성(추후 수정할 수도)
kudave20 · Feb 20, 2023 · 066510a · 066510a
1 parent 84f4263
commit 066510a
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 1 deletion.
diff --git a/Content/Blueprints/Buildings/BP_Ammunition.uasset b/Content/Blueprints/Buildings/BP_Ammunition.uasset
diff --git a/Content/Blueprints/Buildings/BP_Bank.uasset b/Content/Blueprints/Buildings/BP_Bank.uasset
diff --git a/Content/Blueprints/Buildings/BP_BarberShop.uasset b/Content/Blueprints/Buildings/BP_BarberShop.uasset
diff --git a/Content/Blueprints/Buildings/BP_Church.uasset b/Content/Blueprints/Buildings/BP_Church.uasset
diff --git a/Content/Blueprints/Buildings/BP_Cop.uasset b/Content/Blueprints/Buildings/BP_Cop.uasset
diff --git a/Content/Blueprints/Buildings/BP_GrandHotel.uasset b/Content/Blueprints/Buildings/BP_GrandHotel.uasset
diff --git a/Content/Blueprints/Buildings/BP_Saloon.uasset b/Content/Blueprints/Buildings/BP_Saloon.uasset
diff --git a/Content/Blueprints/Buildings/BP_Sheriff.uasset b/Content/Blueprints/Buildings/BP_Sheriff.uasset
diff --git a/Content/Blueprints/Buildings/BP_Supply.uasset b/Content/Blueprints/Buildings/BP_Supply.uasset
diff --git a/Content/Blueprints/Buildings/BP_TradingPost.uasset b/Content/Blueprints/Buildings/BP_TradingPost.uasset
diff --git a/Content/Blueprints/Buildings/BP_TrainStation.uasset b/Content/Blueprints/Buildings/BP_TrainStation.uasset
diff --git a/Content/Blueprints/Buildings/BP_Undertaker.uasset b/Content/Blueprints/Buildings/BP_Undertaker.uasset
diff --git a/Content/Blueprints/Buildings/BP_Unnamed.uasset b/Content/Blueprints/Buildings/BP_Unnamed.uasset
diff --git a/Content/Blueprints/Controller/BP_TownPlayerController.uasset b/Content/Blueprints/Controller/BP_TownPlayerController.uasset
diff --git a/Content/Blueprints/Etc/BP_Exit.uasset b/Content/Blueprints/Etc/BP_Exit.uasset
diff --git a/Content/Blueprints/GameModes/BP_TownGameMode.uasset b/Content/Blueprints/GameModes/BP_TownGameMode.uasset
diff --git a/Content/Maps/GameStartupMap.umap b/Content/Maps/GameStartupMap.umap
diff --git a/Content/Maps/Town.umap b/Content/Maps/Town.umap
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Ammunition.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Ammunition.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Bank.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Bank.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_BarberShop.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_BarberShop.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Church.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Church.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Cop.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Cop.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_GrandHotel.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_GrandHotel.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Saloon.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Saloon.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Sheriff.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Sheriff.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Supply.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Supply.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_TradingPost.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_TradingPost.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_TrainStation.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_TrainStation.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Undertaker.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Undertaker.uasset
diff --git a/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Unnamed.uasset b/Content/PolygonWestern/Meshes/Buildings/Custom/SM_Unnamed.uasset
diff --git a/Source/WildWest/Character/Gunman.cpp b/Source/WildWest/Character/Gunman.cpp
@@ -203,7 +203,7 @@ void AGunman::LookUp(const FInputActionValue& Value)
 
 void AGunman::OpenVault()
 {
-	if (OverlappingVault)
+	if (OverlappingVault && !OverlappingVault->GetbIsOpened())
 	{
 		UWorld* World = GetWorld();
 		if (World)
@@ -238,12 +238,15 @@ void AGunman::OpenVault()
 				if (HasAuthority())
 				{
 					OverlappingVault->OpenDoorDelegate.Broadcast();
+					VaultOpened++;
 				}
 				else
 				{
 					ServerOpenVault();
 				}
 
+				OverlappingVault->SetbIsOpened(true);
+
 				return;
 			}
 
@@ -305,5 +308,6 @@ void AGunman::ServerOpenVault_Implementation()
 	if (OverlappingVault)
 	{
 		OverlappingVault->OpenDoorDelegate.Broadcast();
+		VaultOpened++;
 	}
 }
diff --git a/Source/WildWest/Character/Gunman.h b/Source/WildWest/Character/Gunman.h
@@ -80,6 +80,9 @@ class WILDWEST_API AGunman : public ACharacter
 
 	bool bIsInteracting;
 
+	UPROPERTY(BlueprintReadOnly, Category = "Vault", meta = (AllowPrivateAccess = "true"))
+	int32 VaultOpened;
+
 public:
 	FORCEINLINE void SetOverlappingVault(AVault* Vault) { OverlappingVault = Vault; }
 };
diff --git a/Source/WildWest/Props/Vault.h b/Source/WildWest/Props/Vault.h
@@ -56,9 +56,14 @@ class WILDWEST_API AVault : public AActor
 
 	float OpenTimer;
 
+	bool bIsOpened;
+
 public:	
 	FORCEINLINE float GetMaxOpenTimer() { return MaxOpenTimer; }
 
 	FORCEINLINE float GetOpenTimer() { return OpenTimer; }
 	FORCEINLINE void SetOpenTimer(float NewTimer) { OpenTimer = NewTimer; }
+
+	FORCEINLINE bool GetbIsOpened() { return bIsOpened; }
+	FORCEINLINE void SetbIsOpened(bool bOpened) { bIsOpened = bOpened; }
 };