Merge branch 'jweissen' into develop
# Conflicts: # Assets/Scripts/FishingController.cs
This commit is contained in:
commit
35ecec04ef
10 changed files with 186 additions and 211 deletions
|
|
@ -20,9 +20,9 @@ public class InventorySlot : ItemStorageSlot, IPointerClickHandler {
|
|||
if(Item) {
|
||||
if(Item.GetType() == typeof(UsableItem)) {
|
||||
((UsableItem)Item).Select();
|
||||
Debug.Log("using " + Item.displayName);
|
||||
//Debug.Log("using " + Item.displayName);
|
||||
} else {
|
||||
Debug.Log("Item not usable " + Item.displayName);
|
||||
//Debug.Log("Item not usable " + Item.displayName);
|
||||
}
|
||||
} else {
|
||||
_playerController.DeselectItem();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue