From 1f4659c3c0a5c8a491199bba789815f9d7ac8f3b Mon Sep 17 00:00:00 2001 From: Vova Date: Thu, 13 Apr 2023 19:50:43 +0300 Subject: [PATCH] start to make tabs --- Assets/Prefabs/UI/JobItemUiTemplate.prefab | 98 +---- Assets/Prefabs/UI/JobSelectorUI.prefab | 411 +++++++++++++++++- Assets/Prefabs/UI/TabTemplateUI.prefab | 304 +++++++++++++ Assets/Prefabs/UI/TabTemplateUI.prefab.meta | 7 + .../JobPositions/Minimarket.asset | 19 + .../JobPositions/Minimarket.asset.meta | 8 + Assets/Scripts/UIElements/JobSelectorUI.cs | 37 +- Assets/Scripts/UIElements/JobTabUITemplate.cs | 36 ++ .../UIElements/JobTabUITemplate.cs.meta | 11 + Assets/Scripts/UIElements/TimeSliderUI.cs | 14 +- 10 files changed, 835 insertions(+), 110 deletions(-) create mode 100644 Assets/Prefabs/UI/TabTemplateUI.prefab create mode 100644 Assets/Prefabs/UI/TabTemplateUI.prefab.meta create mode 100644 Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset create mode 100644 Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset.meta create mode 100644 Assets/Scripts/UIElements/JobTabUITemplate.cs create mode 100644 Assets/Scripts/UIElements/JobTabUITemplate.cs.meta diff --git a/Assets/Prefabs/UI/JobItemUiTemplate.prefab b/Assets/Prefabs/UI/JobItemUiTemplate.prefab index 27cc26fb..31767fe7 100644 --- a/Assets/Prefabs/UI/JobItemUiTemplate.prefab +++ b/Assets/Prefabs/UI/JobItemUiTemplate.prefab @@ -36,7 +36,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: 239.4, y: 0} + m_AnchoredPosition: {x: 165.4, y: 0} m_SizeDelta: {x: 0, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &930127345241834450 @@ -244,7 +244,7 @@ MonoBehaviour: m_EditorClassIdentifier: _descreiption: {fileID: 3870220567668916177} _sallary: {fileID: 5348778865947662906} - _icon: {fileID: 7353182351013950916} + _icon: {fileID: 0} --- !u!1 &5399704626302060193 GameObject: m_ObjectHideFlags: 0 @@ -413,7 +413,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1740965549210461778} - {fileID: 4104292198911527695} - {fileID: 7707189450545850178} m_Father: {fileID: 9065471836884485705} @@ -421,7 +420,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: 220.79999, y: 0} + m_AnchoredPosition: {x: 183.79999, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6626853770728912630 @@ -546,94 +545,3 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &7728504786641687500 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1740965549210461778} - - component: {fileID: 6576636592496274871} - - component: {fileID: 7353182351013950916} - - component: {fileID: 6092658479867777759} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1740965549210461778 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728504786641687500} - 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: 7254749674437777779} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 32, y: 0} - m_SizeDelta: {x: 64, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6576636592496274871 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728504786641687500} - m_CullTransparentMesh: 1 ---- !u!114 &7353182351013950916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728504786641687500} - 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: 40259e4947454c74bb483b1fab03888e, 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!114 &6092658479867777759 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7728504786641687500} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 0 diff --git a/Assets/Prefabs/UI/JobSelectorUI.prefab b/Assets/Prefabs/UI/JobSelectorUI.prefab index cf00e49d..cd25caa7 100644 --- a/Assets/Prefabs/UI/JobSelectorUI.prefab +++ b/Assets/Prefabs/UI/JobSelectorUI.prefab @@ -72,10 +72,15 @@ MonoBehaviour: _description: {fileID: 24535701213815296} _btnCancel: {fileID: 7013805291510916669} _btnOk: {fileID: 8583321522316129160} - _container: {fileID: 3731607605728727607} + _itemsContainer: {fileID: 3731607605728727607} + _tabsContainer: {fileID: 1207846913041912348} _jobItemUItemplate: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f, type: 3} - _jobs: {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2} + _jobTabUItemplate: {fileID: 5217370655548404981, guid: ea2a34492b0d3704cbec939efd66d26d, + type: 3} + _jobs: + - {fileID: 11400000, guid: 137a0a77aa02f614ead909f23a670e95, type: 2} + - {fileID: 11400000, guid: f0d3baaabf19f9a4a80e227316362d84, type: 2} --- !u!1 &647124589374608551 GameObject: m_ObjectHideFlags: 0 @@ -495,6 +500,84 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &4120408095669385135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1207846913041912348} + - component: {fileID: 3595693732798921224} + - component: {fileID: 1014568743049487013} + m_Layer: 0 + m_Name: Categories + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1207846913041912348 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4120408095669385135} + 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: 6601132036907049051} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 75, y: 0} + m_SizeDelta: {x: 150, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3595693732798921224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4120408095669385135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &1014568743049487013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4120408095669385135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &5218368191141696415 GameObject: m_ObjectHideFlags: 0 @@ -531,7 +614,7 @@ RectTransform: m_Children: - {fileID: 9160857369077829901} - {fileID: 2425753779336024065} - - {fileID: 3731607605728727607} + - {fileID: 6601132036907049051} - {fileID: 6625822166793868106} m_Father: {fileID: 8958716429631575486} m_RootOrder: 0 @@ -758,13 +841,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6648371948412499500} + m_Children: + - {fileID: 4329202165643033270} + m_Father: {fileID: 6601132036907049051} m_RootOrder: -1 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: 230.935, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8585709775089406178 @@ -807,6 +891,86 @@ MonoBehaviour: m_ChildScaleWidth: 1 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 +--- !u!1 &6761822786400578276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6601132036907049051} + - component: {fileID: 6543732096769088935} + - component: {fileID: 6620728592913174509} + m_Layer: 0 + m_Name: TabArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6601132036907049051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6761822786400578276} + 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: 1207846913041912348} + - {fileID: 3731607605728727607} + m_Father: {fileID: 6648371948412499500} + m_RootOrder: -1 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6543732096769088935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6761822786400578276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 +--- !u!114 &6620728592913174509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6761822786400578276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &8265216844573033635 GameObject: m_ObjectHideFlags: 0 @@ -886,6 +1050,241 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 1 +--- !u!1001 &4745506429519002879 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3731607605728727607} + m_Modifications: + - target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 1740965549210461778, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3310662501840371697, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_Name + value: JobItemUiTemplate + objectReference: {fileID: 0} + - target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4104292198911527695, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: _sallary + value: + objectReference: {fileID: 0} + - target: {fileID: 4899774397145829728, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: _descreiption + value: + objectReference: {fileID: 0} + - target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7254749674437777779, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7707189450545850178, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 5761646621931476650, guid: 3fd1d54e5064a0841972b791abc6919f, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3fd1d54e5064a0841972b791abc6919f, type: 3} +--- !u!224 &4329202165643033270 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9065471836884485705, guid: 3fd1d54e5064a0841972b791abc6919f, + type: 3} + m_PrefabInstance: {fileID: 4745506429519002879} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4885670798789882735 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/TabTemplateUI.prefab b/Assets/Prefabs/UI/TabTemplateUI.prefab new file mode 100644 index 00000000..2084e26f --- /dev/null +++ b/Assets/Prefabs/UI/TabTemplateUI.prefab @@ -0,0 +1,304 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3230305520997086152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5432647048678200379} + - component: {fileID: 6104878219521959638} + - component: {fileID: 7318951392475720473} + - component: {fileID: 7406967669844368677} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5432647048678200379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3230305520997086152} + 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: 6426571136043948259} + m_RootOrder: -1 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6104878219521959638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3230305520997086152} + m_CullTransparentMesh: 1 +--- !u!114 &7318951392475720473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3230305520997086152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Button + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7406967669844368677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3230305520997086152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ef82e356ce0b8542a02cd451578f20b, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: {fileID: 7318951392475720473} + _icon: {fileID: 0} +--- !u!1 &9054346266596908745 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6426571136043948259} + - component: {fileID: 2095979409721925001} + - component: {fileID: 7389452218168167689} + - component: {fileID: 6228128207818899605} + - component: {fileID: 3044722833697255244} + - component: {fileID: 5217370655548404981} + m_Layer: 0 + m_Name: TabTemplateUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6426571136043948259 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054346266596908745} + 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: 5432647048678200379} + m_Father: {fileID: 0} + m_RootOrder: -1 + 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: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2095979409721925001 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054346266596908745} + m_CullTransparentMesh: 1 +--- !u!114 &7389452218168167689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054346266596908745} + 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: 0.07058824} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!114 &6228128207818899605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054346266596908745} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7389452218168167689} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3044722833697255244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054346266596908745} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 +--- !u!114 &5217370655548404981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054346266596908745} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ef82e356ce0b8542a02cd451578f20b, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: {fileID: 7318951392475720473} + _icon: {fileID: 0} diff --git a/Assets/Prefabs/UI/TabTemplateUI.prefab.meta b/Assets/Prefabs/UI/TabTemplateUI.prefab.meta new file mode 100644 index 00000000..8250ec34 --- /dev/null +++ b/Assets/Prefabs/UI/TabTemplateUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea2a34492b0d3704cbec939efd66d26d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset b/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset new file mode 100644 index 00000000..46758403 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3} + m_Name: Minimarket + m_EditorClassIdentifier: + Place: Shop + JobPositionsList: + - {fileID: 11400000, guid: 9dd346cdfec57ee47ad1c06a925769bb, type: 2} + - {fileID: 11400000, guid: 36ad6fbffd0cc574aaf7d76308d965a1, type: 2} + - {fileID: 11400000, guid: 4381db145ac80514c957374e20392b3b, type: 2} diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset.meta b/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset.meta new file mode 100644 index 00000000..343abd10 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 137a0a77aa02f614ead909f23a670e95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIElements/JobSelectorUI.cs b/Assets/Scripts/UIElements/JobSelectorUI.cs index 557250ed..abdec10e 100644 --- a/Assets/Scripts/UIElements/JobSelectorUI.cs +++ b/Assets/Scripts/UIElements/JobSelectorUI.cs @@ -17,11 +17,15 @@ public class JobSelectorUI : MonoBehaviour private Button _btnOk; [SerializeField] - private Transform _container; + private Transform _itemsContainer; + [SerializeField] + private Transform _tabsContainer; [SerializeField] private JobItemUITemplate _jobItemUItemplate; [SerializeField] - private JobsListSO _jobs; + private JobTabUITemplate _jobTabUItemplate; + [SerializeField] + private List _jobs; public void ShowJobSelectionDialog(string title, string description, Action onCancel, Action onConfirm) { @@ -30,13 +34,19 @@ public class JobSelectorUI : MonoBehaviour gameObject.SetActive(true); _title.text = title; _description.text = description; - - foreach (var job in _jobs.JobPositionsList) + //Create Tabs + foreach (var job in _jobs) { - var itemUI = Instantiate(_jobItemUItemplate, _container); + var itemUI = Instantiate(_jobTabUItemplate, _tabsContainer); itemUI.gameObject.SetActive(true); - itemUI.GetComponent().SetItem((job)); + itemUI.GetComponent().SetItem(this,(job.name)); } + //foreach (var job in _jobs.JobPositionsList) + //{ + // var itemUI = Instantiate(_jobItemUItemplate, _container); + // itemUI.gameObject.SetActive(true); + // itemUI.GetComponent().SetItem((job)); + //} _btnCancel.onClick.AddListener(() => { @@ -49,6 +59,21 @@ public class JobSelectorUI : MonoBehaviour Hide(); }); } + + public void OnTabEnter(JobTabUITemplate button) + { + print($"enter to {button.name}"); + } + public void OnTabSelected(JobTabUITemplate button) + { + print($"selected {button.name}"); + } + + public void OnTabExit(JobTabUITemplate button) + { + print($"exit {button.name}"); + } + private void CloseDialog() { UIManager.Instance.Unfreeze(); diff --git a/Assets/Scripts/UIElements/JobTabUITemplate.cs b/Assets/Scripts/UIElements/JobTabUITemplate.cs new file mode 100644 index 00000000..e955aed2 --- /dev/null +++ b/Assets/Scripts/UIElements/JobTabUITemplate.cs @@ -0,0 +1,36 @@ +using TMPro; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +public class JobTabUITemplate : MonoBehaviour, IPointerEnterHandler,IPointerClickHandler, IPointerExitHandler +{ + [SerializeField] + private TextMeshProUGUI _description; + [SerializeField] + private Image _icon; + + private JobSelectorUI _parent; + public void SetItem(JobSelectorUI parent,string name) + { + _parent= parent; + _description.text = name; + //_icon.sprite = item.Icon; + } + + public void OnPointerClick(PointerEventData eventData) + { + _parent.OnTabSelected(this); + } + + public void OnPointerEnter(PointerEventData eventData) + { + _parent.OnTabEnter(this); + } + + public void OnPointerExit(PointerEventData eventData) + { + _parent.OnTabExit(this); + } + +} diff --git a/Assets/Scripts/UIElements/JobTabUITemplate.cs.meta b/Assets/Scripts/UIElements/JobTabUITemplate.cs.meta new file mode 100644 index 00000000..cb4e3753 --- /dev/null +++ b/Assets/Scripts/UIElements/JobTabUITemplate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6ef82e356ce0b8542a02cd451578f20b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIElements/TimeSliderUI.cs b/Assets/Scripts/UIElements/TimeSliderUI.cs index d444331a..abed09b1 100644 --- a/Assets/Scripts/UIElements/TimeSliderUI.cs +++ b/Assets/Scripts/UIElements/TimeSliderUI.cs @@ -17,6 +17,12 @@ public class TimeSliderUI : MonoBehaviour private Slider _slider; private TimeSpan _time; + + private void Start() + { + gameObject.SetActive(false); + } + public void ShowTimeSliderDialog(string title, string description, Action onCancel, Action onConfirm) { TimeManager.Instance.OnFastForwardEnd += CloseDialog; @@ -53,9 +59,11 @@ public class TimeSliderUI : MonoBehaviour private void Update() { - _time = TimeSpan.FromHours(_slider.value); - - _description.text = $"{_time.Hours} hours"; + if (gameObject.activeSelf) + { + _time = TimeSpan.FromHours(_slider.value); + _description.text = $"{_time.Hours} hours"; + } } private void Hide()