Merge branch 'pr/130' into Inventory

UOP1_Project/Assets/Inventory/Scripts/ScriptableObjects/ItemType.cs

 	[SerializeField]
 	private string _actionName = default;
 
+	[Tooltip("The Item's background color in the UI")]
+	[SerializeField] private Color _backgroundColor;
+
+	public Color BackgroundColor => _backgroundColor;
 }

UOP1_Project/Assets/Inventory/Scripts/ScriptableObjects/Item.cs

 	public string Description => _description;
 	public ItemType ItemType => _itemType;
 	public GameObject Prefab => _prefab;
-
 }

UOP1_Project/Assets/Inventory/Scripts/ItemStack.cs

-public class ItemStack
+using System;
+using UnityEngine;
+
+[Serializable]
+public class ItemStack
-	public Item Item { get; }
+	[SerializeField]
+	private Item _item;
-	public int Amount { get; set; }
+	public Item Item => _item;
+
+	public int Amount;
-		Item = item;
+		_item = item;
 		Amount = amount;
 	}
 }

UOP1_Project/Assets/Inventory/Scripts/InventoryController.cs

 		if (other.TryGetComponent<ItemInstance>(out ItemInstance itemInstance))
 		{
 			_inventory.Add(itemInstance.Item);
-			Destroy(itemInstance);
+			Destroy(itemInstance.gameObject);
 		}
 	}
 }

UOP1_Project/Assets/Prefabs/Items/Salad.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3692601780327477930
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3692601780327477934}
+  - component: {fileID: 3692601780327477935}
+  - component: {fileID: 3692601780327477928}
+  - component: {fileID: 3692601780327477929}
+  - component: {fileID: 4601985262004643176}
+  m_Layer: 0
+  m_Name: Salad
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3692601780327477934
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3692601780327477930}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.62, y: 0.469, z: -14.31}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3692601780327477935
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3692601780327477930}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3692601780327477928
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3692601780327477930}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!135 &3692601780327477929
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3692601780327477930}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4601985262004643176
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3692601780327477930}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6c69c8ccffb196541940408e7b7316bc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _item: {fileID: 11400000, guid: ef3f2ff7dbec73a47b7db801bf4347fb, type: 2}

UOP1_Project/Assets/Prefabs/Items/Salad.prefab.meta

+fileFormatVersion: 2
+guid: 5a54f3a933a5913478d31220031b05fc
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Inventory/ScriptableObjects/Items.meta

+fileFormatVersion: 2
+guid: f7c211e5fa39cbe4aae8dc1c5f2fc325
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Inventory/ScriptableObjects/Items/Salad.asset.meta

+fileFormatVersion: 2
+guid: ef3f2ff7dbec73a47b7db801bf4347fb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Inventory/ScriptableObjects/Items/Salad.asset

+%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: 58a5b32581978a141a66d240261449d0, type: 3}
+  m_Name: Salad
+  m_EditorClassIdentifier: 
+  _name: Salad
+  _previewImage: {fileID: 0}
+  _description: A green salad
+  _itemType: {fileID: 11400000, guid: 24ac82c7b4c359e46971d2d454d1f434, type: 2}
+  _prefab: {fileID: 3692601780327477930, guid: 5a54f3a933a5913478d31220031b05fc, type: 3}

UOP1_Project/Assets/Inventory/ScriptableObjects/PlayerInventory.asset

+%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: b39a296438081ff4c99abec393d12d54, type: 3}
+  m_Name: PlayerInventory
+  m_EditorClassIdentifier: 
+  _items: []

UOP1_Project/Assets/Inventory/ScriptableObjects/PlayerInventory.asset.meta

+fileFormatVersion: 2
+guid: 59c84467f7726dc4587a8373b0936f03
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Inventory/Scripts.meta

+fileFormatVersion: 2
+guid: ae042d26dee93eb4ea906e8b3335ca9d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Scripts/Inventory.meta

-fileFormatVersion: 2
-guid: 8b5b1f0aab7d74e4b9c6be7a4cb8d1ef
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: