diff --git a/blueberryPeak/Assets/Prefabs/Stick.prefab b/blueberryPeak/Assets/Prefabs/Stick.prefab index 1b9244b..5e13978 100644 --- a/blueberryPeak/Assets/Prefabs/Stick.prefab +++ b/blueberryPeak/Assets/Prefabs/Stick.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 2194414921720918247} - component: {fileID: 3644914065091979672} - component: {fileID: 5566268700457196979} + - component: {fileID: 6203737900798821036} m_Layer: 0 m_Name: Stick m_TagString: Untagged @@ -68,6 +69,20 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.8, y: 0.6, z: 2.07} m_Center: {x: 0, y: 0, z: -0.37} +--- !u!114 &6203737900798821036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735147224235397921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: 744b16d2-d1bf-4074-a967-a3c2caf16ecc + type: 2 --- !u!1001 &2343360094618611992 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/blueberryPeak/Assets/Scripts/Player/TwigInteraction.cs b/blueberryPeak/Assets/Scripts/Player/TwigInteraction.cs index 7898f0d..9b35bbc 100644 --- a/blueberryPeak/Assets/Scripts/Player/TwigInteraction.cs +++ b/blueberryPeak/Assets/Scripts/Player/TwigInteraction.cs @@ -15,13 +15,16 @@ public class TwigInteraction : MonoBehaviour void Start() { + if (collected) + { + Destroy(gameObject); + } } void OnTriggerEnter(Collider other) { if (!collected) { - // Play the "Play_BerryWithBush" event if bush has berries // PlayBerryWithBushEvent.Post(gameObject); @@ -31,7 +34,6 @@ public class TwigInteraction : MonoBehaviour collected = true; } - } public void SetCollected(bool picked)