diff --git a/Assets/Inventory System/Scripts/UI/ItemUI.cs b/Assets/Inventory System/Scripts/UI/ItemUI.cs index 41bc5ef5..470bf839 100644 --- a/Assets/Inventory System/Scripts/UI/ItemUI.cs +++ b/Assets/Inventory System/Scripts/UI/ItemUI.cs @@ -239,7 +239,9 @@ namespace SimpleInventorySystem } else { - container.SetActive(false); + // TODO: see if this is needed + if(container != null) + container.SetActive(false); return true; } } diff --git a/Assets/Inventory System/Scripts/UI/SlotUI.cs b/Assets/Inventory System/Scripts/UI/SlotUI.cs index 84f34705..86fc6c37 100644 --- a/Assets/Inventory System/Scripts/UI/SlotUI.cs +++ b/Assets/Inventory System/Scripts/UI/SlotUI.cs @@ -551,7 +551,7 @@ namespace SimpleInventorySystem { if (InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false)) { - Debug.Log("pressed"); + //Debug.Log("pressed"); return; } diff --git a/Assets/Scenes/NeoFPS Test-TonysEdit.unity b/Assets/Scenes/NeoFPS Test-TonysEdit.unity index 21fdaba5..1e64e601 100644 --- a/Assets/Scenes/NeoFPS Test-TonysEdit.unity +++ b/Assets/Scenes/NeoFPS Test-TonysEdit.unity @@ -42928,6 +42928,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -43068,6 +43093,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -43133,6 +43183,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -43363,6 +43433,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606530529104, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -43388,6 +43478,56 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -43413,6 +43553,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -445 objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y