Compare commits

..

No commits in common. "8af687153850449192f3bec29de4bc97b6d3f1ea" and "12291c9b190efc5e3a0bd8c6fbb4386d09bbf9da" have entirely different histories.

19 changed files with 24 additions and 55 deletions

BIN
Content/Enemy/DA_Enemy.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Pickups/EXP/BP_RedEXPPickup.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Pickups/Gold/BP_GoldPickup.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Sounds/coin-collection-2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Sounds/coin-collection-2_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Sounds/coin-collection.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Sounds/coin-collection_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -50,10 +50,6 @@ UBehaviorTree* AEnemyCharacter::GetBehaviorTree()
void AEnemyCharacter::OnDamaged(FDamageInfo damageInfo)
{
if (OnDamagedSound)
{
UGameplayStatics::PlaySoundAtLocation(GetWorld(), OnDamagedSound, GetActorLocation());
}
}
void AEnemyCharacter::OnDeath(FDamageInfo damageInfo)
@ -75,11 +71,6 @@ void AEnemyCharacter::OnDeath(FDamageInfo damageInfo)
}
}
}
if (OnDeathSound)
{
UGameplayStatics::PlaySoundAtLocation(GetWorld(), OnDeathSound, GetActorLocation());
}
}
void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* enemyDataAsset)
@ -89,8 +80,6 @@ void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* enem
StaticMeshComponent->SetStaticMesh(enemyDataAsset->StaticMesh);
BehaviorTree = enemyDataAsset->BehaviorTree;
PickupTemplate = enemyDataAsset->PickupDataAsset;
OnDamagedSound = enemyDataAsset->OnDamagedSoundBase;
OnDeathSound = enemyDataAsset->OnDeathSoundBase;
}
}
@ -99,8 +88,6 @@ void AEnemyCharacter::ResetData_Implementation()
StaticMeshComponent->SetStaticMesh(nullptr);
BehaviorTree = nullptr;
PickupTemplate = nullptr;
OnDamagedSound = nullptr;
OnDeathSound = nullptr;
}
float AEnemyCharacter::GetCapsuleRadius_Implementation()

View File

@ -27,10 +27,4 @@ public:
UPROPERTY(EditDefaultsOnly, Meta = (AllowPrivateAccess = "true"))
UPickupDataAsset* PickupDataAsset = nullptr;
UPROPERTY(EditDefaultsOnly, Meta = (AllowPrivateAccess = "true"))
TObjectPtr<USoundBase> OnDamagedSoundBase = nullptr;
UPROPERTY(EditDefaultsOnly, Meta = (AllowPrivateAccess = "true"))
TObjectPtr<USoundBase> OnDeathSoundBase = nullptr;
};

View File

@ -36,12 +36,6 @@ protected:
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UWeaponInventoryComponent* WeaponInventoryComponent;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
USoundBase* OnDamagedSound;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
USoundBase* OnDeathSound;
public:
// Sets default values for this character's properties
AVampireCharacter();