diff --git a/Assets/Scenes/_Scene_0.unity b/Assets/Scenes/_Scene_0.unity index b8655e5..ac0bf01 100644 --- a/Assets/Scenes/_Scene_0.unity +++ b/Assets/Scenes/_Scene_0.unity @@ -365,6 +365,86 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &796169172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 796169173} + - component: {fileID: 796169175} + - component: {fileID: 796169174} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &796169173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796169172} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1394167064} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &796169174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796169172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Reset? +--- !u!222 &796169175 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796169172} + m_CullTransparentMesh: 1 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -467,7 +547,8 @@ MonoBehaviour: basketBottomY: -14 basketSpacingY: 2 basketList: [] - roundGT: {fileID: 0} + roundGT: {fileID: 1953100308} + resetButton: {fileID: 1394167066} --- !u!1 &1391927205 GameObject: m_ObjectHideFlags: 0 @@ -563,6 +644,7 @@ RectTransform: - {fileID: 1972124163} - {fileID: 613074587} - {fileID: 1953100307} + - {fileID: 1394167064} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -571,6 +653,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1394167063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1394167064} + - component: {fileID: 1394167068} + - component: {fileID: 1394167067} + - component: {fileID: 1394167066} + - component: {fileID: 1394167065} + m_Layer: 5 + m_Name: Reset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1394167064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394167063} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 796169173} + m_Father: {fileID: 1391927209} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1394167065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394167063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 894fa7fb2c53ceb4d89a510c57b98e61, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ResetButton: {fileID: 1394167066} +--- !u!114 &1394167066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394167063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1394167067} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1394167067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394167063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1394167068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394167063} + m_CullTransparentMesh: 1 --- !u!1 &1953100306 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ApplePicker.cs b/Assets/Scripts/ApplePicker.cs index 108658e..88a6d25 100644 --- a/Assets/Scripts/ApplePicker.cs +++ b/Assets/Scripts/ApplePicker.cs @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using UnityEngine.SceneManagement; public class ApplePicker : MonoBehaviour { @@ -14,6 +13,7 @@ public class ApplePicker : MonoBehaviour public List basketList; public Text roundGT; + public Button resetButton; // Start is called before the first frame update void Start() @@ -66,8 +66,7 @@ public class ApplePicker : MonoBehaviour public void GameOver() { Time.timeScale = 0; roundGT.text = "Game Over"; - SceneManager.LoadScene("_Scene_0"); - Time.timeScale = 1; + resetButton.gameObject.SetActive(true); } // Update is called once per frame diff --git a/Assets/Scripts/Basket.cs b/Assets/Scripts/Basket.cs index 4cf2fc9..b06b5a6 100644 --- a/Assets/Scripts/Basket.cs +++ b/Assets/Scripts/Basket.cs @@ -36,23 +36,25 @@ public class Basket : MonoBehaviour void OnCollisionEnter(Collision coll) { // Find out what hit this basket GameObject collidedWith = coll.gameObject; - if (collidedWith.tag == "Apple") { - Destroy(collidedWith); - // Parse the text of the scoreGT into an int - int score = int.Parse(scoreGT.text); - // Add points for catching the apple - score += 100; - // Convert the score back to a string and display it - scoreGT.text = score.ToString(); - // Track the high score - if (score > HighScore.score) { - HighScore.score = score; - } - } - if (collidedWith.tag == "RottenApple") { - Destroy(collidedWith); - ApplePicker apScript = Camera.main.GetComponent(); - apScript.RottenAppleDestroyed(); + switch (collidedWith.tag) { + case "Apple": + Destroy(collidedWith); + // Parse the text of the scoreGT into an int + int score = int.Parse(scoreGT.text); + // Add points for catching the apple + score += 100; + // Convert the score back to a string and display it + scoreGT.text = score.ToString(); + // Track the high score + if (score > HighScore.score) { HighScore.score = score; } + break; + case "RottenApple": + Destroy(collidedWith); + ApplePicker apScript = Camera.main.GetComponent(); + apScript.RottenAppleDestroyed(); + break; + default: + break; } } } diff --git a/Assets/Scripts/Reset.cs b/Assets/Scripts/Reset.cs new file mode 100644 index 0000000..58b11e5 --- /dev/null +++ b/Assets/Scripts/Reset.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.SceneManagement; + +public class Reset : MonoBehaviour +{ + public Button m_ResetButton; + // Start is called before the first frame update + void Start() + { + m_ResetButton.onClick.AddListener(() => ButtonClicked()); + this.gameObject.SetActive(false); + } + + void ButtonClicked() { + SceneManager.LoadScene("_Scene_0"); + Time.timeScale = 1; + this.gameObject.SetActive(false); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Reset.cs.meta b/Assets/Scripts/Reset.cs.meta new file mode 100644 index 0000000..df2c90c --- /dev/null +++ b/Assets/Scripts/Reset.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 894fa7fb2c53ceb4d89a510c57b98e61 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: