New Job selection UI

2023-04-20 18:11:07 +03:00
parent a0e112f696
commit 1ffaa079e6
21 changed files with 882 additions and 2221 deletions
@@ -5,5 +5,6 @@ public class JobInfoSO : ScriptableObject
 {
    public string Description;
    public float Salary;
+    public Sprite Icon;
    public JobPositions JobPosition;
 }
@@ -14,4 +14,5 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  Description: Cashier
  Salary: 5
+  Icon: {fileID: 21300000, guid: 4dfead30e6ab1cb458b7476ad0dedeb7, type: 3}
  JobPosition: 1
@@ -13,6 +13,7 @@ MonoBehaviour:
  m_Name: Minimarket
  m_EditorClassIdentifier: 
  Place: Shop
+  Icon: {fileID: 21300000, guid: c5e761867408abd48bdbfcc36c949f44, type: 3}
  JobPositionsList:
  - {fileID: 11400000, guid: c7452dc6dfb2cc040a6d0e543db6b671, type: 2}
  - {fileID: 11400000, guid: 36ad6fbffd0cc574aaf7d76308d965a1, type: 2}
@@ -12,7 +12,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3}
  m_Name: Office
  m_EditorClassIdentifier: 
-  Place: Shop
+  Place: Office
+  Icon: {fileID: 21300000, guid: c5e761867408abd48bdbfcc36c949f44, type: 3}
  JobPositionsList:
  - {fileID: 11400000, guid: 9dd346cdfec57ee47ad1c06a925769bb, type: 2}
  - {fileID: 11400000, guid: 36ad6fbffd0cc574aaf7d76308d965a1, type: 2}
@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UIElements;

 [CreateAssetMenu()]
 public class JobsListSO : ScriptableObject
 {
    public string Place;
+    public Sprite Icon;
    public List<JobInfoSO> JobPositionsList;
 }
@@ -15,6 +15,6 @@ public class JobItemUITemplate : MonoBehaviour
    {
        _descreiption.text = item.Description;
        _sallary.text = $"{item.Salary}$";
-        //_icon.sprite = item.Icon;
+        _icon.sprite = item.Icon;
    }
 }
@@ -1,4 +1,5 @@
 using TMPro;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -18,8 +19,7 @@ public class JobTabUITemplate : MonoBehaviour, IPointerEnterHandler,IPointerClic
    {
        _jobListItem = jobListItem;
        _parent = parent;
-        _description.text = jobListItem.name;
-        //_icon.sprite = item.Icon;
+        _icon.sprite = jobListItem.Icon;
    }

    public void OnPointerClick(PointerEventData eventData)