From 57c86b71a0941e72b43c3661e6ec5ac44df83a08 Mon Sep 17 00:00:00 2001
From: "aube.lee" <leejjoo112@icloud.com>
Date: Sun, 16 Feb 2025 20:00:39 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=8A=AC=EB=A1=AF=20=EB=84=98=EB=B2=84?=
 =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=B0=EC=84=9C=20=EC=8A=A4=ED=82=AC=20?=
 =?UTF-8?q?=EC=84=B8=ED=8C=85=20UI=EC=9D=98=20=EC=B9=B8=EC=97=90=20?=
 =?UTF-8?q?=EC=84=B8=ED=8C=85=EB=90=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=9D=B8=EB=8D=B1=EC=8A=A4=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Gameton/Scripts/UI/SkillSettingUI.cs      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs
index cd9523fd..7a1aa87d 100644
--- a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs
+++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs
@@ -50,7 +50,7 @@ namespace TON
 
         private void SetSkillSlots()
         {
-            // 이미 기존에 UI가 생성되어 있다면 삭제
+            // 기존 UI 삭제
             if (createSkillSlots.Count > 0)
             {
                 foreach (var button in createSkillSlots)
@@ -60,23 +60,32 @@ namespace TON
                 createSkillSlots.Clear();
             }
 
-            // 스킬 버튼을 생성
+            // 스킬 버튼 생성
             List<SkillBase> activatedSkills = SkillDataManager.Singleton.GetEquippedSkills();
             int maxEquipSkillCount = SkillDataManager.Singleton.GetActiveSkillCount();
+
+            // 슬롯 번호에 맞게 스킬을 매핑
+            Dictionary<int, SkillBase> skillMap = new Dictionary<int, SkillBase>();
+            foreach (var skill in activatedSkills)
+            {
+                skillMap[skill.SkillData.slotNumber - 1] = skill;
+            }
+
             for (int i = 0; i < 3; i++)
             {
                 SkillSettingUI_SkillSlot newSkillSlot = Instantiate(skillSlotPrefab, skillSlotGroup);
                 newSkillSlot.gameObject.SetActive(true);
 
-                if (i < activatedSkills.Count) // 해당 인덱스에 활성화된 스킬이 있을 경우
+                if (skillMap.TryGetValue(i, out SkillBase skill))
                 {
-                    newSkillSlot.Initalize(activatedSkills[i].SkillData.id, i);
+                    // 해당 슬롯에 스킬이 있으면 초기화
+                    newSkillSlot.Initalize(skill.SkillData.id, i);
                 }
                 else
                 {
-                    if (i == maxEquipSkillCount - 1)
+                    if (i < maxEquipSkillCount)
                     {
-                        // 만약 스킬을 배치할 수 있는 슬롯이지만 지정된 스킬이 없다면
+                        // 스킬을 배치할 수 있는 슬롯이지만 스킬이 없으면 비활성 슬롯으로 표시
                         newSkillSlot.Initalize(null, i);
                     }
                     else
@@ -84,6 +93,7 @@ namespace TON
                         newSkillSlot.GetComponent<Button>().interactable = false;
                     }
                 }
+
                 createSkillSlots.Add(newSkillSlot);
             }
         }