refator : Controller 스킬 버튼 로드 및 스킬 투사체 & ObjectPool 분리

Gameton-06/Assets/Gameton/Scripts/Skill/SkillDataManager.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Assertions;
 
 namespace TON
 {
@@ -9,10 +10,24 @@ namespace TON
         public List<SkillData> skillDatas { get; private set; }
         public SerializableDictionary<string, SkillBase> skillInstances { get; private set; }
 
-        protected override void Awake()
+        private List<SkillBase> equippedSkills = new List<SkillBase>();
+
+
+        public void Initalize()
         {
-            base.Awake();
             LoadSkillData();
+            SetSkillInstances();
+            // TODO: player skill data 초기화[셋팅]
+            // 예시) 1,4,5번 스킬을 EquippedSkills에 추가
+        }
+
+        private void Update()
+        {
+            // 씬이 인게임일때만 돌게 조건 추가 (stage 이름을 가지고 잇을대?)
+            foreach (var skill in equippedSkills)
+            {
+                UpdateSkillCoolDown(skill.SkillData.id);
+            }
         }
 
         private void LoadSkillData()
@@ -30,11 +45,10 @@ namespace TON
             // skillData를 skillBase로 치환
             foreach (var skillData in skillDatas)
             {
-                skillInstances.Add(skillData.id, InitSkillData(skillData));
+                skillInstances.Add(skillData.id, new SkillBase(skillData));
             }
         }
 
-
         // 스킬 슬롯에 배치할 수 있는 스킬 수 리턴하는 메소드 
         public int GetActiveSkillCount()
         {
@@ -54,16 +68,14 @@ namespace TON
         // 스킬 슬롯에 적용해야하는 스킬 리스트 리턴
         public List<SkillBase> GetActiveSkillInstance()
         {
-            List<SkillBase> filteredSkills = new List<SkillBase>();
-
             foreach (SkillData skill in skillDatas)
             {
                 if (skill.slotNumber == 1 || skill.slotNumber == 2 || skill.slotNumber == 3)
                 {
-                    filteredSkills.Add(skillInstances.GetValueOrDefault(skill.id));
+                    equippedSkills.Add(skillInstances.GetValueOrDefault(skill.id));
                 }
             }
-            return filteredSkills;
+            return equippedSkills;
         }
 
         // 스킬 쿨타임 설정하는 메소드 
@@ -97,46 +109,39 @@ namespace TON
             }
         }
 
-        // 스킬의 쿨타임 및 파괴 로직 실행 메소드
-        public void InvokeExcuteSkill(string skillId)
-        {
-            if (skillInstances.TryGetValue(skillId, out SkillBase skill))
-            {
-                skill.InvokeExcuteSkill();
-            }
-        }
-
         // 스킬 발사(생성) 메소드 추가
         public void ExecuteSkill(string skillId, Transform firePoint, float lastDirection)
         {
             // 스킬 생성
-            GameObject skill = ObjectPoolManager.Instance.GetEffect(skillId);
+            GameObject effectGameObject = ObjectPoolManager.Instance.GetEffect(skillId);
+            Projectile projectile = effectGameObject.GetComponent<Projectile>();
+            SkillBase targetSkillBase = GetSkillData(skillId);
+            targetSkillBase.SetCurrentCoolDown();
 
-            skill.transform.SetPositionAndRotation(firePoint.position, firePoint.rotation);
+            projectile.Init(targetSkillBase.SkillData.damage);
+
+            effectGameObject.transform.SetPositionAndRotation(firePoint.position, firePoint.rotation);
 
             // 🔥 스킬 방향 반전
-            var bulletScale = skill.transform.localScale;
+            var bulletScale = effectGameObject.transform.localScale;
             bulletScale.x = Mathf.Abs(bulletScale.x) * lastDirection;
-            skill.transform.localScale = bulletScale;
+            effectGameObject.transform.localScale = bulletScale;
 
             // 스킬 이동 방향 설정
-            Rigidbody2D skillRb = skill.GetComponent<Rigidbody2D>();
+            Rigidbody2D skillRb = effectGameObject.GetComponent<Rigidbody2D>();
             skillRb.velocity = new Vector2(lastDirection * 5f, 0f);
 
-
-            InvokeExcuteSkill(skillId);
+            targetSkillBase.OnSkillExecuted?.Invoke();
         }
 
-        private SkillBase InitSkillData(SkillData skillData)
-        {
-            SkillBase skill = gameObject.AddComponent<SkillBase>();
-            skill.Init(skillData);
-            return skill;
-        }
+
 
         public SkillBase GetSkillData(string skillId)
         {
-            return skillInstances.GetValueOrDefault(skillId);
+            // 스킬 베이스가 null일때 방어로직 추가
+            SkillBase result = skillInstances.GetValueOrDefault(skillId);
+            Assert.IsNotNull(result, "SkillDataManager.ExecuteSkill() : targetSkillBase is null");
+            return result;
         }
     }
 }