feat: 젬 이상상태 및 수치형 보정 확장
- SkillGemData와 SkillLoadoutEntry를 확장해 자기 강화/적중 이상상태와 피해·회복·보호막·위협 배율을 해석하도록 정리 - SkillController와 SkillEffect 경로를 보강해 cast start 이상상태, on-hit 이상상태, 반복 시전, 출력 보정이 실제 효과에 반영되도록 연결 - 강인함/약화 테스트 젬과 자기강화/적중이상/상태복합 프리셋, 디버그 메뉴를 추가해 젬 조합 검증 경로를 보강 - 런타임에서 약화 디버프 적용, 강인함+약화 동시 적용, 파쇄/수호/도전자 보정값 해석을 확인
This commit is contained in:
@@ -2,6 +2,7 @@ using UnityEngine;
|
||||
|
||||
using Colosseum.Abnormalities;
|
||||
using Colosseum.Combat;
|
||||
using Colosseum.Skills;
|
||||
|
||||
namespace Colosseum.Skills.Effects
|
||||
{
|
||||
@@ -28,7 +29,7 @@ namespace Colosseum.Skills.Effects
|
||||
return;
|
||||
|
||||
ApplyAbnormality(target, caster);
|
||||
ApplyThreatMultiplier(target);
|
||||
ApplyThreatMultiplier(target, caster);
|
||||
}
|
||||
|
||||
private void ApplyAbnormality(GameObject target, GameObject caster)
|
||||
@@ -43,7 +44,7 @@ namespace Colosseum.Skills.Effects
|
||||
abnormalityManager.ApplyAbnormality(abnormalityData, caster);
|
||||
}
|
||||
|
||||
private void ApplyThreatMultiplier(GameObject target)
|
||||
private void ApplyThreatMultiplier(GameObject target, GameObject caster)
|
||||
{
|
||||
if (threatMultiplier <= 0f || threatMultiplierDuration <= 0f)
|
||||
return;
|
||||
@@ -54,7 +55,8 @@ namespace Colosseum.Skills.Effects
|
||||
threatController = target.AddComponent<ThreatController>();
|
||||
}
|
||||
|
||||
threatController.ApplyThreatMultiplier(threatMultiplier, threatMultiplierDuration);
|
||||
float resolvedThreatMultiplier = SkillRuntimeModifierUtility.GetThreatMultiplier(caster);
|
||||
threatController.ApplyThreatMultiplier(threatMultiplier * resolvedThreatMultiplier, threatMultiplierDuration);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ using UnityEngine;
|
||||
|
||||
using Colosseum.Stats;
|
||||
using Colosseum.Combat;
|
||||
using Colosseum.Skills;
|
||||
using Colosseum.Weapons;
|
||||
|
||||
namespace Colosseum.Skills.Effects
|
||||
@@ -73,7 +74,8 @@ namespace Colosseum.Skills.Effects
|
||||
|
||||
// 무기 데미지 배율 적용
|
||||
float damageMultiplier = GetDamageMultiplier(caster);
|
||||
return baseTotal * damageMultiplier;
|
||||
float gemMultiplier = SkillRuntimeModifierUtility.GetDamageMultiplier(caster);
|
||||
return baseTotal * damageMultiplier * gemMultiplier;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -2,6 +2,7 @@ using UnityEngine;
|
||||
|
||||
using Colosseum.Stats;
|
||||
using Colosseum.Combat;
|
||||
using Colosseum.Skills;
|
||||
|
||||
namespace Colosseum.Skills.Effects
|
||||
{
|
||||
@@ -41,10 +42,11 @@ namespace Colosseum.Skills.Effects
|
||||
var stats = caster.GetComponent<CharacterStats>();
|
||||
if (stats == null)
|
||||
{
|
||||
return baseHeal;
|
||||
return baseHeal * SkillRuntimeModifierUtility.GetHealMultiplier(caster);
|
||||
}
|
||||
|
||||
return baseHeal + (stats.HealPower * healScaling);
|
||||
float resolvedHeal = baseHeal + (stats.HealPower * healScaling);
|
||||
return resolvedHeal * SkillRuntimeModifierUtility.GetHealMultiplier(caster);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ using Colosseum.Enemy;
|
||||
using Colosseum.Player;
|
||||
using Colosseum.Stats;
|
||||
using Colosseum.Combat;
|
||||
using Colosseum.Skills;
|
||||
|
||||
namespace Colosseum.Skills.Effects
|
||||
{
|
||||
@@ -55,9 +56,10 @@ namespace Colosseum.Skills.Effects
|
||||
{
|
||||
CharacterStats stats = caster != null ? caster.GetComponent<CharacterStats>() : null;
|
||||
if (stats == null)
|
||||
return baseShield;
|
||||
return baseShield * SkillRuntimeModifierUtility.GetShieldMultiplier(caster);
|
||||
|
||||
return baseShield + (stats.HealPower * shieldScaling);
|
||||
float resolvedShield = baseShield + (stats.HealPower * shieldScaling);
|
||||
return resolvedShield * SkillRuntimeModifierUtility.GetShieldMultiplier(caster);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ using UnityEngine;
|
||||
|
||||
using Colosseum.Combat;
|
||||
using Colosseum.Enemy;
|
||||
using Colosseum.Skills;
|
||||
|
||||
namespace Colosseum.Skills.Effects
|
||||
{
|
||||
@@ -62,13 +63,14 @@ namespace Colosseum.Skills.Effects
|
||||
if (selfThreatMultiplier <= 0f || selfThreatMultiplierDuration <= 0f)
|
||||
return;
|
||||
|
||||
float resolvedThreatMultiplier = SkillRuntimeModifierUtility.GetThreatMultiplier(caster);
|
||||
ThreatController threatController = caster.GetComponent<ThreatController>();
|
||||
if (threatController == null)
|
||||
{
|
||||
threatController = caster.AddComponent<ThreatController>();
|
||||
}
|
||||
|
||||
threatController.ApplyThreatMultiplier(selfThreatMultiplier, selfThreatMultiplierDuration);
|
||||
threatController.ApplyThreatMultiplier(selfThreatMultiplier * resolvedThreatMultiplier, selfThreatMultiplierDuration);
|
||||
}
|
||||
|
||||
private void ApplyTauntThreat(EnemyBase enemy, GameObject caster)
|
||||
@@ -76,11 +78,14 @@ namespace Colosseum.Skills.Effects
|
||||
if (enemy == null || caster == null || !enemy.UseThreatSystem)
|
||||
return;
|
||||
|
||||
float resolvedThreatMultiplier = SkillRuntimeModifierUtility.GetThreatMultiplier(caster);
|
||||
GameObject highestThreatTarget = enemy.GetHighestThreatTarget();
|
||||
float highestThreat = highestThreatTarget != null ? enemy.GetThreat(highestThreatTarget) : 0f;
|
||||
float currentCasterThreat = enemy.GetThreat(caster);
|
||||
|
||||
float desiredThreat = Mathf.Max(currentCasterThreat + flatThreatAmount, highestThreat + threatLeadBonus + flatThreatAmount);
|
||||
float resolvedFlatThreat = flatThreatAmount * resolvedThreatMultiplier;
|
||||
float resolvedLeadBonus = threatLeadBonus * resolvedThreatMultiplier;
|
||||
float desiredThreat = Mathf.Max(currentCasterThreat + resolvedFlatThreat, highestThreat + resolvedLeadBonus + resolvedFlatThreat);
|
||||
enemy.SetThreat(caster, desiredThreat);
|
||||
CombatBalanceTracker.RecordThreat(caster, Mathf.Max(0f, desiredThreat - currentCasterThreat));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using UnityEngine;
|
||||
|
||||
using Colosseum.Combat;
|
||||
using Colosseum.Skills;
|
||||
|
||||
namespace Colosseum.Skills.Effects
|
||||
{
|
||||
@@ -28,7 +29,8 @@ namespace Colosseum.Skills.Effects
|
||||
threatController = target.AddComponent<ThreatController>();
|
||||
}
|
||||
|
||||
threatController.ApplyThreatMultiplier(threatMultiplier, duration);
|
||||
float resolvedThreatMultiplier = SkillRuntimeModifierUtility.GetThreatMultiplier(caster);
|
||||
threatController.ApplyThreatMultiplier(threatMultiplier * resolvedThreatMultiplier, duration);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user