[박치영] Shield 추가작업

Config/DefaultEngine.ini

@@ -150,4 +150,5 @@ ManualIPAddress=
 +PropertyRedirects=(OldName="/Script/D1.MasterAI.MainWeaponCollisionComponent",NewName="/Script/D1.MasterAI.RightWeaponCollisionComponent")
 +PropertyRedirects=(OldName="/Script/D1.MasterAI.RightWeaponCollisionComponent",NewName="/Script/D1.MasterAI.MainCollisionComponent")
 +PropertyRedirects=(OldName="/Script/D1.MasterAI.LeftWeaponCollisionComponent",NewName="/Script/D1.MasterAI.SubCollisionComponent")
++PropertyRedirects=(OldName="/Script/D1.CombatPlayerCharacter.Weapon",NewName="/Script/D1.CombatPlayerCharacter.StartingEquipment")
 

Source/D1/Actor/BaseShield.cpp

@@ -3,3 +3,34 @@
 
 #include "Actor/BaseShield.h"
 
+#include "Components/CollisionComponent.h"
+#include "Components/CombatComponent.h"
+#include "GameFramework/Character.h"
+
+void ABaseShield::OnEquipped()
+{
+	SetIsEquipped(true);
+	AActor* owner = GetOwner();
+	if (!owner)
+		return;
+	CombatComponent = owner->GetComponentByClass<UCombatComponent>();
+	CombatComponent->OnCombatToggled.BindUObject(this, &ABaseWeapon::ToggleWeaponCombat);
+	
+	OwnerStateManager = owner->GetComponentByClass<UStateManagerComponent>();
+	
+	if (CombatComponent->GetCombatEnabled())
+		AttachActor(HandSocketName);
+	else
+		AttachActor(AttachSocketName);
+	
+	CombatComponent->SetShieldWeapon(this);
+
+	CollisionComponent->SetCollisionMeshComponent(GetItemMesh());
+	CollisionComponent->AddActorToIgnore(GetOwner());
+}
+
+void ABaseShield::OnUnequipped()
+{
+	Super::OnUnequipped();
+	CombatComponent->SetShieldWeapon(nullptr);
+}

Source/D1/Actor/BaseShield.h

@@ -14,4 +14,7 @@ class D1_API ABaseShield : public ABaseWeapon
 {
 	GENERATED_BODY()
 
+public:
+	virtual void OnEquipped() override;
+	virtual void OnUnequipped() override;
 };

Source/D1/Actor/BaseWeapon.cpp

@@ -55,7 +55,7 @@ void ABaseWeapon::OnEquipped()
 	
 	OwnerStateManager = owner->GetComponentByClass<UStateManagerComponent>();
 	
-	if (CombatComponent->GetCombatEnabled())
+	if (CombatComponent->GetCombatEnabled())	//TODO : 방패 착용 후 Toggle Event 시 Weapon의 소켓이 안바뀌는 버그
 		AttachActor(HandSocketName);
 	else
 		AttachActor(AttachSocketName);

Source/D1/Actor/BaseWeapon.h

@@ -24,7 +24,7 @@ public:
 
 public:
 	//override
-	void OnEquipped() override;
+	virtual void OnEquipped() override;
 
 public:
 	//Delegate

Source/D1/Animation/CombatAnimInstance.cpp

@@ -20,7 +20,10 @@ void UCombatAnimInstance::NativeInitializeAnimation()
 		UCombatComponent* CombatComponent = Character->GetComponentByClass<UCombatComponent>();
 		ensure(CombatComponent);
 		if(IsValid(CombatComponent))
+		{
 			CombatComponent->OnCombatToggled.BindUObject(this, &UCombatAnimInstance::UpdateCombatEnabled);
+			CombatComponent->OnBlockingSet.BindUObject(this, &UCombatAnimInstance::OnBlockingSet_Event);
+		}
 	}
 }
 
@@ -51,3 +54,8 @@ void UCombatAnimInstance::UpdateCombatEnabled(bool combatEnabled)
 {
 	CombatEnabled = combatEnabled;
 }
+
+void UCombatAnimInstance::OnBlockingSet_Event(bool bIsBlock)
+{
+	IsBlocking = bIsBlock;
+}

Source/D1/Animation/CombatAnimInstance.h

@@ -25,6 +25,7 @@ public:
 	
 public:	//Delegate
 	void UpdateCombatEnabled(bool combatEnabled);
+	void OnBlockingSet_Event(bool bIsBlock);
 	
 private:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="References", meta=(AllowPrivateAccess="true"))
@@ -47,4 +48,7 @@ private:
 	ECombatType CombatType;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"))
 	bool CombatEnabled;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"))
+	bool IsBlocking;
 };

Source/D1/CombatPlayerCharacter.cpp

@@ -124,9 +124,12 @@ void ACombatPlayerCharacter::BeginPlay()
 	FActorSpawnParameters spawnParam;
 	spawnParam.Owner = this;
 	spawnParam.Instigator = this;
-	ABaseEquippable* SpawnItem = Cast<ABaseEquippable>(GetWorld()->SpawnActor(Weapon, &GetActorTransform(), spawnParam));
+	for (auto Equipment : StartingEquipment)
+	{
+		ABaseEquippable* SpawnItem = Cast<ABaseEquippable>(GetWorld()->SpawnActor(Equipment, &GetActorTransform(), spawnParam));
 		if (SpawnItem)
 			SpawnItem->OnEquipped();
+	}
 
 	//Setting Timeline - if you set on Constructor, Can not get Curve
 	FOnTimelineFloat TimelineFloatCallback;
@@ -945,6 +948,8 @@ bool ACombatPlayerCharacter::CanPerformBlock()
 	inputContainer.AddTag(FCombatGameplayTags::Get().Character_State_GeneralActionState);
 
 	ReturnValue &= !StateManagerComponent->IsCurrentStateEqualToAny(inputContainer);
+	ReturnValue &= CombatComponent->GetCombatEnabled();
+	ReturnValue &= IsValid(CombatComponent->GetShieldWeapon());
 	
 	return ReturnValue;
 }

Source/D1/CombatPlayerCharacter.h

@@ -204,8 +204,9 @@ public:
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Components", meta=(AllowPrivateAccess="true"))
 	TObjectPtr<UTargetingComponent> TargetingComponent;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Weapon", meta = (AllowPrivateAccess = "true"))
-	TSubclassOf<class ABaseEquippable> Weapon;
+	//TODO : 방패 착용 후 Toggle Event 시 Weapon의 소켓이 안바뀌는 버그
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Equipment", meta = (AllowPrivateAccess = "true"))
+	TArray<TSubclassOf<class ABaseEquippable>> StartingEquipment;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Hit", meta = (AllowPrivateAccess = "true"))
 	FName PelvisBoneName;

Source/D1/Components/CombatComponent.cpp

@@ -57,7 +57,7 @@ void UCombatComponent::SetBlockingState(bool enableBlocking)
 	if(enableBlocking != bIsBlocking)
 	{
 		bIsBlocking = enableBlocking;
+		OnBlockingSet.Execute(bIsBlocking);
 	}
-	onBlockingSet.Execute(bIsBlocking);	// TODO : 이거 맞나?
 }
 

Source/D1/Components/CombatComponent.h

@@ -62,5 +62,5 @@ private:
 	
 public:	//Delegate
 	FOnCombatToggled OnCombatToggled;
-	FOnBlockingSet onBlockingSet;
+	FOnBlockingSet OnBlockingSet;
 };