pcy35549
/
D1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[박치영] Shield 모션 작업

main
PCYPC\pcy35 2023-11-15 15:37:42 +09:00
parent 34180c0ebf
commit e153ca9ccc
15 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset
View File

Binary file not shown.

BIN
Content/ParagonKwang/Animations/ABP_Kwang.uasset
View File

Binary file not shown.

BIN
Content/ParagonKwang/Characters/Heroes/Kwang/Meshes/Kwang_Skeleton.uasset
View File

Binary file not shown.

2
Source/D1/AI/BossEnemy.cpp
View File

@ -46,7 +46,7 @@ ABossEnemy::ABossEnemy()
//Setting CombatComponent //Setting CombatComponent
//Setting others is Parents //Setting others is Parents
CombatComponent->OnCombatToggled.BindUObject(this, &ABossEnemy::OnCombatToggled); CombatComponent->OnCombatToggled.AddUObject(this, &ABossEnemy::OnCombatToggled);
} }
void ABossEnemy::BeginPlay() void ABossEnemy::BeginPlay()

2
Source/D1/AI/CombatAIController.cpp
View File

@ -45,7 +45,7 @@ void ACombatAIController::OnPossess(APawn* InPawn)
MasterAI = AIpawn; MasterAI = AIpawn;
UCombatComponent* combatComponent = MasterAI->GetComponentByClass<UCombatComponent>(); UCombatComponent* combatComponent = MasterAI->GetComponentByClass<UCombatComponent>();
combatComponent->OnCombatToggled.BindUObject(this, &ACombatAIController::OnCombatToggle); combatComponent->OnCombatToggled.AddUObject(this, &ACombatAIController::OnCombatToggle);
RunBehaviorTree(MasterAI->GetBeHaviorTree()); RunBehaviorTree(MasterAI->GetBeHaviorTree());

2
Source/D1/AI/GruntlingEnemy.cpp
View File

@ -44,7 +44,7 @@ AGruntlingEnemy::AGruntlingEnemy()
//Setting CombatComponent //Setting CombatComponent
//Setting others is Parents //Setting others is Parents
CombatComponent->OnCombatToggled.BindUObject(this, &AGruntlingEnemy::OnCombatToggled); CombatComponent->OnCombatToggled.AddUObject(this, &AGruntlingEnemy::OnCombatToggled);
} }
void AGruntlingEnemy::BeginPlay() void AGruntlingEnemy::BeginPlay()

2
Source/D1/AI/HeavyMobEnemy.cpp
View File

@ -44,7 +44,7 @@ AHeavyMobEnemy::AHeavyMobEnemy()
//Setting CombatComponent //Setting CombatComponent
//Setting others is Parents //Setting others is Parents
CombatComponent->OnCombatToggled.BindUObject(this, &AHeavyMobEnemy::OnCombatToggled); CombatComponent->OnCombatToggled.AddUObject(this, &AHeavyMobEnemy::OnCombatToggled);
} }
void AHeavyMobEnemy::BeginPlay() void AHeavyMobEnemy::BeginPlay()

2
Source/D1/AI/MobEnemy.cpp
View File

@ -38,7 +38,7 @@ AMobEnemy::AMobEnemy()
//Setting CombatComponent //Setting CombatComponent
//Setting others is Parents //Setting others is Parents
CombatComponent->OnCombatToggled.BindUObject(this, &AMobEnemy::OnCombatToggled); CombatComponent->OnCombatToggled.AddUObject(this, &AMobEnemy::OnCombatToggled);
} }
void AMobEnemy::BeginPlay() void AMobEnemy::BeginPlay()

2
Source/D1/Actor/BaseShield.cpp
View File

@ -14,7 +14,7 @@ void ABaseShield::OnEquipped()
if (!owner) if (!owner)
return; return;
CombatComponent = owner->GetComponentByClass<UCombatComponent>(); CombatComponent = owner->GetComponentByClass<UCombatComponent>();
CombatComponent->OnCombatToggled.BindUObject(this, &ABaseWeapon::ToggleWeaponCombat); CombatComponent->OnCombatToggled.AddUObject(this, &ABaseWeapon::ToggleWeaponCombat);
OwnerStateManager = owner->GetComponentByClass<UStateManagerComponent>(); OwnerStateManager = owner->GetComponentByClass<UStateManagerComponent>();

4
Source/D1/Actor/BaseWeapon.cpp
View File

@ -51,11 +51,11 @@ void ABaseWeapon::OnEquipped()
if (!owner) if (!owner)
return; return;
CombatComponent = owner->GetComponentByClass<UCombatComponent>(); CombatComponent = owner->GetComponentByClass<UCombatComponent>();
CombatComponent->OnCombatToggled.BindUObject(this, &ABaseWeapon::ToggleWeaponCombat); CombatComponent->OnCombatToggled.AddUObject(this, &ABaseWeapon::ToggleWeaponCombat);
OwnerStateManager = owner->GetComponentByClass<UStateManagerComponent>(); OwnerStateManager = owner->GetComponentByClass<UStateManagerComponent>();
if (CombatComponent->GetCombatEnabled()) //TODO : 방패 착용 후 Toggle Event 시 Weapon의 소켓이 안바뀌는 버그 if (CombatComponent->GetCombatEnabled())
AttachActor(HandSocketName); AttachActor(HandSocketName);
else else
AttachActor(AttachSocketName); AttachActor(AttachSocketName);

4
Source/D1/Animation/CombatAnimInstance.cpp
View File

