Compare commits
2 Commits
02e2318761
...
0f856ea26d
Author | SHA1 | Date | |
---|---|---|---|
0f856ea26d | |||
f549ed403d |
BIN
Content/Enemy/DA_Enemy.uasset
(Stored with Git LFS)
BIN
Content/Enemy/DA_Enemy.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemy/DA_HeavyEnemy.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Enemy/DA_HeavyEnemy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Enemy/DA_LightEnemy.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Enemy/DA_LightEnemy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Enemy/DA_NormalEnemy.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Enemy/DA_NormalEnemy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Gamemode/BP_DefaultGamemode.uasset
(Stored with Git LFS)
BIN
Content/Gamemode/BP_DefaultGamemode.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Meshes/SM_Enemy.uasset
(Stored with Git LFS)
BIN
Content/Meshes/SM_Enemy.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Meshes/SM_HeavyEnemy.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Meshes/SM_HeavyEnemy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Meshes/SM_LightEnemy.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Meshes/SM_LightEnemy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Meshes/SM_NormalEnemy.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Meshes/SM_NormalEnemy.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -118,6 +118,7 @@ void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* Enem
|
|||||||
OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem;
|
OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem;
|
||||||
HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth);
|
HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth);
|
||||||
GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed;
|
GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed;
|
||||||
|
Damage = EnemyDataAsset->Damage;
|
||||||
|
|
||||||
PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset);
|
PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset);
|
||||||
PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset);
|
PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset);
|
||||||
@ -136,6 +137,7 @@ void AEnemyCharacter::ResetData_Implementation()
|
|||||||
OnDeathNiagaraSystem = nullptr;
|
OnDeathNiagaraSystem = nullptr;
|
||||||
HealthComponent->SetMaxHealth(100.0f);
|
HealthComponent->SetMaxHealth(100.0f);
|
||||||
GetCharacterMovement()->MaxWalkSpeed = 300.0f;
|
GetCharacterMovement()->MaxWalkSpeed = 300.0f;
|
||||||
|
Damage = 5.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
float AEnemyCharacter::GetCapsuleRadius_Implementation()
|
float AEnemyCharacter::GetCapsuleRadius_Implementation()
|
||||||
|
@ -51,4 +51,7 @@ public:
|
|||||||
|
|
||||||
UPROPERTY(EditDefaultsOnly, Category = "Properties")
|
UPROPERTY(EditDefaultsOnly, Category = "Properties")
|
||||||
float MovementSpeed = 300.0f;
|
float MovementSpeed = 300.0f;
|
||||||
|
|
||||||
|
UPROPERTY(EditDefaultsOnly, Category = "Properties")
|
||||||
|
float Damage = 5.0f;
|
||||||
};
|
};
|
||||||
|
@ -148,12 +148,14 @@ AObjectPoolManager* AVampireGameMode::GetPickupObjectPoolManager_Implementation(
|
|||||||
|
|
||||||
void AVampireGameMode::AddRandomEnemyTypeToPool()
|
void AVampireGameMode::AddRandomEnemyTypeToPool()
|
||||||
{
|
{
|
||||||
if (EnemyDataAssets.Num() > 0)
|
// if (EnemyDataAssets.Num() > 0)
|
||||||
{
|
// {
|
||||||
int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1);
|
// int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1);
|
||||||
SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]);
|
// SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]);
|
||||||
EnemyDataAssets.RemoveAt(rand);
|
// EnemyDataAssets.RemoveAt(rand);
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
SpawnableEnemyDataAssets = EnemyDataAssets;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo)
|
void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user