Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 917f314cd7500ab41a37e0c60edaf755
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e14f9199031928442a76fcb851644355
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/Substance.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3a1c9292d8fac714e9091922355abcd7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 50c3f69bf74856340867f04dd9288b24
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc9e432e1a0a4764f80870c080173cb7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scipts/Recipe.cs

@@ -72,10 +72,7 @@ public class Recipe : MonoBehaviour {
         Inventory.sprite = newVeggie.Image;
     }
 
-    public void dropItem()
-    {
-        Inventory.gameObject.SetActive(false);
-    }
+
     public void friendlyPickup(string VeggieName, int change)
     {
         StartCoroutine(ItemLookup(VeggieName, change));
@@ -96,6 +93,7 @@ public class Recipe : MonoBehaviour {
 
     IEnumerator ItemLookup(string VeggieName, int change)
     {
+        Debug.Log("Veggie" + VeggieName + " " + change);
         for (int i = 0; i < Veggies.Length; i++)
         {
             if(Veggies[i].Name == VeggieName)