From 8276b4f3f039fdb8873bfae2993b474cce6119e4 Mon Sep 17 00:00:00 2001
From: HappyTanuki <rlaalstn120@icloud.com>
Date: Wed, 15 Nov 2023 03:41:11 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A7=B5=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Config/DefaultEngine.ini                                   | 7 ++++---
 Content/Blueprints/BP_DefaultPlayerCharacter.uasset        | 4 ++--
 Content/Character/Lb/EskillBuff.uasset                     | 4 ++--
 Content/Maps/MiniMap.umap                                  | 4 ++--
 Source/Promether/GameModeBase/Deathmatch.cpp               | 2 +-
 Source/Promether/PlayerGeneric/DefaultPlayerController.cpp | 5 ++++-
 Source/Promether/PlayerGeneric/DefaultPlayerState.cpp      | 4 +++-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index 57105e6..9d2703e 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -1,8 +1,9 @@
 [/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Game/Maps/DevMap.DevMap
-EditorStartupMap=/Game/Maps/DevMap.DevMap
+GameDefaultMap=/Game/Maps/MiniMap.MiniMap
+EditorStartupMap=/Game/Maps/MiniMap.MiniMap
 GameInstanceClass=/Script/Promether.DefaultGameInstance
-ServerDefaultMap=/Game/Maps/DevMap.DevMap
+ServerDefaultMap=/Game/Maps/MiniMap.MiniMap
+TransitionMap=/Game/Maps/MiniMap.MiniMap
 
 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset
index 9d2ffd5..cc267b1 100644
--- a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset
+++ b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5952563f4666f905064f868f48a29fcf0aca136dff8fa8946d2140dfaa91822d
-size 143186
+oid sha256:188b8dedb4d48f7fff13e4378b242d933a22e826600630c93d1127a03decc130
+size 130425
diff --git a/Content/Character/Lb/EskillBuff.uasset b/Content/Character/Lb/EskillBuff.uasset
index 02e84ee..47b2112 100644
--- a/Content/Character/Lb/EskillBuff.uasset
+++ b/Content/Character/Lb/EskillBuff.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed273a648bce2d56f7e8ade63b4015d7fb304013becc30c291de40b89eec3907
-size 207220
+oid sha256:418b5c54ff002a5ed554714cc551454036e199f8ca4716f67e3cd0509a2a9101
+size 209864
diff --git a/Content/Maps/MiniMap.umap b/Content/Maps/MiniMap.umap
index 4c68e60..f518a60 100644
--- a/Content/Maps/MiniMap.umap
+++ b/Content/Maps/MiniMap.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b19914070eda5002ca8a869a81e08d12b0327f90a0bbcfe1ad95d372e368233
-size 163469
+oid sha256:f60e1c4c86139d1299b8ca849adc0261400cd26aa87763091aeb6feb20ed822f
+size 303003
diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp
index 987808c..db8175f 100644
--- a/Source/Promether/GameModeBase/Deathmatch.cpp
+++ b/Source/Promether/GameModeBase/Deathmatch.cpp
@@ -133,7 +133,7 @@ FString ADeathmatch::InitNewPlayer(APlayerController* NewPlayerController, const
 	//DebugPerpose
 	if (Type == CharacterType::Lukriel)
 	{
-		Type = CharacterType::Riana;
+		Type = CharacterType::Lb;
 	}
 	if (Team == TeamType::Null)
 	{
diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
index 780bb5c..f96a839 100644
--- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
+++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
@@ -486,11 +486,12 @@ void ADefaultPlayerController::Move()
 {
 	EndAttack();
 	ObjectSelect();
-	
+
 	if (GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget() != GetPawn<AActor>() &&
 		Cast<ADefaultPlayerCharacter>(GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget()))
 	{
 		if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Attackable] == 0) return;
+
 		BeginAttack();
 	}
 	else 
@@ -705,6 +706,8 @@ void ADefaultPlayerController::Attack()
 	{
 		if ((GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Attack] != 0))
 			return;
+
+		UE_LOG(LogTemp, Warning, TEXT("asdf:%s"), *GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget()->GetName());
 		
 		FVector Location = GetPawn()->GetActorLocation();
 		Location.X = 0;
diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp
index 4320ed6..6b2645b 100644
--- a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp
+++ b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp
@@ -39,9 +39,11 @@ void ADefaultPlayerState::InitPlayerStats_Implementation(const TArray<float>& St
 
 	for (float Value : CooldownDurationValue)
 	{
-		CooldownDuration.Add(0.0f);
+		CooldownDuration.Add(-100000.0f);
 	}
 
+	CooldownDuration[(uint8)CooldownType::Attack] = 0;
+
 	for (float Value : StatsValue)
 	{
 		UE_LOG(LogTemp, Warning, TEXT("Values: %f"), Value);