From 92e21df9bf2b07dd86c78dfd6c109f51e253b6dd Mon Sep 17 00:00:00 2001 From: Vova Date: Sun, 16 Apr 2023 16:07:14 +0300 Subject: [PATCH] fix tabs ui --- Assets/Prefabs/UI/JobSelectorUI.prefab | 28 +++++++++---------- Assets/Scripts/UIElements/JobSelectorUI.cs | 18 ++++++++++-- Assets/Scripts/UIElements/JobTabUITemplate.cs | 4 ++- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Assets/Prefabs/UI/JobSelectorUI.prefab b/Assets/Prefabs/UI/JobSelectorUI.prefab index 1599a6fe..5db19e6f 100644 --- a/Assets/Prefabs/UI/JobSelectorUI.prefab +++ b/Assets/Prefabs/UI/JobSelectorUI.prefab @@ -269,8 +269,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 155.935, y: 0} - m_SizeDelta: {x: 311.87, y: 0} + m_AnchoredPosition: {x: 275, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5677520149483722787 MonoBehaviour: @@ -769,8 +769,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 155.935, y: 0} - m_SizeDelta: {x: 311.87, y: 0} + m_AnchoredPosition: {x: 275, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1843006956921425075 MonoBehaviour: @@ -847,8 +847,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 230.935, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 350, y: 0} + m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8585709775089406178 MonoBehaviour: @@ -862,7 +862,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 + m_HorizontalFit: 0 m_VerticalFit: 2 --- !u!114 &3101455637694641571 MonoBehaviour: @@ -885,8 +885,8 @@ MonoBehaviour: m_Spacing: 10 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 m_ChildScaleWidth: 1 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 @@ -927,8 +927,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 155.935, y: 0} - m_SizeDelta: {x: 311.87, y: 0} + m_AnchoredPosition: {x: 275, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6543732096769088935 MonoBehaviour: @@ -1006,7 +1006,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 155.935, y: 0} + m_AnchoredPosition: {x: 275, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6806840113668947922 @@ -1247,7 +1247,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.9025 + value: 412.5 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1577,7 +1577,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.x - value: 77.9675 + value: 137.5 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} diff --git a/Assets/Scripts/UIElements/JobSelectorUI.cs b/Assets/Scripts/UIElements/JobSelectorUI.cs index 5782ed65..b87e08e5 100644 --- a/Assets/Scripts/UIElements/JobSelectorUI.cs +++ b/Assets/Scripts/UIElements/JobSelectorUI.cs @@ -27,6 +27,7 @@ public class JobSelectorUI : MonoBehaviour [SerializeField] private List _jobs; + private JobTabUITemplate _selectedTab; public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) { UIManager.Instance.Freeze(); @@ -62,16 +63,27 @@ public class JobSelectorUI : MonoBehaviour public void OnTabEnter(JobTabUITemplate button) { - print($"enter to {button._jobListItem.name}"); + print($"enter to {button.JobListItem.name}"); } public void OnTabSelected(JobTabUITemplate button) { - print($"selected {button._jobListItem.name}"); + _selectedTab = button; + while (_itemsContainer.childCount > 0) + { + DestroyImmediate(_itemsContainer.GetChild(0).gameObject); + } + foreach (var job in _selectedTab.JobListItem.JobPositionsList) + { + var itemUI = Instantiate(_jobItemUItemplate, _itemsContainer); + itemUI.gameObject.SetActive(true); + itemUI.GetComponent().SetItem((job)); + } + print($"selected {button.JobListItem.name}"); } public void OnTabExit(JobTabUITemplate button) { - print($"exit {button._jobListItem.name}"); + print($"exit {button.JobListItem.name}"); } private void CloseDialog() diff --git a/Assets/Scripts/UIElements/JobTabUITemplate.cs b/Assets/Scripts/UIElements/JobTabUITemplate.cs index 6998f4c6..edcd4850 100644 --- a/Assets/Scripts/UIElements/JobTabUITemplate.cs +++ b/Assets/Scripts/UIElements/JobTabUITemplate.cs @@ -9,7 +9,9 @@ public class JobTabUITemplate : MonoBehaviour, IPointerEnterHandler,IPointerClic private TextMeshProUGUI _description; [SerializeField] private Image _icon; - public JobsListSO _jobListItem; + + public JobsListSO JobListItem=> _jobListItem; + private JobsListSO _jobListItem; private JobSelectorUI _parent; public void SetItem(JobSelectorUI parent, JobsListSO jobListItem)