diff --git a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset index c710ec7f..28e47abc 100644 Binary files a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset and b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset differ diff --git a/Content/CombatSystem/Blueprints/BP_TestDummyCharacter.uasset b/Content/CombatSystem/Blueprints/BP_TestDummyCharacter.uasset index bcc88cdd..d9b35946 100644 Binary files a/Content/CombatSystem/Blueprints/BP_TestDummyCharacter.uasset and b/Content/CombatSystem/Blueprints/BP_TestDummyCharacter.uasset differ diff --git a/Content/__ExternalActors__/Maps/ThirdPersonMap/5/ES/FPX4CMFFPDV2LSL5SRPJ3D.uasset b/Content/__ExternalActors__/Maps/ThirdPersonMap/5/ES/FPX4CMFFPDV2LSL5SRPJ3D.uasset index 6aa2dd9f..bd580cc8 100644 Binary files a/Content/__ExternalActors__/Maps/ThirdPersonMap/5/ES/FPX4CMFFPDV2LSL5SRPJ3D.uasset and b/Content/__ExternalActors__/Maps/ThirdPersonMap/5/ES/FPX4CMFFPDV2LSL5SRPJ3D.uasset differ diff --git a/Source/D1/CombatCharacter.cpp b/Source/D1/CombatCharacter.cpp index 88ba450e..b016fb42 100644 --- a/Source/D1/CombatCharacter.cpp +++ b/Source/D1/CombatCharacter.cpp @@ -15,6 +15,8 @@ #include "Components/StatsComponent.h" #include "Definitions/CombatGameplayTags.h" #include "Engine/DamageEvents.h" +#include "NiagaraFunctionLibrary.h" +#include "NiagaraComponent.h" #include "Kismet/KismetSystemLibrary.h" #include "Kismet/KismetMathLibrary.h" #include "Kismet/GameplayStatics.h" @@ -127,7 +129,8 @@ float ACombatCharacter::TakeDamage(float Damage, FDamageEvent const& DamageEvent UGameplayStatics::PlaySoundAtLocation(this, HitSound, PointDamageEvent->HitInfo.Location); //Hit Effect - UGameplayStatics::SpawnEmitterAtLocation(GetWorld(), HitEmitter, PointDamageEvent->HitInfo.Location); + //UGameplayStatics::SpawnEmitterAtLocation(GetWorld(), HitEmitter, PointDamageEvent->HitInfo.Location); + UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), HitEmitter, PointDamageEvent->HitInfo.Location); if (CanReceiveHitReaction()) { diff --git a/Source/D1/CombatCharacter.h b/Source/D1/CombatCharacter.h index c548dd3c..b4a78995 100644 --- a/Source/D1/CombatCharacter.h +++ b/Source/D1/CombatCharacter.h @@ -174,7 +174,7 @@ public: TObjectPtr HitSound; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Hit", meta = (AllowPrivateAccess = "true")) - TObjectPtr HitEmitter; + TObjectPtr HitEmitter; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "MovementSpeed", meta = (AllowPrivateAccess = "true")) EMovementSpeedMode MovementSpeedMode; diff --git a/Source/D1/D1.Build.cs b/Source/D1/D1.Build.cs index d6ce492c..abdaf358 100644 --- a/Source/D1/D1.Build.cs +++ b/Source/D1/D1.Build.cs @@ -10,7 +10,7 @@ public class D1 : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay", - "EnhancedInput", "GameplayTags" + "EnhancedInput", "GameplayTags", "Niagara" }); PublicIncludePaths.AddRange(new string[] { "D1" });