From 126c50c56758bfb8f2b1e8b280b74c079a2b8e35 Mon Sep 17 00:00:00 2001
From: "PCYPC\\pcy35" <pcy35549@gmail.com>
Date: Fri, 1 Sep 2023 13:14:15 +0900
Subject: [PATCH] =?UTF-8?q?[=EB=B0=95=EC=B9=98=EC=98=81]=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Blueprints/AI/BP_ExampleEnemy.uasset      | Bin 36406 -> 36406 bytes
 Source/D1/AI/HumanoidEnemy.cpp                |   1 +
 Source/D1/AI/MasterAI.cpp                     |   3 +--
 Source/D1/AI/T_PerformAttack.cpp              |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content/CombatSystem/Blueprints/AI/BP_ExampleEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BP_ExampleEnemy.uasset
index 0688bc92713a8ad12fa8a5b20cc26958fdab9d49..edebda44b76514364fc78f054f0d6256bc3c75c4 100644
GIT binary patch
delta 62
zcmV-E0KxyZoC3C-0<bax5EU$ndG>0_O}GTk2#(tb#Ir&HNiPLH0000Cli`LJv!^gD
U50lGO9g<-LlOsklvnD_gPUGVi8vp<R

delta 64
zcmV-G0KfmXoC3C-0<bax5cBFI1Y2LlLzDc}1x3%*__IO*NiPLD0000Cli`LJv!^gD
W4+H=N005KlH5rqhIW@B-KoL$q4Hqc@

diff --git a/Source/D1/AI/HumanoidEnemy.cpp b/Source/D1/AI/HumanoidEnemy.cpp
index 39fdc0ce..711d1222 100644
--- a/Source/D1/AI/HumanoidEnemy.cpp
+++ b/Source/D1/AI/HumanoidEnemy.cpp
@@ -94,6 +94,7 @@ void AHumanoidEnemy::OnCombatToggled(bool IsCombatEnabled)
 
 void AHumanoidEnemy::PerformDeath()
 {
+	//TODO : 죽었을 때 무기에 Collision이 남아있는 버그 있음
 	Super::PerformDeath();
 	SimulateWeaponPhysics();
 }
diff --git a/Source/D1/AI/MasterAI.cpp b/Source/D1/AI/MasterAI.cpp
index 32316ddc..5d1a0f61 100644
--- a/Source/D1/AI/MasterAI.cpp
+++ b/Source/D1/AI/MasterAI.cpp
@@ -178,8 +178,7 @@ void AMasterAI::SetCanMove_Implementation(bool inputCanMove)
 
 void AMasterAI::ActivateCollision_Implementation(ECollisionPart CollisionPart)
 {
-	if(StateManagerComponent->GetCurrentState() != FCombatGameplayTags::Get().Character_State_Dead)	//TODO : 마지막 틱에서 충돌활성화 되는 이슈 방지...가 안됨.
-		MainWeaponCollisionComponent->ActivateCollision();
+	MainWeaponCollisionComponent->ActivateCollision();
 }
 
 void AMasterAI::DeactivateCollision_Implementation(ECollisionPart CollisionPart)
diff --git a/Source/D1/AI/T_PerformAttack.cpp b/Source/D1/AI/T_PerformAttack.cpp
index 9601c651..8ea74727 100644
--- a/Source/D1/AI/T_PerformAttack.cpp
+++ b/Source/D1/AI/T_PerformAttack.cpp
@@ -18,7 +18,7 @@ EBTNodeResult::Type UT_PerformAttack::ExecuteTask(UBehaviorTreeComponent& OwnerC
 	ICombatInterface* CombatInterface = Cast<ICombatInterface>(ControllingPawn);
 	if(!CombatInterface)
 		return EBTNodeResult::Failed;
-
+	
 	float actionDuration = CombatInterface->PerformCombatAttack(AttackTypeTag, AttackIndex, RandomIndex);
 	actionDuration += ActionDurationModifier;
 	FTimerHandle ActionTimer;