More fixing for pick-up
This commit is contained in:
parent
6e13c5dd08
commit
483bd34e2e
@ -239,7 +239,9 @@ namespace SimpleInventorySystem
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
container.SetActive(false);
|
// TODO: see if this is needed
|
||||||
|
if(container != null)
|
||||||
|
container.SetActive(false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -551,7 +551,7 @@ namespace SimpleInventorySystem
|
|||||||
{
|
{
|
||||||
if (InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false))
|
if (InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false))
|
||||||
{
|
{
|
||||||
Debug.Log("pressed");
|
//Debug.Log("pressed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42663,6 +42663,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -42898,6 +42903,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -42918,6 +42928,31 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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,
|
- target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -43031,12 +43066,12 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
value: 0
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -43058,6 +43093,31 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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,
|
- target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -43086,17 +43146,17 @@ PrefabInstance:
|
|||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
value: 0
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: -2500
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
@ -43123,6 +43183,26 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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,
|
- target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -43353,6 +43433,26 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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,
|
- target: {fileID: 2770326606530529104, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -43378,6 +43478,56 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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,
|
- target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
@ -43403,6 +43553,31 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -445
|
value: -445
|
||||||
objectReference: {fileID: 0}
|
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,
|
- target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMin.y
|
propertyPath: m_AnchorMin.y
|
||||||
|
Loading…
Reference in New Issue
Block a user