dal4segno/Colosseum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 피격 반응 면역을 경직/넉백/다운으로 분리

Browse Source 
- 상태이상 데이터와 관리자에서 단일 피격 면역을 경직, 넉백, 다운 개별 면역으로 분리

- 플레이어 프리팹과 디버그 메뉴, 공용 경직 애니메이션을 갱신해 분리된 면역 상태를 테스트 가능하게 정리

- PlayMode 테스트를 추가해 각 면역이 대응하는 반응만 차단하는지 검증
This commit is contained in:
dal4segno
2026-04-09 23:22:02 +09:00
parent 7776f7ed05
commit 0fa23d4389
17 changed files with 42220 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/_Game/Scripts/Abnormalities/AbnormalityData.cs
View File

@@ -71,8 +71,14 @@ namespace Colosseum.Abnormalities
[Tooltip("보호막 계열 상태인지 여부 (보호막 인스턴스 동기화용)")]
public bool isShieldState = false;
[Tooltip("활성 중에는 일반 피격 반응(경직, 넉백, 다운)을 무시할지 여부")]
public bool ignoreHitReaction = false;
[Tooltip("활성 중에는 경직을 무시할지 여부")]
public bool ignoreStagger = false;
[Tooltip("활성 중에는 넉백을 무시할지 여부")]
public bool ignoreKnockback = false;
[Tooltip("활성 중에는 다운을 무시할지 여부")]
public bool ignoreDown = false;
[Header("시각 효과")]
[Tooltip("이상 상태가 유지되는 동안 대상에 붙일 루핑 VFX 프리팹")]

82
Assets/_Game/Scripts/Abnormalities/AbnormalityManager.cs
View File

@@ -32,7 +32,9 @@ namespace Colosseum.Abnormalities
private int stunCount;
private int silenceCount;
private int invincibleCount;
private int hitReactionImmuneCount;
private int staggerImmuneCount;
private int knockbackImmuneCount;
private int downImmuneCount;
private float slowMultiplier = 1f;
private float incomingDamageMultiplier = 1f;
@@ -40,7 +42,9 @@ namespace Colosseum.Abnormalities
private NetworkVariable<int> syncedStunCount = new NetworkVariable<int>(0);
private NetworkVariable<int> syncedSilenceCount = new NetworkVariable<int>(0);
private NetworkVariable<int> syncedInvincibleCount = new NetworkVariable<int>(0);
private NetworkVariable<int> syncedHitReactionImmuneCount = new NetworkVariable<int>(0);
private NetworkVariable<int> syncedStaggerImmuneCount = new NetworkVariable<int>(0);
private NetworkVariable<int> syncedKnockbackImmuneCount = new NetworkVariable<int>(0);
private NetworkVariable<int> syncedDownImmuneCount = new NetworkVariable<int>(0);
private NetworkVariable<float> syncedSlowMultiplier = new NetworkVariable<float>(1f);
// 네트워크 동기화용 데이터
@@ -62,9 +66,19 @@ namespace Colosseum.Abnormalities
public bool IsInvincible => GetCurrentInvincibleCount() > 0;
/// <summary>
/// 일반 피격 반응 무시 상태 여부
/// 경직 면역 상태 여부
/// </summary>
public bool IsHitReactionImmune => GetCurrentHitReactionImmuneCount() > 0;
public bool IsStaggerImmune => GetCurrentStaggerImmuneCount() > 0;
/// <summary>
/// 넉백 면역 상태 여부
/// </summary>
public bool IsKnockbackImmune => GetCurrentKnockbackImmuneCount() > 0;
/// <summary>
/// 다운 면역 상태 여부
/// </summary>
public bool IsDownImmune => GetCurrentDownImmuneCount() > 0;
/// <summary>
/// 이동 속도 배율 (1.0 = 기본, 0.5 = 50% 감소)
@@ -139,7 +153,9 @@ namespace Colosseum.Abnormalities
syncedStunCount.OnValueChanged += HandleSyncedStunChanged;
syncedSilenceCount.OnValueChanged += HandleSyncedSilenceChanged;
syncedInvincibleCount.OnValueChanged += HandleSyncedInvincibleChanged;
syncedHitReactionImmuneCount.OnValueChanged += HandleSyncedHitReactionImmuneChanged;
syncedStaggerImmuneCount.OnValueChanged += HandleSyncedStaggerImmuneChanged;
syncedKnockbackImmuneCount.OnValueChanged += HandleSyncedKnockbackImmuneChanged;
syncedDownImmuneCount.OnValueChanged += HandleSyncedDownImmuneChanged;
syncedSlowMultiplier.OnValueChanged += HandleSyncedSlowChanged;
if (networkController != null)
@@ -161,7 +177,9 @@ namespace Colosseum.Abnormalities
syncedStunCount.OnValueChanged -= HandleSyncedStunChanged;
syncedSilenceCount.OnValueChanged -= HandleSyncedSilenceChanged;
syncedInvincibleCount.OnValueChanged -= HandleSyncedInvincibleChanged;
syncedHitReactionImmuneCount.OnValueChanged -= HandleSyncedHitReactionImmuneChanged;
syncedStaggerImmuneCount.OnValueChanged -= HandleSyncedStaggerImmuneChanged;
syncedKnockbackImmuneCount.OnValueChanged -= HandleSyncedKnockbackImmuneChanged;
syncedDownImmuneCount.OnValueChanged -= HandleSyncedDownImmuneChanged;
syncedSlowMultiplier.OnValueChanged -= HandleSyncedSlowChanged;
if (networkController != null)
@@ -447,10 +465,14 @@ namespace Colosseum.Abnormalities
{
bool enteredStun = false;
if (data.ignoreHitReaction)
{
hitReactionImmuneCount++;
}
if (data.ignoreStagger)
staggerImmuneCount++;
if (data.ignoreKnockback)
knockbackImmuneCount++;
if (data.ignoreDown)
downImmuneCount++;
switch (data.controlType)
{
@@ -482,10 +504,14 @@ namespace Colosseum.Abnormalities
private void RemoveControlEffect(AbnormalityData data)
{
if (data.ignoreHitReaction)
{
hitReactionImmuneCount = Mathf.Max(0, hitReactionImmuneCount - 1);
}
if (data.ignoreStagger)
staggerImmuneCount = Mathf.Max(0, staggerImmuneCount - 1);
if (data.ignoreKnockback)
knockbackImmuneCount = Mathf.Max(0, knockbackImmuneCount - 1);
if (data.ignoreDown)
downImmuneCount = Mathf.Max(0, downImmuneCount - 1);
switch (data.controlType)
{
@@ -542,7 +568,11 @@ namespace Colosseum.Abnormalities
private int GetCurrentInvincibleCount() => IsServer ? invincibleCount : syncedInvincibleCount.Value;
private int GetCurrentHitReactionImmuneCount() => IsServer ? hitReactionImmuneCount : syncedHitReactionImmuneCount.Value;
private int GetCurrentStaggerImmuneCount() => IsServer ? staggerImmuneCount : syncedStaggerImmuneCount.Value;
private int GetCurrentKnockbackImmuneCount() => IsServer ? knockbackImmuneCount : syncedKnockbackImmuneCount.Value;
private int GetCurrentDownImmuneCount() => IsServer ? downImmuneCount : syncedDownImmuneCount.Value;
private float GetCurrentSlowMultiplier() => IsServer ? slowMultiplier : syncedSlowMultiplier.Value;
@@ -554,7 +584,9 @@ namespace Colosseum.Abnormalities
syncedStunCount.Value = stunCount;
syncedSilenceCount.Value = silenceCount;
syncedInvincibleCount.Value = invincibleCount;
syncedHitReactionImmuneCount.Value = hitReactionImmuneCount;
syncedStaggerImmuneCount.Value = staggerImmuneCount;
syncedKnockbackImmuneCount.Value = knockbackImmuneCount;
syncedDownImmuneCount.Value = downImmuneCount;
syncedSlowMultiplier.Value = slowMultiplier;
}
@@ -636,7 +668,23 @@ namespace Colosseum.Abnormalities
OnAbnormalitiesChanged?.Invoke();
}
private void HandleSyncedHitReactionImmuneChanged(int oldValue, int newValue)
private void HandleSyncedStaggerImmuneChanged(int oldValue, int newValue)
{
if (oldValue == newValue)
return;
OnAbnormalitiesChanged?.Invoke();
}
private void HandleSyncedKnockbackImmuneChanged(int oldValue, int newValue)
{
if (oldValue == newValue)
return;
OnAbnormalitiesChanged?.Invoke();
}
private void HandleSyncedDownImmuneChanged(int oldValue, int newValue)
{
if (oldValue == newValue)
return;

6
Assets/_Game/Scripts/Editor/PlayerSkillDebugMenu.cs
View File

@@ -36,7 +36,7 @@ namespace Colosseum.Editor
private const string StunAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Player_Stun.asset";
private const string SilenceAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Player_Silence.asset";
private const string MarkAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Player_집행자의낙인.asset";
private const string HitReactionImmuneAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Player_경직면역.asset";
private const string StaggerImmuneAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Player_경직면역.asset";
private const string TestDebuffAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Test_Debuff.asset";
private const string ShieldAbnormalityPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Common_보호막.asset";
private const string ShieldTypeAPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Test_보호막A.asset";
@@ -729,7 +729,7 @@ namespace Colosseum.Editor
SkillEffect damageEffect = AssetDatabase.LoadAssetAtPath<SkillEffect>("Assets/_Game/Data/Skills/Effects/Data_SkillEffect_Player_찌르기_0_데미지.asset");
SkillEffect tauntEffect = AssetDatabase.LoadAssetAtPath<SkillEffect>("Assets/_Game/Data/Skills/Effects/Data_SkillEffect_Player_도발_0_도발.asset");
SkillEffect shieldEffect = AssetDatabase.LoadAssetAtPath<SkillEffect>("Assets/_Game/Data/Skills/Effects/Data_SkillEffect_Player_보호막_0_보호막.asset");
AbnormalityData hitReactionImmuneAbnormality = AssetDatabase.LoadAssetAtPath<AbnormalityData>(HitReactionImmuneAbnormalityPath);
AbnormalityData staggerImmuneAbnormality = AssetDatabase.LoadAssetAtPath<AbnormalityData>(StaggerImmuneAbnormalityPath);
AbnormalityData testDebuffAbnormality = AssetDatabase.LoadAssetAtPath<AbnormalityData>(TestDebuffAbnormalityPath);
DamageEffect edgeDamageEffect = CreateOrUpdateDamageEffectAsset(EdgeDamageEffectPath, 4f);
DamageEffect impactDamageEffect = CreateOrUpdateDamageEffectAsset(ImpactDamageEffectPath, 7f);
@@ -821,7 +821,7 @@ namespace Colosseum.Editor
1f,
0,
null,
new[] { hitReactionImmuneAbnormality },
new[] { staggerImmuneAbnormality },
allowedSkillRoles: SkillRoleType.All,
allowedSkillActivationTypes: SkillActivationType.All);

20
Assets/_Game/Scripts/Player/HitReactionController.cs
View File

@@ -84,9 +84,19 @@ namespace Colosseum.Player
public bool IsStaggered => isStaggered.Value;
/// <summary>
/// 피격 반응 무시 상태 여부
/// 경직 면역 상태 여부
/// </summary>
public bool IsHitReactionImmune => abnormalityManager != null && abnormalityManager.IsHitReactionImmune;
public bool IsStaggerImmune => abnormalityManager != null && abnormalityManager.IsStaggerImmune;
/// <summary>
/// 넉백 면역 상태 여부
/// </summary>
public bool IsKnockbackImmune => abnormalityManager != null && abnormalityManager.IsKnockbackImmune;
/// <summary>
/// 다운 면역 상태 여부
/// </summary>
public bool IsDownImmune => abnormalityManager != null && abnormalityManager.IsDownImmune;
private void Awake()
{
@@ -121,7 +131,7 @@ namespace Colosseum.Player
if (networkController != null && networkController.IsDead)
return;
if (IsHitReactionImmune || isDowned.Value)
if (IsStaggerImmune || isDowned.Value)
return;
if (duration <= 0f)
@@ -153,7 +163,7 @@ namespace Colosseum.Player
if (networkController != null && networkController.IsDead)
return;
if (IsHitReactionImmune || isDowned.Value)
if (IsKnockbackImmune || isDowned.Value)
return;
if (duration <= 0f || worldVelocity.sqrMagnitude <= 0.0001f)
@@ -187,7 +197,7 @@ namespace Colosseum.Player
if (networkController != null && networkController.IsDead)
return;
if (IsHitReactionImmune)
if (IsDownImmune)
return;
downRemainingTime = Mathf.Max(downRemainingTime, duration);