diff --git a/Assets/02_Scripts/Skill/Data/SkillData.cs b/Assets/02_Scripts/Skill/Data/SkillData.cs index c6f684f..7d8a6f3 100644 --- a/Assets/02_Scripts/Skill/Data/SkillData.cs +++ b/Assets/02_Scripts/Skill/Data/SkillData.cs @@ -55,7 +55,8 @@ public class SkillData : ScriptableObject public string AnimTrigger; [Header("이펙트")] - public GameObject EffectPrefab; + public GameObject AttackEffectPrefab; + public GameObject CastEffectPrefab; [Header("범위 지정 (Remote용)")] public GameObject AreaIndicatorPrefab; diff --git a/Assets/02_Scripts/Skill/Effects/AreaEffect.cs b/Assets/02_Scripts/Skill/Effects/AreaEffect.cs index 11ca061..911d278 100644 --- a/Assets/02_Scripts/Skill/Effects/AreaEffect.cs +++ b/Assets/02_Scripts/Skill/Effects/AreaEffect.cs @@ -18,9 +18,9 @@ private void ApplyArea(SkillInstance skill, Transform caster, Vector3 center, fl SkillLevelData levelData = skill.CurrentLevelData; int damage = Mathf.RoundToInt(levelData.Damage * chargeRatio); - if (skill.Data.EffectPrefab != null) + if (skill.Data.AttackEffectPrefab != null) { - Instantiate(skill.Data.EffectPrefab, center, Quaternion.identity); + Instantiate(skill.Data.AttackEffectPrefab, center, Quaternion.identity); } Collider[] hits = Physics.OverlapSphere(center, levelData.Range); diff --git a/Assets/02_Scripts/Skill/Effects/ProjectileEffect.cs b/Assets/02_Scripts/Skill/Effects/ProjectileEffect.cs index d3941cd..6188205 100644 --- a/Assets/02_Scripts/Skill/Effects/ProjectileEffect.cs +++ b/Assets/02_Scripts/Skill/Effects/ProjectileEffect.cs @@ -4,10 +4,10 @@ public class ProjectileEffect : MonoBehaviour, ISkillEffect { public void Execute(SkillInstance skill, Transform caster, float chargeRatio) { - if (skill.Data.EffectPrefab == null) return; + if (skill.Data.AttackEffectPrefab == null) return; Vector3 spawnPos = caster.position + caster.forward + Vector3.up; - GameObject proj = Instantiate(skill.Data.EffectPrefab, spawnPos, caster.rotation); + GameObject proj = Instantiate(skill.Data.AttackEffectPrefab, spawnPos, caster.rotation); // 투사체에 데미지 정보 전달 // proj.GetComponent()?.Init(skill.CurrentLevelData.Damage * chargeRatio); @@ -15,12 +15,12 @@ public void Execute(SkillInstance skill, Transform caster, float chargeRatio) public void ExecuteAtPosition(SkillInstance skill, Transform caster, Vector3 targetPos, float chargeRatio) { - if (skill.Data.EffectPrefab == null) return; + if (skill.Data.AttackEffectPrefab == null) return; Vector3 spawnPos = caster.position + Vector3.up; Vector3 direction = (targetPos - spawnPos).normalized; Quaternion rotation = Quaternion.LookRotation(direction); - GameObject proj = Instantiate(skill.Data.EffectPrefab, spawnPos, rotation); + GameObject proj = Instantiate(skill.Data.AttackEffectPrefab, spawnPos, rotation); // 투사체에 데미지 정보 전달 // proj.GetComponent()?.Init(skill.CurrentLevelData.Damage * chargeRatio); diff --git a/Assets/06_Skills/Data/Meteor.asset b/Assets/06_Skills/Data/Meteor.asset index fa4f6f6..4969d52 100644 --- a/Assets/06_Skills/Data/Meteor.asset +++ b/Assets/06_Skills/Data/Meteor.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dde2e98b2d58508656415bc824b7273cdab0257ef552f38e2bf137bd664e49f -size 815 +oid sha256:d439e28b3820c2cfe24b9b84b48d1bf9b439ec949f156eb90a052c85437040c4 +size 977