From 21a173864fe5e2b15d319f7a45fde7c44ef4d7e3 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Mon, 10 Feb 2025 21:22:23 +0900 Subject: [PATCH] =?UTF-8?q?skill=20setting=20UI=20=EC=9E=91=EC=97=85=202?= =?UTF-8?q?=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/Skill Item.meta | 8 + .../Skill Information Item.prefab} | 2 +- .../Skill Information Item.prefab.meta} | 0 .../UI/Prefabs/Skill Item/Skill Slot.prefab | 305 +++++++ .../Prefabs/Skill Item/Skill Slot.prefab.meta | 7 + .../dev_jinjoo/Edit_Ingame.unity | 763 +++++++----------- .../Assets/Gameton/Scripts/Common/UIList.cs | 16 +- .../Gameton/Scripts/UI/SkillSettingUI.cs | 19 + .../Gameton/Scripts/UI/SkillSettingUI.cs.meta | 11 + .../Scripts/UI/SkillSettingUI_SkillSlot.cs | 21 + .../UI/SkillSettingUI_SkillSlot.cs.meta | 11 + 11 files changed, 699 insertions(+), 464 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item.meta rename Gameton-06/Assets/Gameton/Resources/UI/Prefabs/{SkillInformationItem.prefab => Skill Item/Skill Information Item.prefab} (99%) rename Gameton-06/Assets/Gameton/Resources/UI/Prefabs/{SkillInformationItem.prefab.meta => Skill Item/Skill Information Item.prefab.meta} (100%) create mode 100644 Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab create mode 100644 Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item.meta b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item.meta new file mode 100644 index 00000000..0acc41f3 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aafc715bf4d258942a8dcb2b3496afd8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Information Item.prefab similarity index 99% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab rename to Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Information Item.prefab index 5b057d56..08461aa9 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Information Item.prefab @@ -318,7 +318,7 @@ GameObject: - component: {fileID: 894771521184045827} - component: {fileID: 3064740509906673288} m_Layer: 5 - m_Name: SkillInformationItem + m_Name: Skill Information Item m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab.meta b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Information Item.prefab.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Information Item.prefab.meta 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 new file mode 100644 index 00000000..92dcc3ae --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab @@ -0,0 +1,305 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2050701555096933595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4288935860394547034} + - component: {fileID: 6508970320080290334} + - component: {fileID: 4901385031819159217} + m_Layer: 0 + m_Name: Selected Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4288935860394547034 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050701555096933595} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8074330830695280406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6508970320080290334 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050701555096933595} + m_CullTransparentMesh: 1 +--- !u!114 &4901385031819159217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050701555096933595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2aa08635294c7f4439316a676e949dc8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5863612593878900192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1898723056178222618} + - component: {fileID: 777422978170134065} + - component: {fileID: 2790802460731350468} + m_Layer: 0 + m_Name: Locked + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1898723056178222618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5863612593878900192} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8074330830695280406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &777422978170134065 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5863612593878900192} + m_CullTransparentMesh: 1 +--- !u!114 &2790802460731350468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5863612593878900192} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 65e980f711cedc341853e618aacaad5d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6583065413429247215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8074330830695280406} + - component: {fileID: 7221054774098027555} + - component: {fileID: 8618505599359909844} + m_Layer: 5 + m_Name: Skill Slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8074330830695280406 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6583065413429247215} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2000021243411541322} + - {fileID: 4288935860394547034} + - {fileID: 1898723056178222618} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7221054774098027555 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6583065413429247215} + m_CullTransparentMesh: 1 +--- !u!114 &8618505599359909844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6583065413429247215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cdbbcfeb5f68c0c4ca7d4baa4701ddbb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6834027631568802153 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000021243411541322} + - component: {fileID: 633880590358032608} + - component: {fileID: 5592810311286648412} + m_Layer: 5 + m_Name: Skill Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2000021243411541322 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6834027631568802153} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8074330830695280406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &633880590358032608 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6834027631568802153} + m_CullTransparentMesh: 1 +--- !u!114 &5592810311286648412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6834027631568802153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab.meta b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab.meta new file mode 100644 index 00000000..3a000de4 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 85ce9a177f9e26740921e0ecc2753cea +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 a0aabcd3..0fbf410f 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 @@ -122,82 +122,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &8000345 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8000346} - - component: {fileID: 8000348} - - component: {fileID: 8000347} - m_Layer: 5 - m_Name: Skill Slot (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8000346 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8000345} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 682024577} - m_Father: {fileID: 1202458216} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8000347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8000345} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cdbbcfeb5f68c0c4ca7d4baa4701ddbb, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &8000348 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8000345} - m_CullTransparentMesh: 1 --- !u!1 &71730169 GameObject: m_ObjectHideFlags: 0 @@ -494,84 +418,9 @@ RectTransform: 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.000008385263} + m_AnchoredPosition: {x: 0, y: 0.0003230538} m_SizeDelta: {x: 555, y: 200} m_Pivot: {x: 0, y: 1} ---- !u!1 &301396581 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 301396582} - - component: {fileID: 301396584} - - component: {fileID: 301396583} - m_Layer: 5 - m_Name: Skill Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &301396582 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301396581} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1499498774} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -40, y: -40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &301396583 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301396581} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &301396584 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301396581} - m_CullTransparentMesh: 1 --- !u!1 &373368146 GameObject: m_ObjectHideFlags: 0 @@ -1084,81 +933,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3} ---- !u!1 &682024576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 682024577} - - component: {fileID: 682024579} - - component: {fileID: 682024578} - m_Layer: 5 - m_Name: Skill Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &682024577 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 682024576} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8000346} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -40, y: -40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &682024578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 682024576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &682024579 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 682024576} - m_CullTransparentMesh: 1 --- !u!1 &718284630 GameObject: m_ObjectHideFlags: 0 @@ -1190,6 +964,108 @@ 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: 0 + 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: 0 + 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: 0 + objectReference: {fileID: 0} + - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + 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 @@ -1607,6 +1483,108 @@ 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: 0 + 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: 0 + 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: 0 + objectReference: {fileID: 0} + - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + 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 @@ -1730,82 +1708,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &1201795049 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1201795050} - - component: {fileID: 1201795052} - - component: {fileID: 1201795051} - m_Layer: 5 - m_Name: Skill Slot (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1201795050 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1201795049} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1236997344} - m_Father: {fileID: 1202458216} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1201795051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1201795049} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cdbbcfeb5f68c0c4ca7d4baa4701ddbb, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1201795052 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1201795049} - m_CullTransparentMesh: 1 --- !u!1 &1202458215 GameObject: m_ObjectHideFlags: 0 @@ -1836,8 +1738,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1499498774} - - {fileID: 8000346} - - {fileID: 1201795050} + - {fileID: 830436146} + - {fileID: 1045136309} m_Father: {fileID: 387722513} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -2005,81 +1907,6 @@ RectTransform: m_AnchoredPosition: {x: -6.2, y: 4.06} m_SizeDelta: {x: 0.1, y: 0.1} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1236997343 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1236997344} - - component: {fileID: 1236997346} - - component: {fileID: 1236997345} - m_Layer: 5 - m_Name: Skill Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1236997344 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236997343} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1201795050} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -40, y: -40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1236997345 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236997343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1236997346 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236997343} - m_CullTransparentMesh: 1 --- !u!1 &1268941402 GameObject: m_ObjectHideFlags: 0 @@ -2293,7 +2120,7 @@ MonoBehaviour: m_HandleRect: {fileID: 505319090} m_Direction: 2 m_Value: 0 - m_Size: 0.9999971 + m_Size: 0.9999964 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2470,82 +2297,11 @@ RectTransform: m_AnchoredPosition: {x: -2.27, y: 3.84} m_SizeDelta: {x: 0.1, y: 0.1} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1499498773 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1499498774} - - component: {fileID: 1499498776} - - component: {fileID: 1499498775} - m_Layer: 5 - m_Name: Skill Slot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1499498774 +--- !u!224 &1499498774 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + m_PrefabInstance: {fileID: 3631551758123900143} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499498773} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 301396582} - m_Father: {fileID: 1202458216} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1499498775 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499498773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cdbbcfeb5f68c0c4ca7d4baa4701ddbb, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1499498776 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499498773} - m_CullTransparentMesh: 1 --- !u!1001 &1560373793 PrefabInstance: m_ObjectHideFlags: 0 @@ -3162,6 +2918,103 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &3631551758123900143 +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: 0 + 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: 0 + 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: 0 + objectReference: {fileID: 0} + - target: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs index fd63748d..c3dd7171 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs @@ -8,18 +8,18 @@ namespace TON { PANEL_START, - TitleUI, - CharaterCreateUI, + TitleUI, // 게임 시작 화면 UI + CharaterCreateUI, // 캐릭터 생성 UI CharaterSelectUI, - IngameUI, - ControllerUI, - LobbyUI, - LogUI, - - + ControllerUI, // 캐릭터 컨트롤러 UI + LobbyUI, // 게임 로비 UI + SkillSettingUI, // 스킬 세팅 팝업 UI + + GameOverUI, // 게임 오버 시 노출되는 UI GameWinUI, // 게임 클리어 시 노출되는 UI PauseUI, // 일시중지 버튼 선택 시 노출되는 UI + IngameUI, // 인게임 표시 UI IngameOptionUI, // 화면 우측 상단 골드, 인벤토리, 옵션 버튼 UI diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs new file mode 100644 index 00000000..9cb5ab7f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class SkillSettingUI : UIBase + { + public static SkillSettingUI Instance => UIManager.Singleton.GetUI(UIList.SkillSettingUI); + + public List slots; + + public void Start() + { + + } + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs.meta new file mode 100644 index 00000000..998cf67a --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c6e661998b1a293438a43cb63d82bd7f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs new file mode 100644 index 00000000..36ae1d7d --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class SkillSettingUI_SkillSlot : MonoBehaviour + { + public GameObject lockerImage; + + public void SelectedSlot() + { + lockerImage.SetActive(true); + } + + public void UnselectedSlot() + { + lockerImage.SetActive(false); + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta new file mode 100644 index 00000000..52755d3f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19db9b1bf85c67042afc28005a6af101 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: