diff --git a/Assets/Prefabs/UI/JobItem.prefab b/Assets/Prefabs/UI/JobItemUiTemplate.prefab similarity index 95% rename from Assets/Prefabs/UI/JobItem.prefab rename to Assets/Prefabs/UI/JobItemUiTemplate.prefab index 145401ab..72a4dccb 100644 --- a/Assets/Prefabs/UI/JobItem.prefab +++ b/Assets/Prefabs/UI/JobItemUiTemplate.prefab @@ -146,8 +146,9 @@ GameObject: - component: {fileID: 9065471836884485705} - component: {fileID: 3637572414071911453} - component: {fileID: 6605947190731058184} + - component: {fileID: 4899774397145829728} m_Layer: 5 - m_Name: JobItem + m_Name: JobItemUiTemplate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -216,6 +217,21 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!114 &4899774397145829728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310662501840371697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3e8f5b6c634f0348a6d19591cef88e2, type: 3} + m_Name: + m_EditorClassIdentifier: + _descreiption: {fileID: 3870220567668916177} + _sallary: {fileID: 5348778865947662906} + _icon: {fileID: 7353182351013950916} --- !u!1 &5399704626302060193 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/JobItem.prefab.meta b/Assets/Prefabs/UI/JobItemUiTemplate.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/JobItem.prefab.meta rename to Assets/Prefabs/UI/JobItemUiTemplate.prefab.meta diff --git a/Assets/Prefabs/UI/ChoseDialogPrefabUI.prefab b/Assets/Prefabs/UI/JobSelectorUI.prefab similarity index 99% rename from Assets/Prefabs/UI/ChoseDialogPrefabUI.prefab rename to Assets/Prefabs/UI/JobSelectorUI.prefab index 22701750..59304a11 100644 --- a/Assets/Prefabs/UI/ChoseDialogPrefabUI.prefab +++ b/Assets/Prefabs/UI/JobSelectorUI.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5407876737168081677} - component: {fileID: 3776407727599883163} m_Layer: 5 - m_Name: ChoseDialogPrefabUI + m_Name: JobSelectorUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -68,6 +68,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26f26f444ba4dae48853b4658b997156, type: 3} m_Name: m_EditorClassIdentifier: + _title: {fileID: 560729084887753269} + _description: {fileID: 24535701213815296} + _btnCancel: {fileID: 7013805291510916669} + _btnOk: {fileID: 8583321522316129160} + _container: {fileID: 3731607605728727607} + _jobItemUItemplate: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + _jobs: {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2} --- !u!1 &647124589374608551 GameObject: m_ObjectHideFlags: 0 @@ -733,7 +741,7 @@ GameObject: - component: {fileID: 8585709775089406178} - component: {fileID: 3101455637694641571} m_Layer: 5 - m_Name: ChoseArea + m_Name: ContainerArea m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/UI/ChoseDialogPrefabUI.prefab.meta b/Assets/Prefabs/UI/JobSelectorUI.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/ChoseDialogPrefabUI.prefab.meta rename to Assets/Prefabs/UI/JobSelectorUI.prefab.meta diff --git a/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab b/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab index 311f056a..a6da5841 100644 --- a/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab +++ b/Assets/Prefabs/UI/TimeSliderPrefabUI.prefab @@ -89,9 +89,9 @@ RectTransform: m_Father: {fileID: 2425753779336024065} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 136.515, y: -35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 136.515, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8491863560958911165 @@ -506,9 +506,9 @@ RectTransform: m_Father: {fileID: 6648371948412499500} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 154.1939, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 154.1939, y: 0} m_SizeDelta: {x: 308.3878, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5677520149483722787 @@ -928,9 +928,9 @@ RectTransform: m_Father: {fileID: 6648371948412499500} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 154.1939, y: -205} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 154.1939, y: 0} m_SizeDelta: {x: 308.3878, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1843006956921425075 @@ -1007,9 +1007,9 @@ RectTransform: m_Father: {fileID: 6648371948412499500} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 154.1939, y: -145} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 154.1939, y: 0} m_SizeDelta: {x: 308.3878, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8585709775089406178 @@ -1231,7 +1231,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: 0, y: 0} + m_AnchoredPosition: {x: 154.1939, y: 0} m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6806840113668947922 @@ -1302,12 +1302,12 @@ PrefabInstance: - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1327,7 +1327,7 @@ PrefabInstance: - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1387,7 +1387,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1397,7 +1397,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1467,7 +1467,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1637,12 +1637,12 @@ PrefabInstance: - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1662,7 +1662,7 @@ PrefabInstance: - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1722,7 +1722,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1732,7 +1732,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -1787,7 +1787,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} diff --git a/Assets/Scenes/House.unity b/Assets/Scenes/House.unity index 29dd92b5..138da27a 100644 --- a/Assets/Scenes/House.unity +++ b/Assets/Scenes/House.unity @@ -667,6 +667,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1183069676240985885, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: _jobSelectorPrefab + value: + objectReference: {fileID: 3776407727599883163, guid: 2ad5edd099127044684eeca456ed3d00, + type: 3} - target: {fileID: 1242043948948750320, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchorMax.y @@ -1815,12 +1821,12 @@ PrefabInstance: - target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -1830,7 +1836,7 @@ PrefabInstance: - target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 7447373990901456422, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 29af323a..96388660 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.AI; @@ -52,6 +53,8 @@ public class Player : MonoBehaviour _navAgent.updatePosition = false; _currentActing = PlayerStates.Awake; + + UIManager.Instance.ShowJobSelectionDialog("Job agency", "job offers", null, null); } private void OnDestroy() diff --git a/Assets/Scripts/ScriptableObjects/JobInfoSO.cs b/Assets/Scripts/ScriptableObjects/JobInfoSO.cs index 1159a60f..23f2fefb 100644 --- a/Assets/Scripts/ScriptableObjects/JobInfoSO.cs +++ b/Assets/Scripts/ScriptableObjects/JobInfoSO.cs @@ -3,7 +3,7 @@ using UnityEngine; [CreateAssetMenu()] public class JobInfoSO : ScriptableObject { - public string Name; + public string Description; public float Salary; public JobPositions JobPosition; } diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset b/Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset index d041456f..9a62363d 100644 --- a/Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset +++ b/Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3} m_Name: Clerk m_EditorClassIdentifier: - Name: Clerk + Description: Clerk Salary: 5 JobPosition: 1 diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset b/Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset index 06e9b529..3f03ac7b 100644 --- a/Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset +++ b/Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3} m_Name: Manager m_EditorClassIdentifier: - Name: Manager + Description: Manager Salary: 9 JobPosition: 3 diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset b/Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset index 0188564b..b3fc0f52 100644 --- a/Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset +++ b/Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e5ea608dd4175941b878e8e1a585970, type: 3} m_Name: ManagerAssistant m_EditorClassIdentifier: - Name: Manager Assistant + Description: Manager assistaint Salary: 6 JobPosition: 2 diff --git a/Assets/Scripts/UIElements/JobItemUITemplate.cs b/Assets/Scripts/UIElements/JobItemUITemplate.cs index d9bcc33a..fc07ce36 100644 --- a/Assets/Scripts/UIElements/JobItemUITemplate.cs +++ b/Assets/Scripts/UIElements/JobItemUITemplate.cs @@ -1,9 +1,20 @@ -using System.Collections; -using System.Collections.Generic; +using TMPro; using UnityEngine; +using UnityEngine.UI; public class JobItemUITemplate : MonoBehaviour { - public string Description { get; set; } - public string Sallary { get; set; } + [SerializeField] + private TextMeshProUGUI _descreiption; + [SerializeField] + private TextMeshProUGUI _sallary; + [SerializeField] + private Image _icon; + + public void SetItem(JobInfoSO item) + { + _descreiption.text = item.Description; + _sallary.text = $"{item.Salary}$"; + //_icon.sprite = item.Icon; + } } diff --git a/Assets/Scripts/UIElements/JobSelectorUI.cs b/Assets/Scripts/UIElements/JobSelectorUI.cs index dd2e93ed..3c030863 100644 --- a/Assets/Scripts/UIElements/JobSelectorUI.cs +++ b/Assets/Scripts/UIElements/JobSelectorUI.cs @@ -19,7 +19,7 @@ public class JobSelectorUI : MonoBehaviour [SerializeField] private Transform _container; [SerializeField] - private JobItemUITemplate _jobItemUI; + private JobItemUITemplate _jobItemUItemplate; [SerializeField] private JobsListSO _jobs; @@ -33,7 +33,9 @@ public class JobSelectorUI : MonoBehaviour foreach (var job in _jobs.JobPositionsList) { - + var itemUI = Instantiate(_jobItemUItemplate, _container); + itemUI.gameObject.SetActive(true); + itemUI.GetComponent().SetItem((job)); } _btnCancel.onClick.AddListener(() => diff --git a/Assets/Scripts/UIElements/ModalWindowPanel.cs b/Assets/Scripts/UIElements/ModalWindowPanel.cs deleted file mode 100644 index 940032b6..00000000 --- a/Assets/Scripts/UIElements/ModalWindowPanel.cs +++ /dev/null @@ -1,60 +0,0 @@ -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public class ModalWindowPanel : MonoBehaviour -{ - [Header("Header")] - [SerializeField] - private Transform _hederArea; - - [SerializeField] - private Transform _titleField; - - [Header("Content")] - [SerializeField] - private Transform _contentArea; - - [SerializeField] - private Transform _verticalLayoutArea; - - [SerializeField] - private Image _heroImage; - - [SerializeField] - private TextMeshProUGUI _heroText; - - [Space()] - [SerializeField] - private Transform _horizontalLayoutArea; - - [SerializeField] - private Image _iconImage; - - [SerializeField] - private TextMeshProUGUI _iconText; - - [Header("Footer")] - [SerializeField] - private Transform _footerArea; - - [SerializeField] - private Button _confirmButton; - - [SerializeField] - private Button _declineButton; - - //private Action onConfirmAction; - //private Action onDeclineAction; - - public void Confirm() - { - // onConfirmAction?.Invoke(); - // Close(); - } - public void Decline() - { - // onDeclineAction?.Invoke(); - //Close(); - } -} diff --git a/Assets/Scripts/UIElements/ModalWindowPanel.cs.meta b/Assets/Scripts/UIElements/ModalWindowPanel.cs.meta deleted file mode 100644 index 5a076df6..00000000 --- a/Assets/Scripts/UIElements/ModalWindowPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1c8cd26649ff30a4ea72d44d9bcd0edf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UIElements/UIManager.cs b/Assets/Scripts/UIElements/UIManager.cs index f6881d12..d74aca15 100644 --- a/Assets/Scripts/UIElements/UIManager.cs +++ b/Assets/Scripts/UIElements/UIManager.cs @@ -6,6 +6,8 @@ public class UIManager : MonoBehaviour [SerializeField] public TimeSliderUI _timeSliderPrefab; [SerializeField] + public JobSelectorUI _jobSelectorPrefab; + [SerializeField] public GameObject _blurOverlay; public static UIManager Instance { get; private set; } @@ -30,6 +32,14 @@ public class UIManager : MonoBehaviour timeSlider.ShowTimeSliderDialog(title, description, onCancel, onConfirm); } + public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) + { + var jobSelector = Instantiate(_jobSelectorPrefab, transform); + jobSelector.ShowJobSelectionDialog(title, description, onCancel, onConfirm); + } + + + public void Freeze() { _blurOverlay.SetActive(true);