Compare commits
No commits in common. "c474aa440574fef0a33f7a0b7a59b24041357488" and "ad2034b15dc4be1c5e9035994c003fc2339f47fa" have entirely different histories.
c474aa4405
...
ad2034b15d
@ -275,13 +275,6 @@ void ANakatomiCharacter::PlayOnFireAnimations()
|
|||||||
|
|
||||||
void ANakatomiCharacter::OnDamaged()
|
void ANakatomiCharacter::OnDamaged()
|
||||||
{
|
{
|
||||||
int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1);
|
|
||||||
|
|
||||||
if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr)
|
|
||||||
{
|
|
||||||
//TODO: Disable movement while playing animation montage
|
|
||||||
// PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ANakatomiCharacter::OnDeath()
|
void ANakatomiCharacter::OnDeath()
|
||||||
|
@ -42,9 +42,6 @@ public:
|
|||||||
UPROPERTY(EditDefaultsOnly)
|
UPROPERTY(EditDefaultsOnly)
|
||||||
UAnimMontage* FireWeaponAnimMontage;
|
UAnimMontage* FireWeaponAnimMontage;
|
||||||
|
|
||||||
UPROPERTY(EditDefaultsOnly)
|
|
||||||
TArray<UAnimMontage*> OnDamagedHitAnimMontages;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
|
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
|
||||||
UNakatomiCMC* NakatomiCMC;
|
UNakatomiCMC* NakatomiCMC;
|
||||||
|
@ -460,6 +460,14 @@ void APlayerCharacter::PlayOnFireAnimations()
|
|||||||
void APlayerCharacter::OnDamaged()
|
void APlayerCharacter::OnDamaged()
|
||||||
{
|
{
|
||||||
Super::OnDamaged();
|
Super::OnDamaged();
|
||||||
|
|
||||||
|
int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1);
|
||||||
|
|
||||||
|
if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr)
|
||||||
|
{
|
||||||
|
//TODO: Disable movement while playing animation montage
|
||||||
|
PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void APlayerCharacter::OnDeath()
|
void APlayerCharacter::OnDeath()
|
||||||
|
@ -89,6 +89,9 @@ public:
|
|||||||
UPROPERTY(EditDefaultsOnly)
|
UPROPERTY(EditDefaultsOnly)
|
||||||
UAnimMontage* ThrowExplosiveAnimMontage;
|
UAnimMontage* ThrowExplosiveAnimMontage;
|
||||||
|
|
||||||
|
UPROPERTY(EditDefaultsOnly)
|
||||||
|
TArray<UAnimMontage*> OnDamagedHitAnimMontages;
|
||||||
|
|
||||||
UPROPERTY(EditDefaultsOnly)
|
UPROPERTY(EditDefaultsOnly)
|
||||||
UAnimMontage* FireWeaponADSAnimMontage;
|
UAnimMontage* FireWeaponADSAnimMontage;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user