From e4eaaea8cc39f53f8296c7bf73915ea299e3d9b7 Mon Sep 17 00:00:00 2001
From: Vova <vova.koshevarov@gmail.com>
Date: Sun, 16 Apr 2023 19:12:39 +0300
Subject: [PATCH] ui fix

---
 Assets/Prefabs/UI/JobItemUiTemplate.prefab      |  2 +-
 Assets/Prefabs/UI/JobSelectorUI.prefab          |  6 +++---
 .../JobPositions/Cashier.asset                  | 17 +++++++++++++++++
 .../JobPositions/Cashier.asset.meta             |  8 ++++++++
 .../JobPositions/Minimarket.asset               |  2 +-
 .../JobPositions/{Shop.asset => Office.asset}   |  2 +-
 .../{Shop.asset.meta => Office.asset.meta}      |  0
 7 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset
 create mode 100644 Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset.meta
 rename Assets/Scripts/ScriptableObjects/JobPositions/{Shop.asset => Office.asset} (97%)
 rename Assets/Scripts/ScriptableObjects/JobPositions/{Shop.asset.meta => Office.asset.meta} (100%)

diff --git a/Assets/Prefabs/UI/JobItemUiTemplate.prefab b/Assets/Prefabs/UI/JobItemUiTemplate.prefab
index 31767fe7..0d08a3e0 100644
--- a/Assets/Prefabs/UI/JobItemUiTemplate.prefab
+++ b/Assets/Prefabs/UI/JobItemUiTemplate.prefab
@@ -209,7 +209,7 @@ MonoBehaviour:
     m_Bottom: 0
   m_ChildAlignment: 0
   m_Spacing: 10
-  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
diff --git a/Assets/Prefabs/UI/JobSelectorUI.prefab b/Assets/Prefabs/UI/JobSelectorUI.prefab
index 5db19e6f..e49f797e 100644
--- a/Assets/Prefabs/UI/JobSelectorUI.prefab
+++ b/Assets/Prefabs/UI/JobSelectorUI.prefab
@@ -885,10 +885,10 @@ MonoBehaviour:
   m_Spacing: 10
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
+  m_ChildControlWidth: 0
   m_ChildControlHeight: 1
-  m_ChildScaleWidth: 1
-  m_ChildScaleHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
 --- !u!1 &6761822786400578276
 GameObject:
diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset b/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset
new file mode 100644
index 00000000..0d8a1df6
--- /dev/null
+++ b/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset
@@ -0,0 +1,17 @@
+%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: 5e5ea608dd4175941b878e8e1a585970, type: 3}
+  m_Name: Cashier
+  m_EditorClassIdentifier: 
+  Description: Cashier
+  Salary: 5
+  JobPosition: 1
diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset.meta b/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset.meta
new file mode 100644
index 00000000..7db24614
--- /dev/null
+++ b/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c7452dc6dfb2cc040a6d0e543db6b671
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset b/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset
index 46758403..98f4efce 100644
--- a/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset
+++ b/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset
@@ -14,6 +14,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Place: Shop
   JobPositionsList:
-  - {fileID: 11400000, guid: 9dd346cdfec57ee47ad1c06a925769bb, type: 2}
+  - {fileID: 11400000, guid: c7452dc6dfb2cc040a6d0e543db6b671, type: 2}
   - {fileID: 11400000, guid: 36ad6fbffd0cc574aaf7d76308d965a1, type: 2}
   - {fileID: 11400000, guid: 4381db145ac80514c957374e20392b3b, type: 2}
diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Shop.asset b/Assets/Scripts/ScriptableObjects/JobPositions/Office.asset
similarity index 97%
rename from Assets/Scripts/ScriptableObjects/JobPositions/Shop.asset
rename to Assets/Scripts/ScriptableObjects/JobPositions/Office.asset
index 5cd6b299..7979b8a6 100644
--- a/Assets/Scripts/ScriptableObjects/JobPositions/Shop.asset
+++ b/Assets/Scripts/ScriptableObjects/JobPositions/Office.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3}
-  m_Name: Shop
+  m_Name: Office
   m_EditorClassIdentifier: 
   Place: Shop
   JobPositionsList:
diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Shop.asset.meta b/Assets/Scripts/ScriptableObjects/JobPositions/Office.asset.meta
similarity index 100%
rename from Assets/Scripts/ScriptableObjects/JobPositions/Shop.asset.meta
rename to Assets/Scripts/ScriptableObjects/JobPositions/Office.asset.meta