From deef14d8b58c7321434f364648e02b02432baf6a Mon Sep 17 00:00:00 2001 From: HappyTanuki Date: Sat, 7 Oct 2023 20:45:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=83=81=ED=95=9C=20=EB=A7=B5=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20abp=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Character/Lb/Animation/ABP_Lb.uasset | 4 ++-- Content/Character/Lb/BP_Lb.uasset | 4 ++-- Content/Maps/DevMap.umap | 4 ++-- Content/Maps/Untitled.umap | 3 --- .../PlayerGeneric/DefaultPlayerController.cpp | 19 ++++++++++++++----- .../PlayerGeneric/DefaultPlayerController.h | 3 ++- .../PlayerGeneric/DefaultPlayerState.cpp | 1 - 7 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 Content/Maps/Untitled.umap diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 8700d33..0a42e01 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:9106395cf5962f94dbfd58c77289cabe04829abd6c6d4e94fd1dc650d77deb29 -size 275233 +oid sha256:e790215f1968518d97a61ff6d8c56f7d14c3c7d7cb481025827daf3c4b0a90c6 +size 290801 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index ed5ae7a..e2d5ea3 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:5823f96c3536dcb4e632cd19dfc682a50b9b02d64e73e61f1fecbc0b09e4b4da -size 147586 +oid sha256:44edc4eaf0c0147046acc14266f5165ad830fbb9574d289de136b32cdbc08076 +size 139532 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 25747db..132dd6f 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:09c5c53a199a7602b7c34db2f1a33dd24dfb54c381cda29ed3b10b8175950004 -size 181094 +oid sha256:83759f90f993a37a6439fbe14a2bbd7701fee19631dab8a196432ca80a6eef09 +size 181915 diff --git a/Content/Maps/Untitled.umap b/Content/Maps/Untitled.umap deleted file mode 100644 index 7a9aa03..0000000 --- a/Content/Maps/Untitled.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a36218beca4eff11888aaf61c012df87c726ffca88541348f67089f84fc6ce11 -size 178041 diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 10ac6d9..ee3bd3e 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -220,8 +220,8 @@ void ADefaultPlayerController::SetupInputComponent() EnhancedInputComponent->BindAction(Skill1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill1); EnhancedInputComponent->BindAction(Skill2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill2); EnhancedInputComponent->BindAction(Skill3Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill3); - EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill4); - EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Completed, this, &ADefaultPlayerController::Skill4); + EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill4Triggered); + EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Completed, this, &ADefaultPlayerController::Skill4Completed); EnhancedInputComponent->BindAction(RuneSpell1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell1); EnhancedInputComponent->BindAction(RuneSpell2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell2); EnhancedInputComponent->BindAction(WardAction.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Ward); @@ -261,13 +261,22 @@ void ADefaultPlayerController::Skill3() GetPlayerState()->SetAttackType(CooldownType::Skill3); } -void ADefaultPlayerController::Skill4(const FInputActionValue& Value) +void ADefaultPlayerController::Skill4Triggered() { Server_SetRotation(GetMouseHitLocation()); - UE_LOG(LogTemp, Warning, TEXT("Skill4 %x"), Value); + UE_LOG(LogTemp, Warning, TEXT("Skill4 Triggered")); GetPlayerState()->SetState(ECharacterState::Attack); - GetPlayerState()->SetAttackType(CooldownType::Skill4Started); + GetPlayerState()->SetAttackType(CooldownType::Skill4Triggered); +} + +void ADefaultPlayerController::Skill4Completed() +{ + Server_SetRotation(GetMouseHitLocation()); + + UE_LOG(LogTemp, Warning, TEXT("Skill4 Completed")); + GetPlayerState()->SetState(ECharacterState::Attack); + GetPlayerState()->SetAttackType(CooldownType::Skill4Comlpleted); } void ADefaultPlayerController::RuneSpell1() diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.h b/Source/Promether/PlayerGeneric/DefaultPlayerController.h index a510b0b..ae1142e 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.h @@ -34,7 +34,8 @@ public: void Skill1(); void Skill2(); void Skill3(); - void Skill4(const FInputActionValue& Value); + void Skill4Triggered(); + void Skill4Completed(); void RuneSpell1(); void RuneSpell2(); void Ward(); diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp index 724738c..365a35f 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp @@ -6,7 +6,6 @@ ADefaultPlayerState::ADefaultPlayerState() CharacterBPRef = nullptr;; Team = TeamType::Null; State = ECharacterState::Idle; - InitPlayerStats(); } void ADefaultPlayerState::GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const