From 7c56419186ae0d3e6b6fdacb002e22ee7414b0fc Mon Sep 17 00:00:00 2001 From: Emilie Schott Date: Sat, 15 Mar 2025 03:02:05 +0100 Subject: [PATCH] Bugfix : display player view obturation effect when player is hit (damage amount remain to fix) --- .../Legumix/Ennemy/RangeEnemy/Projectile/BP_Projectile.uasset | 4 ++-- Content/Legumix/Levels/LVL_GYM_00.umap | 4 ++-- Content/Legumix/Player/BP_Play.uasset | 4 ++-- Source/LegumeMix/Private/Player/LMPlayer.cpp | 4 ++-- Source/LegumeMix/Public/Player/LMPlayer.h | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Content/Legumix/Ennemy/RangeEnemy/Projectile/BP_Projectile.uasset b/Content/Legumix/Ennemy/RangeEnemy/Projectile/BP_Projectile.uasset index 1298601..fa2c5b7 100644 --- a/Content/Legumix/Ennemy/RangeEnemy/Projectile/BP_Projectile.uasset +++ b/Content/Legumix/Ennemy/RangeEnemy/Projectile/BP_Projectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21eeee27c911260b8fd3e72010f4ebc4744fdd8085e786a83392b495839289a1 -size 80130 +oid sha256:d3c5587f221c7e8196da30308b39f839fc42108c80a69c7e1cff9c213f258eb2 +size 84703 diff --git a/Content/Legumix/Levels/LVL_GYM_00.umap b/Content/Legumix/Levels/LVL_GYM_00.umap index f7b5f0b..ef9056b 100644 --- a/Content/Legumix/Levels/LVL_GYM_00.umap +++ b/Content/Legumix/Levels/LVL_GYM_00.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e02b7decde55f5f8a5daa618840840665945273fb28810c89920479bb1d9eec4 -size 995112 +oid sha256:13a09798729f5791d2b87b1e6894d02b32cdcc25e06c8801020bb2f1de81f6ad +size 994542 diff --git a/Content/Legumix/Player/BP_Play.uasset b/Content/Legumix/Player/BP_Play.uasset index 308c110..0c48b13 100644 --- a/Content/Legumix/Player/BP_Play.uasset +++ b/Content/Legumix/Player/BP_Play.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bed6823659733f797f0ecabe943bd2cb4ef8200a8e11f895f6a72cbbe6e430d -size 633809 +oid sha256:baf0a3a50d71891f4c51b0fe2a63dbae8bc828dbc443c232ee0bdab45f194007 +size 641674 diff --git a/Source/LegumeMix/Private/Player/LMPlayer.cpp b/Source/LegumeMix/Private/Player/LMPlayer.cpp index b2e7309..10d4bb7 100644 --- a/Source/LegumeMix/Private/Player/LMPlayer.cpp +++ b/Source/LegumeMix/Private/Player/LMPlayer.cpp @@ -26,7 +26,7 @@ ALMPlayer::ALMPlayer(const FObjectInitializer& ObjectInitializer) SpreadStream = FRandomStream(FMath::Rand()); HealthComponent = CreateDefaultSubobject(TEXT("HealthComponent")); - + HitPeriodLengthInSeconds = 15.f; bHitPeriodInProgress = false; TimeOfTheLastDamage = 0.f; @@ -46,7 +46,7 @@ void ALMPlayer::BeginPlay() GetCamera()->SetFieldOfView(ULMUserSettings::GetLegumixUserSettings()->FieldOfView); - HealthComponent->OnHealthChanged.AddDynamic(this, &ALMPlayer::SetDisplayDamageParameters); + // HealthComponent->OnHealthChanged.AddDynamic(this, &ALMPlayer::SetDisplayDamageParameters); MovementModeChangedDelegate.AddUniqueDynamic(this, &ALMPlayer::MovementChanged); } diff --git a/Source/LegumeMix/Public/Player/LMPlayer.h b/Source/LegumeMix/Public/Player/LMPlayer.h index 3e81612..02e4b55 100644 --- a/Source/LegumeMix/Public/Player/LMPlayer.h +++ b/Source/LegumeMix/Public/Player/LMPlayer.h @@ -15,6 +15,7 @@ class ULMWeaponManager; class ULMHealthComponent; class UMaterialInstanceDynamic; class ALMAmmo; +class ULMHitBox; DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnRequestUnpauseSignature);