Compare commits

...

3 Commits

10 changed files with 124 additions and 36 deletions

BIN
Content/AnimStarterPack/Throw_Explosive_Montage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/AnimStarterPack/Throw_Weapon_Montage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Player/PlayerCharacter.uasset (Stored with Git LFS)

Binary file not shown.

View File

@ -0,0 +1,15 @@
// Fill out your copyright notice in the Description page of Project Settings.
#include "../AnimNotify/NakatomiThrowExplosiveNotify.h"
#include "Nakatomi/PlayerCharacter.h"
void UNakatomiThrowExplosiveNotify::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation)
{
APlayerCharacter* Character = Cast<APlayerCharacter>(MeshComp->GetOwner());
if (Character != nullptr)
{
Character->ThrowExplosive();
}
}

View File

@ -0,0 +1,21 @@
// Fill out your copyright notice in the Description page of Project Settings.
#pragma once
#include "CoreMinimal.h"
#include "Animation/AnimNotifies/AnimNotify.h"
#include "NakatomiThrowExplosiveNotify.generated.h"
/**
*
*/
UCLASS()
class NAKATOMI_API UNakatomiThrowExplosiveNotify : public UAnimNotify
{
GENERATED_BODY()
public:
virtual void Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation) override;
};

View File

@ -0,0 +1,16 @@
// Fill out your copyright notice in the Description page of Project Settings.
#include "../AnimNotify/NakatomiThrowWeaponNotify.h"
#include "Nakatomi/PlayerCharacter.h"
void UNakatomiThrowWeaponNotify::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation)
{
APlayerCharacter* Character = Cast<APlayerCharacter>(MeshComp->GetOwner());
if (Character != nullptr)
{
Character->ThrowWeapon();
}
}

View File

@ -0,0 +1,20 @@
// Fill out your copyright notice in the Description page of Project Settings.
#pragma once
#include "CoreMinimal.h"
#include "Animation/AnimNotifies/AnimNotify.h"
#include "NakatomiThrowWeaponNotify.generated.h"
/**
*
*/
UCLASS()
class NAKATOMI_API UNakatomiThrowWeaponNotify : public UAnimNotify
{
GENERATED_BODY()
public:
virtual void Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation) override;
};

View File

@ -703,8 +703,12 @@ void APlayerCharacter::ThrowWeaponCallback()
{
if (CurrentWeapon)
{
PlayAnimMontage(ThrowAnimMontage);
PlayAnimMontage(ThrowWeaponAnimMontage);
}
}
void APlayerCharacter::ThrowWeapon()
{
FVector Location;
FVector BoxExtent;
GetActorBounds(true, Location, BoxExtent, false);
@ -721,15 +725,18 @@ void APlayerCharacter::ThrowWeaponCallback()
Throwable->SetWeaponSkeletalMesh(GetCurrentWeapon()->GetSkeletalMesh());
RemoveCurrentWeaponFromInventory();
}
}
void APlayerCharacter::ThrowExplosiveCallback()
{
if (ThrowableInventory.Num() > 0)
{
PlayAnimMontage(ThrowAnimMontage);
PlayAnimMontage(ThrowExplosiveAnimMontage);
}
}
void APlayerCharacter::ThrowExplosive()
{
FVector Location;
FVector BoxExtent;
GetActorBounds(true, Location, BoxExtent, false);
@ -740,7 +747,6 @@ void APlayerCharacter::ThrowExplosiveCallback()
SpawnLocation.Z += BoxExtent.Z;
GetWorld()->SpawnActor<AThrowable>(ThrowableInventory.Pop(), SpawnLocation, FRotator::ZeroRotator);
}
}
AThrowable* APlayerCharacter::ThrowThrowable()

View File

@ -84,7 +84,10 @@ public:
FOnEnemyHitDelegate OnEnemyHit;
UPROPERTY(EditDefaultsOnly)
UAnimMontage* ThrowAnimMontage;
UAnimMontage* ThrowWeaponAnimMontage;
UPROPERTY(EditDefaultsOnly)
UAnimMontage* ThrowExplosiveAnimMontage;
protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
@ -217,8 +220,12 @@ public:
void ThrowWeaponCallback();
void ThrowWeapon();
void ThrowExplosiveCallback();
void ThrowExplosive();
AThrowable* ThrowThrowable();
UFUNCTION(BlueprintCallable)