feat: 젬 이상상태 및 수치형 보정 확장
- SkillGemData와 SkillLoadoutEntry를 확장해 자기 강화/적중 이상상태와 피해·회복·보호막·위협 배율을 해석하도록 정리 - SkillController와 SkillEffect 경로를 보강해 cast start 이상상태, on-hit 이상상태, 반복 시전, 출력 보정이 실제 효과에 반영되도록 연결 - 강인함/약화 테스트 젬과 자기강화/적중이상/상태복합 프리셋, 디버그 메뉴를 추가해 젬 조합 검증 경로를 보강 - 런타임에서 약화 디버프 적용, 강인함+약화 동시 적용, 파쇄/수호/도전자 보정값 해석을 확인
This commit is contained in:
@@ -36,6 +36,8 @@ 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 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";
|
||||
private const string ShieldTypeBPath = "Assets/_Game/Data/Abnormalities/Data_Abnormality_Test_보호막B.asset";
|
||||
@@ -45,6 +47,8 @@ namespace Colosseum.Editor
|
||||
private const string ChallengerGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_도전자.asset";
|
||||
private const string GuardianGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_수호.asset";
|
||||
private const string RepeatGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_연속.asset";
|
||||
private const string FortitudeGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_강인함.asset";
|
||||
private const string WitherGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_약화.asset";
|
||||
private const string EdgeGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_예리함.asset";
|
||||
private const string ImpactGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_충격.asset";
|
||||
private const string BreachGemPath = SkillGemFolderPath + "/Data_SkillGem_Player_관통.asset";
|
||||
@@ -55,6 +59,9 @@ namespace Colosseum.Editor
|
||||
private const string SupportGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_지원_젬테스트.asset";
|
||||
private const string DpsGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_딜러_젬테스트.asset";
|
||||
private const string RepeatGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_반복젬테스트.asset";
|
||||
private const string SelfAbnormalityGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_자기강화젬테스트.asset";
|
||||
private const string OnHitAbnormalityGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_적중이상젬테스트.asset";
|
||||
private const string AbnormalityComboGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_상태복합젬테스트.asset";
|
||||
private const string TankDualGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_탱커_복합젬테스트.asset";
|
||||
private const string SupportDualGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_지원_복합젬테스트.asset";
|
||||
private const string DpsDualGemPresetPath = LoadoutPresetFolderPath + "/Data_LoadoutPreset_Player_딜러_복합젬테스트.asset";
|
||||
@@ -530,6 +537,24 @@ namespace Colosseum.Editor
|
||||
ApplyLoadoutPreset(RepeatGemPresetPath, "반복 젬");
|
||||
}
|
||||
|
||||
[MenuItem("Tools/Colosseum/Debug/Apply Self Abnormality Gem Loadout")]
|
||||
private static void ApplySelfAbnormalityGemLoadout()
|
||||
{
|
||||
ApplyLoadoutPreset(SelfAbnormalityGemPresetPath, "자기강화 젬");
|
||||
}
|
||||
|
||||
[MenuItem("Tools/Colosseum/Debug/Apply On-Hit Abnormality Gem Loadout")]
|
||||
private static void ApplyOnHitAbnormalityGemLoadout()
|
||||
{
|
||||
ApplyLoadoutPreset(OnHitAbnormalityGemPresetPath, "적중 이상 젬");
|
||||
}
|
||||
|
||||
[MenuItem("Tools/Colosseum/Debug/Apply Abnormality Combo Gem Loadout")]
|
||||
private static void ApplyAbnormalityComboGemLoadout()
|
||||
{
|
||||
ApplyLoadoutPreset(AbnormalityComboGemPresetPath, "상태 복합 젬");
|
||||
}
|
||||
|
||||
[MenuItem("Tools/Colosseum/Debug/Apply Tank Dual Gem Loadout")]
|
||||
private static void ApplyTankDualGemLoadout()
|
||||
{
|
||||
@@ -580,6 +605,8 @@ 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 testDebuffAbnormality = AssetDatabase.LoadAssetAtPath<AbnormalityData>(TestDebuffAbnormalityPath);
|
||||
DamageEffect edgeDamageEffect = CreateOrUpdateDamageEffectAsset(EdgeDamageEffectPath, 4f);
|
||||
DamageEffect impactDamageEffect = CreateOrUpdateDamageEffectAsset(ImpactDamageEffectPath, 7f);
|
||||
DamageEffect breachDamageEffect = CreateOrUpdateDamageEffectAsset(BreachDamageEffectPath, 10f);
|
||||
@@ -592,6 +619,10 @@ namespace Colosseum.Editor
|
||||
1.15f,
|
||||
1.1f,
|
||||
1f,
|
||||
1.2f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
0,
|
||||
damageEffect);
|
||||
|
||||
@@ -603,6 +634,10 @@ namespace Colosseum.Editor
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1.5f,
|
||||
0,
|
||||
tauntEffect);
|
||||
|
||||
@@ -614,6 +649,10 @@ namespace Colosseum.Editor
|
||||
1.05f,
|
||||
1.1f,
|
||||
1f,
|
||||
1f,
|
||||
1.2f,
|
||||
1.5f,
|
||||
1f,
|
||||
0,
|
||||
shieldEffect);
|
||||
|
||||
@@ -625,9 +664,47 @@ namespace Colosseum.Editor
|
||||
1.2f,
|
||||
1.15f,
|
||||
1.1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1,
|
||||
null);
|
||||
|
||||
CreateOrUpdateGemAsset(
|
||||
FortitudeGemPath,
|
||||
"강인함",
|
||||
"스킬 사용 시 자신에게 경직 면역을 부여하는 테스트용 방어 젬",
|
||||
SkillGemCategory.Defense,
|
||||
1.05f,
|
||||
1.05f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
0,
|
||||
null,
|
||||
new[] { hitReactionImmuneAbnormality });
|
||||
|
||||
CreateOrUpdateGemAsset(
|
||||
WitherGemPath,
|
||||
"약화",
|
||||
"스킬 적중 대상에게 테스트 디버프를 부여하는 제어 젬",
|
||||
SkillGemCategory.Control,
|
||||
1.05f,
|
||||
1.05f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
0,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
new[] { testDebuffAbnormality });
|
||||
|
||||
CreateOrUpdateGemAsset(
|
||||
EdgeGemPath,
|
||||
"예리함",
|
||||
@@ -636,6 +713,10 @@ namespace Colosseum.Editor
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
0,
|
||||
edgeDamageEffect);
|
||||
|
||||
@@ -647,6 +728,10 @@ namespace Colosseum.Editor
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
0,
|
||||
impactDamageEffect);
|
||||
|
||||
@@ -658,6 +743,10 @@ namespace Colosseum.Editor
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
1f,
|
||||
0,
|
||||
breachDamageEffect);
|
||||
|
||||
@@ -691,6 +780,8 @@ namespace Colosseum.Editor
|
||||
SkillGemData challengerGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(ChallengerGemPath);
|
||||
SkillGemData guardianGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(GuardianGemPath);
|
||||
SkillGemData repeatGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(RepeatGemPath);
|
||||
SkillGemData fortitudeGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(FortitudeGemPath);
|
||||
SkillGemData witherGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(WitherGemPath);
|
||||
SkillGemData edgeGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(EdgeGemPath);
|
||||
SkillGemData impactGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(ImpactGemPath);
|
||||
SkillGemData breachGem = AssetDatabase.LoadAssetAtPath<SkillGemData>(BreachGemPath);
|
||||
@@ -749,6 +840,45 @@ namespace Colosseum.Editor
|
||||
CreateEntry(gemTestSkill, repeatGem),
|
||||
CreateEntry(evadeSkill)));
|
||||
|
||||
CreateOrUpdatePresetAsset(
|
||||
SelfAbnormalityGemPresetPath,
|
||||
"자기강화 젬 테스트",
|
||||
"강인함 젬으로 시전 시 자기 강화 상태를 검증하는 프리셋",
|
||||
CreateLoadoutEntries(
|
||||
CreateEntry(slashSkill),
|
||||
CreateEntry(pierceSkill),
|
||||
CreateEntry(spinSkill),
|
||||
CreateEntry(dashSkill),
|
||||
CreateEntry(projectileSkill),
|
||||
CreateEntry(gemTestSkill, fortitudeGem),
|
||||
CreateEntry(evadeSkill)));
|
||||
|
||||
CreateOrUpdatePresetAsset(
|
||||
OnHitAbnormalityGemPresetPath,
|
||||
"적중 이상 젬 테스트",
|
||||
"약화 젬으로 적중 대상 디버프를 검증하는 프리셋",
|
||||
CreateLoadoutEntries(
|
||||
CreateEntry(slashSkill),
|
||||
CreateEntry(pierceSkill),
|
||||
CreateEntry(spinSkill),
|
||||
CreateEntry(dashSkill),
|
||||
CreateEntry(projectileSkill),
|
||||
CreateEntry(gemTestSkill, witherGem),
|
||||
CreateEntry(evadeSkill)));
|
||||
|
||||
CreateOrUpdatePresetAsset(
|
||||
AbnormalityComboGemPresetPath,
|
||||
"상태 복합 젬 테스트",
|
||||
"강인함 + 약화 젬을 동시에 사용해 자기 강화와 적중 디버프를 함께 검증하는 프리셋",
|
||||
CreateLoadoutEntries(
|
||||
CreateEntry(slashSkill),
|
||||
CreateEntry(pierceSkill),
|
||||
CreateEntry(spinSkill),
|
||||
CreateEntry(dashSkill),
|
||||
CreateEntry(projectileSkill),
|
||||
CreateEntry(gemTestSkill, fortitudeGem, witherGem),
|
||||
CreateEntry(evadeSkill)));
|
||||
|
||||
CreateOrUpdatePresetAsset(
|
||||
TankDualGemPresetPath,
|
||||
"탱커 복합 젬 테스트",
|
||||
@@ -907,6 +1037,10 @@ namespace Colosseum.Editor
|
||||
float resolvedCooldown = loadoutEntry.GetResolvedCooldown();
|
||||
float resolvedAnimationSpeed = loadoutEntry.GetResolvedAnimationSpeed();
|
||||
int resolvedRepeatCount = loadoutEntry.GetResolvedRepeatCount();
|
||||
float resolvedDamageMultiplier = loadoutEntry.GetResolvedDamageMultiplier();
|
||||
float resolvedHealMultiplier = loadoutEntry.GetResolvedHealMultiplier();
|
||||
float resolvedShieldMultiplier = loadoutEntry.GetResolvedShieldMultiplier();
|
||||
float resolvedThreatMultiplier = loadoutEntry.GetResolvedThreatMultiplier();
|
||||
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.Append("[Debug] 6번 슬롯 계산값 | ");
|
||||
@@ -920,6 +1054,14 @@ namespace Colosseum.Editor
|
||||
builder.Append(resolvedAnimationSpeed.ToString("0.###"));
|
||||
builder.Append(" | Repeat=");
|
||||
builder.Append(resolvedRepeatCount);
|
||||
builder.Append(" | Dmg=");
|
||||
builder.Append(resolvedDamageMultiplier.ToString("0.###"));
|
||||
builder.Append(" | Heal=");
|
||||
builder.Append(resolvedHealMultiplier.ToString("0.###"));
|
||||
builder.Append(" | Shield=");
|
||||
builder.Append(resolvedShieldMultiplier.ToString("0.###"));
|
||||
builder.Append(" | Threat=");
|
||||
builder.Append(resolvedThreatMultiplier.ToString("0.###"));
|
||||
builder.Append(" | GemSlots=");
|
||||
builder.Append(loadoutEntry.SocketedGems.Count);
|
||||
AppendGemCategorySummary(builder, loadoutEntry);
|
||||
@@ -1164,8 +1306,15 @@ namespace Colosseum.Editor
|
||||
float manaCostMultiplier,
|
||||
float cooldownMultiplier,
|
||||
float castSpeedMultiplier,
|
||||
float damageMultiplier,
|
||||
float healMultiplier,
|
||||
float shieldMultiplier,
|
||||
float threatMultiplier,
|
||||
int additionalRepeatCount,
|
||||
SkillEffect triggeredEffect)
|
||||
SkillEffect triggeredEffect,
|
||||
AbnormalityData[] selfAbnormalities = null,
|
||||
int triggeredAbnormalityIndex = -1,
|
||||
AbnormalityData[] onHitAbnormalities = null)
|
||||
{
|
||||
SkillGemData gem = AssetDatabase.LoadAssetAtPath<SkillGemData>(assetPath);
|
||||
if (gem == null)
|
||||
@@ -1186,11 +1335,22 @@ namespace Colosseum.Editor
|
||||
serializedGem.FindProperty("manaCostMultiplier").floatValue = manaCostMultiplier;
|
||||
serializedGem.FindProperty("cooldownMultiplier").floatValue = cooldownMultiplier;
|
||||
serializedGem.FindProperty("castSpeedMultiplier").floatValue = castSpeedMultiplier;
|
||||
serializedGem.FindProperty("damageMultiplier").floatValue = damageMultiplier;
|
||||
serializedGem.FindProperty("healMultiplier").floatValue = healMultiplier;
|
||||
serializedGem.FindProperty("shieldMultiplier").floatValue = shieldMultiplier;
|
||||
serializedGem.FindProperty("threatMultiplier").floatValue = threatMultiplier;
|
||||
serializedGem.FindProperty("additionalRepeatCount").intValue = additionalRepeatCount;
|
||||
|
||||
SerializedProperty castStartEffectsProperty = serializedGem.FindProperty("castStartEffects");
|
||||
castStartEffectsProperty.arraySize = 0;
|
||||
|
||||
SerializedProperty selfAbnormalitiesProperty = serializedGem.FindProperty("selfAbnormalities");
|
||||
selfAbnormalitiesProperty.arraySize = selfAbnormalities != null ? selfAbnormalities.Length : 0;
|
||||
for (int i = 0; i < selfAbnormalitiesProperty.arraySize; i++)
|
||||
{
|
||||
selfAbnormalitiesProperty.GetArrayElementAtIndex(i).objectReferenceValue = selfAbnormalities[i];
|
||||
}
|
||||
|
||||
SerializedProperty triggeredEffectsProperty = serializedGem.FindProperty("triggeredEffects");
|
||||
triggeredEffectsProperty.arraySize = triggeredEffect != null ? 1 : 0;
|
||||
if (triggeredEffect != null)
|
||||
@@ -1203,6 +1363,24 @@ namespace Colosseum.Editor
|
||||
effectArray.GetArrayElementAtIndex(0).objectReferenceValue = triggeredEffect;
|
||||
}
|
||||
|
||||
SerializedProperty onHitAbnormalitiesProperty = serializedGem.FindProperty("onHitAbnormalities");
|
||||
bool hasTriggeredAbnormalities = onHitAbnormalities != null &&
|
||||
onHitAbnormalities.Length > 0 &&
|
||||
triggeredAbnormalityIndex >= 0;
|
||||
onHitAbnormalitiesProperty.arraySize = hasTriggeredAbnormalities ? 1 : 0;
|
||||
if (hasTriggeredAbnormalities)
|
||||
{
|
||||
SerializedProperty abnormalityEntry = onHitAbnormalitiesProperty.GetArrayElementAtIndex(0);
|
||||
abnormalityEntry.FindPropertyRelative("triggerIndex").intValue = triggeredAbnormalityIndex;
|
||||
|
||||
SerializedProperty abnormalityArray = abnormalityEntry.FindPropertyRelative("abnormalities");
|
||||
abnormalityArray.arraySize = onHitAbnormalities.Length;
|
||||
for (int i = 0; i < onHitAbnormalities.Length; i++)
|
||||
{
|
||||
abnormalityArray.GetArrayElementAtIndex(i).objectReferenceValue = onHitAbnormalities[i];
|
||||
}
|
||||
}
|
||||
|
||||
serializedGem.ApplyModifiedPropertiesWithoutUndo();
|
||||
EditorUtility.SetDirty(gem);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user