From 7bea4520c5edbb7b49a92756df71adb333c333aa Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Tue, 11 Feb 2025 10:20:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=82=AC=20=EC=8A=AC=EB=A1=AF=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=A1=9C=EC=A7=81=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/Resources/GameData/player.json | 2 +- .../Resources/GameData/player.json.meta | 2 +- .../Gameton/Resources/GameData/skill.json | 2 +- .../Resources/GameData/skill.json.meta | 2 +- .../UI/Prefabs/Skill Item/Skill Slot.prefab | 9 +- .../dev_jinjoo/Edit_Ingame.unity | 456 ++++++++++-------- .../Gameton/Scripts/Skill/SkillDataManager.cs | 18 + .../Assets/Gameton/Scripts/UI/ControllerUI.cs | 2 +- .../Gameton/Scripts/UI/SkillSettingUI.cs | 38 +- .../Scripts/UI/SkillSettingUI_SkillSlot.cs | 13 +- 10 files changed, 315 insertions(+), 229 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/player.json b/Gameton-06/Assets/Gameton/Resources/GameData/player.json index 7574c7f3..ff157e35 100644 --- a/Gameton-06/Assets/Gameton/Resources/GameData/player.json +++ b/Gameton-06/Assets/Gameton/Resources/GameData/player.json @@ -3,7 +3,7 @@ "id": 0, "type": "w", "name": "lulu", - "level": 10, + "level": 3, "experience": 0, "hp": 1000, "mp": 1000, diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta b/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta index 1af77436..263e553e 100644 --- a/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta +++ b/Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c099706d971c47a40a76fbe4cda9bbee +guid: a4dee2e685350b1458b15992a0fdfc34 TextScriptImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/skill.json b/Gameton-06/Assets/Gameton/Resources/GameData/skill.json index c5b144e2..711cfe02 100644 --- a/Gameton-06/Assets/Gameton/Resources/GameData/skill.json +++ b/Gameton-06/Assets/Gameton/Resources/GameData/skill.json @@ -23,7 +23,7 @@ "mpConsumption": 7, "damage": 1.15, "coolDown": 3, - "slotNumber": 3, + "slotNumber": 0, "requiredLevel": 5 }, { diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/skill.json.meta b/Gameton-06/Assets/Gameton/Resources/GameData/skill.json.meta index 3893ea4b..3a784cfe 100644 --- a/Gameton-06/Assets/Gameton/Resources/GameData/skill.json.meta +++ b/Gameton-06/Assets/Gameton/Resources/GameData/skill.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 920b9bd3800ac08409e79255edb991e3 +guid: 3994df9e50c49d64782998dd7a9706a3 TextScriptImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab index 350fff61..cfa0e923 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 6508970320080290334} - component: {fileID: 4901385031819159217} m_Layer: 0 - m_Name: Selected Image + m_Name: Selected State m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -182,8 +182,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2000021243411541322} - - {fileID: 4288935860394547034} - {fileID: 1898723056178222618} + - {fileID: 4288935860394547034} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -243,6 +243,7 @@ MonoBehaviour: m_EditorClassIdentifier: skillImage: {fileID: 6834027631568802153} lockerImage: {fileID: 5863612593878900192} + selectedState: {fileID: 2050701555096933595} --- !u!1 &6834027631568802153 GameObject: m_ObjectHideFlags: 0 @@ -260,7 +261,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2000021243411541322 RectTransform: m_ObjectHideFlags: 0 @@ -301,7 +302,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity index 307d180f..00d24e22 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity @@ -413,12 +413,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 643452660} m_Father: {fileID: 2053288269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000046387704} + m_AnchoredPosition: {x: 0, y: 0.0000030729097} m_SizeDelta: {x: 555, y: 200} m_Pivot: {x: 0, y: 1} --- !u!1 &373368146 @@ -665,7 +666,7 @@ RectTransform: m_Father: {fileID: 1010759826} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -933,6 +934,208 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3} +--- !u!1001 &643452659 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 283369192} + m_Modifications: + - target: {fileID: 979625317529729593, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_Name + value: Skill Information Item + objectReference: {fileID: 0} + - target: {fileID: 979625317529729593, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.x + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.x + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3280450182884027561, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3280450182884027561, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3280450182884027561, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 3280450182884027561, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3280450182884027561, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 3280450182884027561, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.y + value: -67.5 + objectReference: {fileID: 0} + - target: {fileID: 4780150305224454862, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4780150305224454862, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4780150305224454862, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4780150305224454862, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 4780150305224454862, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 4780150305224454862, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.y + value: -32.5 + objectReference: {fileID: 0} + - target: {fileID: 5655603449584250161, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5655603449584250161, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5655603449584250161, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 5655603449584250161, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5655603449584250161, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.x + value: 235 + objectReference: {fileID: 0} + - target: {fileID: 5655603449584250161, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.y + value: -32.5 + objectReference: {fileID: 0} + - target: {fileID: 7998783001286815596, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7998783001286815596, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7998783001286815596, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 7998783001286815596, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 7998783001286815596, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.x + value: 235 + objectReference: {fileID: 0} + - target: {fileID: 7998783001286815596, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + propertyPath: m_AnchoredPosition.y + value: -67.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} +--- !u!224 &643452660 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3123293382822292774, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} + m_PrefabInstance: {fileID: 643452659} + m_PrefabAsset: {fileID: 0} --- !u!1 &718284630 GameObject: m_ObjectHideFlags: 0 @@ -964,108 +1167,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &830436145 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1202458216} - m_Modifications: - - target: {fileID: 6583065413429247215, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_Name - value: Skill Slot - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchoredPosition.x - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchoredPosition.y - value: -80 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} ---- !u!224 &830436146 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - m_PrefabInstance: {fileID: 830436145} - m_PrefabAsset: {fileID: 0} --- !u!1 &835921121 GameObject: m_ObjectHideFlags: 0 @@ -1483,108 +1584,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1045136308 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1202458216} - m_Modifications: - - target: {fileID: 6583065413429247215, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_Name - value: Skill Slot - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchoredPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_AnchoredPosition.y - value: -80 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} ---- !u!224 &1045136309 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - m_PrefabInstance: {fileID: 1045136308} - m_PrefabAsset: {fileID: 0} --- !u!1 &1128113572 GameObject: m_ObjectHideFlags: 0 @@ -1738,8 +1737,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1499498774} - - {fileID: 830436146} - - {fileID: 1045136309} m_Father: {fileID: 387722513} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -2119,7 +2116,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 505319091} m_HandleRect: {fileID: 505319090} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -2508,13 +2505,14 @@ GameObject: - component: {fileID: 1882871575} - component: {fileID: 1882871574} - component: {fileID: 1882871573} + - component: {fileID: 1882871579} m_Layer: 5 m_Name: UI.SkillSettingUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1882871573 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2637,6 +2635,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1882871579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882871572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6e661998b1a293438a43cb63d82bd7f, type: 3} + m_Name: + m_EditorClassIdentifier: + skillSlotGroup: {fileID: 1202458216} + skillSlotPrefab: {fileID: 2060037183} + createSkillSlots: [] --- !u!1001 &1939957610 PrefabInstance: m_ObjectHideFlags: 0 @@ -2785,9 +2798,9 @@ RectTransform: m_Father: {fileID: 835921122} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 3, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2053288270 MonoBehaviour: @@ -2824,6 +2837,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: 0, y: 0, z: 0, w: 0} m_Softness: {x: 0, y: 0} +--- !u!114 &2060037183 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8968069870202076509, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + m_PrefabInstance: {fileID: 3631551758123900143} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19db9b1bf85c67042afc28005a6af101, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2135657550 GameObject: m_ObjectHideFlags: 0 @@ -2930,6 +2954,10 @@ PrefabInstance: propertyPath: m_Name value: Skill Slot objectReference: {fileID: 0} + - target: {fileID: 6583065413429247215, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2992,7 +3020,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} propertyPath: m_AnchoredPosition.x - value: 80 + value: 240 objectReference: {fileID: 0} - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Gameton-06/Assets/Gameton/Scripts/Skill/SkillDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillDataManager.cs index 32b612ed..70fd9f72 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Skill/SkillDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillDataManager.cs @@ -19,6 +19,7 @@ namespace TON SetSkillInstances(); // TODO: player skill data 초기화[셋팅] // 예시) 1,4,5번 스킬을 EquippedSkills에 추가 + GetActiveSkillInstance(); } private void Update() @@ -32,6 +33,11 @@ namespace TON private void LoadSkillData() { + if (skillDatas != null) + { + skillDatas.Clear(); + } + skillDatas = JSONLoader.LoadFromResources>("Skill"); if (skillDatas == null) { @@ -66,12 +72,24 @@ namespace TON } // 스킬 슬롯에 적용해야하는 스킬 리스트 리턴 + public List GetEquippedSkills() + { + return equippedSkills; + } + + // 스킬 슬롯에 적용될 스킬 리스트 초기화 및 업데이트에 사용 public List GetActiveSkillInstance() { + if (equippedSkills != null) + { + equippedSkills.Clear(); + } + foreach (SkillData skill in skillDatas) { if (skill.slotNumber == 1 || skill.slotNumber == 2 || skill.slotNumber == 3) { + Debug.Log("GetActiveSkillInstance() : " + skill.id); equippedSkills.Add(skillInstances.GetValueOrDefault(skill.id)); } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs index c9b90eb8..0bc83ee4 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs @@ -38,7 +38,7 @@ namespace TON } // 스킬 버튼을 생성 - List activatedSkills = SkillDataManager.Singleton.GetActiveSkillInstance(); + List activatedSkills = SkillDataManager.Singleton.GetEquippedSkills(); for (int i = 0; i < 3; i++) { ControllerUI_SkillButton newSkillButton = Instantiate(skillButtonPrefab, skillButtonGroup); diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs index 9cb5ab7f..bac993c1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs @@ -8,12 +8,46 @@ namespace TON { public static SkillSettingUI Instance => UIManager.Singleton.GetUI(UIList.SkillSettingUI); - public List slots; + public Transform skillSlotGroup; + public SkillSettingUI_SkillSlot skillSlotPrefab; + public List createSkillSlots = new List(); + public void Start() { - + SetSkillSlots(); } + private void SetSkillSlots() + { + // 이미 기존에 UI가 생성되어 있다면 삭제 + if (createSkillSlots.Count > 0) + { + foreach (var button in createSkillSlots) + { + Destroy(button.gameObject); + } + createSkillSlots.Clear(); + } + + // 스킬 버튼을 생성 + List activatedSkills = SkillDataManager.Singleton.GetEquippedSkills(); + for (int i = 0; i < 3; i++) + { + SkillSettingUI_SkillSlot newSkillSlot = Instantiate(skillSlotPrefab, skillSlotGroup); + newSkillSlot.gameObject.SetActive(true); + + if (i < activatedSkills.Count) // 해당 인덱스에 활성화된 스킬이 있을 경우 + { + newSkillSlot.Initalize(activatedSkills[i].SkillData.id); + } + else + { + // 복제 됐을때 기본 상태가 잠금 상태 + } + + createSkillSlots.Add(newSkillSlot); + } + } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs index 268be0ec..a1307770 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Assertions; using UnityEngine.UI; namespace TON @@ -9,21 +10,25 @@ namespace TON { public GameObject skillImage; public GameObject lockerImage; + public GameObject selectedState; - public void Initalize() + public void Initalize(string skillId) { // 스킬 이미지 세팅하기 - // skillImage = GetComponent(); + Assert.IsTrue(AssetManager.Singleton.LoadSkillIcon(skillId, out Sprite loadedSkillImage)); + skillImage.SetActive(true); + skillImage.GetComponent().sprite = loadedSkillImage; + lockerImage.SetActive(false); } public void SelectedSlot() { - lockerImage.SetActive(true); + selectedState.SetActive(true); } public void UnselectedSlot() { - lockerImage.SetActive(false); + selectedState.SetActive(false); } } }