sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into dhain

Browse source 
# Conflicts:
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/TileBehaviour.cs
This commit is contained in:
dhain 2022-06-09 16:52:46 +02:00
commit 38efeb6af6
191 changed files with 1070 additions and 751 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/InventorySlot.cs
View file

@ -18,9 +18,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();