Compare commits
	
		
			2 Commits
		
	
	
		
			12291c9b19
			...
			8af6871538
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8af6871538 | |||
| 486991daf0 | 
							
								
								
									
										
											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/Pickups/EXP/BP_BlueEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Pickups/EXP/BP_BlueEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Pickups/EXP/BP_GreenEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Pickups/EXP/BP_GreenEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Pickups/EXP/BP_RedEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Pickups/EXP/BP_RedEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Pickups/EXP/DA_BlueEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Pickups/EXP/DA_BlueEXPPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Pickups/Gold/BP_GoldPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Pickups/Gold/BP_GoldPickup.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection-2.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection-2.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection-2_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection-2_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/Coins/coin-collection_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/Enemies/MS_EnemyDamaged.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/Enemies/MS_EnemyDamaged.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/Enemies/MS_EnemyKilled.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/Enemies/MS_EnemyKilled.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection-2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection-2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection-2_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection-2_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Sounds/coin-collection_Cue.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							@ -50,6 +50,10 @@ UBehaviorTree* AEnemyCharacter::GetBehaviorTree()
 | 
			
		||||
 | 
			
		||||
void AEnemyCharacter::OnDamaged(FDamageInfo damageInfo)
 | 
			
		||||
{
 | 
			
		||||
	if (OnDamagedSound)
 | 
			
		||||
	{
 | 
			
		||||
		UGameplayStatics::PlaySoundAtLocation(GetWorld(), OnDamagedSound, GetActorLocation());
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void AEnemyCharacter::OnDeath(FDamageInfo damageInfo)
 | 
			
		||||
@ -71,6 +75,11 @@ void AEnemyCharacter::OnDeath(FDamageInfo damageInfo)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (OnDeathSound)
 | 
			
		||||
	{
 | 
			
		||||
		UGameplayStatics::PlaySoundAtLocation(GetWorld(), OnDeathSound, GetActorLocation());
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* enemyDataAsset)
 | 
			
		||||
@ -80,6 +89,8 @@ void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* enem
 | 
			
		||||
		StaticMeshComponent->SetStaticMesh(enemyDataAsset->StaticMesh);
 | 
			
		||||
		BehaviorTree = enemyDataAsset->BehaviorTree;
 | 
			
		||||
		PickupTemplate = enemyDataAsset->PickupDataAsset;
 | 
			
		||||
		OnDamagedSound = enemyDataAsset->OnDamagedSoundBase;
 | 
			
		||||
		OnDeathSound = enemyDataAsset->OnDeathSoundBase;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -88,6 +99,8 @@ void AEnemyCharacter::ResetData_Implementation()
 | 
			
		||||
	StaticMeshComponent->SetStaticMesh(nullptr);
 | 
			
		||||
	BehaviorTree = nullptr;
 | 
			
		||||
	PickupTemplate = nullptr;
 | 
			
		||||
	OnDamagedSound = nullptr;
 | 
			
		||||
	OnDeathSound = nullptr;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
float AEnemyCharacter::GetCapsuleRadius_Implementation()
 | 
			
		||||
 | 
			
		||||
@ -27,4 +27,10 @@ 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;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -36,6 +36,12 @@ 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();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user