diff --git a/Assets/Prefabs/Items/Items.asset b/Assets/Prefabs/Items/Items.asset index ee01b0d..b6b8ee7 100644 --- a/Assets/Prefabs/Items/Items.asset +++ b/Assets/Prefabs/Items/Items.asset @@ -13,49 +13,49 @@ MonoBehaviour: m_Name: Items m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.Items.SerializedItemInfoRegistry Registry: - - Type: 0 + - Type: 1 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 23e3bfe33d8c6004c85fd638db567ab6, type: 3} MinMoney: 0.5 MaxMoney: 1.5 - - Type: 1 + - Type: 2 CustomBehaviour: 1 Prefab: {fileID: 8799415981405337049, guid: c21e0b5539573904cb10d979de4a3f72, type: 3} MinMoney: 3 MaxMoney: 7 - - Type: 2 + - Type: 3 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 5e1f7f5d4294c1d4fa3e6f88dec0dfa6, type: 3} MinMoney: 12 MaxMoney: 18 - - Type: 3 + - Type: 4 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: b224b6df33529e64d83245d78e0feb9f, type: 3} MinMoney: 40 MaxMoney: 60 - - Type: 4 + - Type: 5 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 7af455f1c1666e5409156598fe669f74, type: 3} MinMoney: 120 MaxMoney: 160 - - Type: 6 + - Type: 7 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 13f2740b5ae396e40940587ab2effd65, type: 3} MinMoney: 250 MaxMoney: 350 - - Type: 7 + - Type: 8 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: ebddb1b81a288cc4c993a25bc9efe894, type: 3} MinMoney: 800 MaxMoney: 900 - - Type: 5 + - Type: 6 CustomBehaviour: 1 Prefab: {fileID: 4062657912758122058, guid: 2cf42dbc57bb6374b9e6ec700aad5854, type: 3} diff --git a/Assets/Scripts/Game/Items/ItemBehaviour.cs b/Assets/Scripts/Game/Items/ItemBehaviour.cs index 9dfd124..fc376f7 100644 --- a/Assets/Scripts/Game/Items/ItemBehaviour.cs +++ b/Assets/Scripts/Game/Items/ItemBehaviour.cs @@ -1,4 +1,5 @@ using Fruitomation.Global; +using PashaBibko.Pacore.Attributes; using UnityEngine; namespace Fruitomation.Game.Items @@ -13,8 +14,9 @@ namespace Fruitomation.Game.Items private CustomItemBehaviour CustomBehaviour; private GameObject CurrentChild; - - private ItemType InternalItemType; + + [SerializeField, InspectorReadOnly("Item Type")] + private ItemType InternalItemType = ItemType.None; public ItemType CurrentType { diff --git a/Assets/Scripts/Game/Items/SerializedItemInfoRegistry.cs b/Assets/Scripts/Game/Items/SerializedItemInfoRegistry.cs index 04dab1e..31ead0d 100644 --- a/Assets/Scripts/Game/Items/SerializedItemInfoRegistry.cs +++ b/Assets/Scripts/Game/Items/SerializedItemInfoRegistry.cs @@ -12,6 +12,8 @@ namespace Fruitomation.Game.Items [Serializable] public enum ItemType { + None, + Apple, Grape, Banana,