diff --git a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset index 46b0ea0..49ee2d1 100644 --- a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset +++ b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34405aea280fc58dfc0e1c30360da97999b2d5ca3f411ed7903ed20cc08383b2 -size 89790 +oid sha256:0aa427e46f1151c85266dcc8175c349f2dba4971635ebb051b051005b61840bb +size 78485 diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 5a81b45..d29ede7 100644 --- a/Content/Character/Lb/Animation/ABP_Lb.uasset +++ b/Content/Character/Lb/Animation/ABP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55f905bcd305f8c23ee484fa11fcae581e830cb01132382ee18d7aba8035c2b0 -size 337395 +oid sha256:ce0ed96422d7f8fad1f1e0fb8c2a7ea2add332856640dc661bb1432b467a69d6 +size 318372 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 2a2539b..980d796 100644 --- a/Content/Character/Lb/BP_Lb.uasset +++ b/Content/Character/Lb/BP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef3a8d2091e2f05a34e607cc7d77dc9cc06dae22cde931e47403e2099bbef919 -size 225250 +oid sha256:8e946cefb98a5ed6565c5943efc6b51bf020c23797380b3a2ae75db37cb45ba5 +size 238249 diff --git a/Content/Character/Lb/EskillBuff.uasset b/Content/Character/Lb/EskillBuff.uasset index 52dd2d0..4ee7c33 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:16f2ee0c1da6bd0f378feb16a43266eb6d20baf925ef69f4d8e8548c4a566f14 -size 98732 +oid sha256:d10fea60f675537a077865e12c7f5bdab7d7a58751471eb7271b7f72e91bdb31 +size 93517 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 54d300c..4abe91d 100644 --- a/Content/Maps/DevMap.umap +++ b/Content/Maps/DevMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3f39c3aa2f0c7cf8c4c6038d81ec823474c5a05d4e0754ca5267d76f8e9eaa6 -size 178928 +oid sha256:b9cb626a34e7de3e2f930faf6c5f4e23b7a5bf7420f69bfa539880e78c5d50c4 +size 179055 diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index b1ca90d..bd5c6b8 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -386,8 +386,18 @@ void ADefaultPlayerController::Move() GetHitResultUnderCursorForObjects(ObjectTypes, true, HitResult); ACharacter* HitCharacter = Cast(HitResult.GetActor()); //오브젝트를 가져와 HitCharactor에 저장<<추후 적 캐릭터일때만 저장으로 변경해야함 - if (HitCharacter != nullptr) //지금은 HitObject가 null이 아닐 경우 Attack()을 실행하는 코드지만, HitObject가 적 캐릭터일 때 실행으로 변경해야함 + UE_LOG(LogTemp, Warning, TEXT("%s"), *HitResult.GetActor()->GetName()); + + if (HitResult.GetActor() != GetPawn()) //지금은 HitObject가 null이 아닐 경우 Attack()을 실행하는 코드지만, HitObject가 적 캐릭터일 때 실행으로 변경해야함 { + if (!HitCharacter) + { + FVector Destination = GetMouseHitLocation(); + GetPlayerState()->SetState(ECharacterState::Moving); + SimpleMoveToLocation(this, Destination); + this->MoveToLocation(Destination); + return; + } Attack(HitCharacter); //HitObject를 대상으로 Attack 실행 } else @@ -564,8 +574,6 @@ void ADefaultPlayerController::OnMoveCompleted(FAIRequestID RequestID, const FPa void ADefaultPlayerController::Attack(ACharacter* HitObject) { - if (!HitObject) return; - float MinDistance = GetPlayerState()->Stats[(uint8)EStats:: AttackRange]; FVector Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정