@ -21,8 +21,8 @@ void UCombatAnimInstance::NativeInitializeAnimation()
ensure(CombatComponent); ensure(CombatComponent);
if(IsValid(CombatComponent)) if(IsValid(CombatComponent))
{ {
CombatComponent->OnCombatToggled.BindUObject(this, &UCombatAnimInstance::UpdateCombatEnabled); CombatComponent->OnCombatToggled.AddUObject(this, &UCombatAnimInstance::UpdateCombatEnabled);
CombatComponent->OnBlockingSet.BindUObject(this, &UCombatAnimInstance::OnBlockingSet_Event); CombatComponent->OnBlockingSet.AddUObject(this, &UCombatAnimInstance::OnBlockingSet_Event);
} }
} }
} }

12
Source/D1/CombatPlayerCharacter.cpp
View File

@ -69,7 +69,7 @@ ACombatPlayerCharacter::ACombatPlayerCharacter()
// Setting CombatComponent // Setting CombatComponent
CombatComponent = CreateDefaultSubobject<UCombatComponent>(TEXT("CombatComponent")); CombatComponent = CreateDefaultSubobject<UCombatComponent>(TEXT("CombatComponent"));
CombatComponent->OnCombatToggled.BindUObject(this, &ACombatPlayerCharacter::CharacterCombatToggled); CombatComponent->OnCombatToggled.AddUObject(this, &ACombatPlayerCharacter::CharacterCombatToggled);
// Setting StateManagerComponent // Setting StateManagerComponent
StateManagerComponent = CreateDefaultSubobject<UStateManagerComponent>(TEXT("StateManagerComponent")); StateManagerComponent = CreateDefaultSubobject<UStateManagerComponent>(TEXT("StateManagerComponent"));
@ -251,7 +251,8 @@ void ACombatPlayerCharacter::SetupPlayerInputComponent(class UInputComponent* Pl
EnhancedInputComponent->BindAction(ToggleLockOnAction, ETriggerEvent::Started, this, &ACombatPlayerCharacter::ToggleLockOn); EnhancedInputComponent->BindAction(ToggleLockOnAction, ETriggerEvent::Started, this, &ACombatPlayerCharacter::ToggleLockOn);
//Block //Block
EnhancedInputComponent->BindAction(ToggleLockOnAction, ETriggerEvent::Started, this, &ACombatPlayerCharacter::ToggleLockOn); EnhancedInputComponent->BindAction(BlockAction, ETriggerEvent::Triggered, this, &ACombatPlayerCharacter::Blocking);
EnhancedInputComponent->BindAction(BlockAction, ETriggerEvent::Completed, this, &ACombatPlayerCharacter::StopBlocking);
} }
} }
@ -545,10 +546,11 @@ void ACombatPlayerCharacter::Blocking(const FInputActionValue& Value)
{ {
CombatComponent->SetBlockingState(true); CombatComponent->SetBlockingState(true);
} }
else }
{
void ACombatPlayerCharacter::StopBlocking(const FInputActionValue& Value)
{
CombatComponent->SetBlockingState(false); CombatComponent->SetBlockingState(false);
}
} }
void ACombatPlayerCharacter::CharacterStateBegin(FGameplayTag CharState) void ACombatPlayerCharacter::CharacterStateBegin(FGameplayTag CharState)

1
Source/D1/CombatPlayerCharacter.h
View File

@ -151,6 +151,7 @@ protected:
void StopSprint(const FInputActionValue& Value); void StopSprint(const FInputActionValue& Value);
void ToggleLockOn(const FInputActionValue& Value); void ToggleLockOn(const FInputActionValue& Value);
void Blocking(const FInputActionValue& Value); void Blocking(const FInputActionValue& Value);
void StopBlocking(const FInputActionValue& Value);
private://Delegate private://Delegate
void CharacterStateBegin(FGameplayTag CharState); void CharacterStateBegin(FGameplayTag CharState);

4
Source/D1/Components/CombatComponent.cpp
View File

@ -19,7 +19,7 @@ void UCombatComponent::SetCombatEnabled(bool bInputCombat)
{ {
bCombatEnabled = bInputCombat; bCombatEnabled = bInputCombat;
OnCombatToggled.Execute(bInputCombat); OnCombatToggled.Broadcast(bInputCombat);
// ACharacter* character = Cast<ACharacter>(GetOwner()); // ACharacter* character = Cast<ACharacter>(GetOwner());
// if (character) // if (character)
@ -57,7 +57,7 @@ void UCombatComponent::SetBlockingState(bool enableBlocking)
if(enableBlocking != bIsBlocking) if(enableBlocking != bIsBlocking)
{ {
bIsBlocking = enableBlocking; bIsBlocking = enableBlocking;
OnBlockingSet.Execute(bIsBlocking); OnBlockingSet.Broadcast(bIsBlocking);
} }
} }

4
Source/D1/Components/CombatComponent.h
View File

@ -6,8 +6,8 @@
#include "Components/ActorComponent.h" #include "Components/ActorComponent.h"
#include "CombatComponent.generated.h" #include "CombatComponent.generated.h"
DECLARE_DELEGATE_OneParam(FOnCombatToggled, bool); DECLARE_MULTICAST_DELEGATE_OneParam(FOnCombatToggled, bool);
DECLARE_DELEGATE_OneParam(FOnBlockingSet, bool); DECLARE_MULTICAST_DELEGATE_OneParam(FOnBlockingSet, bool);
class ABaseWeapon; class ABaseWeapon;
UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )