diff --git a/Assets/Scenes/Floor Level.unity b/Assets/Scenes/Floor Level.unity index b62bf0b..3e41223 100644 --- a/Assets/Scenes/Floor Level.unity +++ b/Assets/Scenes/Floor Level.unity @@ -1177,7 +1177,7 @@ MonoBehaviour: pauseMenuUI: {fileID: 525105854} gameOverUI: {fileID: 525105854} ScoreText: {fileID: 1455233009} - TimeText: {fileID: 0} + TimeText: {fileID: 1455233009} LivesText: {fileID: 1368792133} pauseFirstButton: {fileID: 223326611} gameOverFirstButton: {fileID: 0} diff --git a/Assets/Scenes/Hub World.unity b/Assets/Scenes/Hub World.unity index bf48f7f..0938657 100644 --- a/Assets/Scenes/Hub World.unity +++ b/Assets/Scenes/Hub World.unity @@ -2190,6 +2190,146 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623382888} m_CullTransparentMesh: 0 +--- !u!1 &630916946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 630916950} + - component: {fileID: 630916949} + - component: {fileID: 630916948} + - component: {fileID: 630916947} + m_Layer: 5 + m_Name: RetryButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &630916947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630916946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 4 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 745391732} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.990566, g: 0.990566, b: 0.990566, a: 0} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.20392157} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.4509804} + m_SelectedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.4509804} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.4509804} + 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: 630916948} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1701928015} + m_MethodName: Retry + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1701928015} + m_MethodName: Resume + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &630916948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630916946} + 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: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 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 &630916949 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630916946} + m_CullTransparentMesh: 0 +--- !u!224 &630916950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630916946} + 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_Children: + - {fileID: 2108163942} + m_Father: {fileID: 746686909} + 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: -241} + m_SizeDelta: {x: 220.7, y: 102.1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &654784537 GameObject: m_ObjectHideFlags: 0 @@ -2897,7 +3037,7 @@ GameObject: - component: {fileID: 745391733} - component: {fileID: 745391732} m_Layer: 5 - m_Name: Button + m_Name: ReturnToHubWorldButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2916,12 +3056,12 @@ RectTransform: m_Children: - {fileID: 1265153746} m_Father: {fileID: 746686909} - m_RootOrder: 3 + m_RootOrder: 4 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: -259.4} - m_SizeDelta: {x: 127.9, y: 85.8} + m_AnchoredPosition: {x: 0, y: -377} + m_SizeDelta: {x: 806, y: 100.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &745391732 MonoBehaviour: @@ -2936,8 +3076,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} + m_Mode: 4 + m_SelectOnUp: {fileID: 630916947} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} @@ -3045,6 +3185,7 @@ RectTransform: - {fileID: 623382889} - {fileID: 2045279606} - {fileID: 13294518} + - {fileID: 630916950} - {fileID: 745391731} m_Father: {fileID: 1701928014} m_RootOrder: 1 @@ -3886,7 +4027,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: OK + m_text: RETURN TO HUB WORLD m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2} m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2} @@ -3956,10 +4097,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 1265153747} - characterCount: 2 + characterCount: 19 spriteCount: 0 - spaceCount: 0 - wordCount: 1 + spaceCount: 3 + wordCount: 4 linkCount: 0 lineCount: 1 pageCount: 1 @@ -4335,7 +4476,7 @@ MonoBehaviour: m_CancelButton: Pause m_InputActionsPerSecond: 10 m_RepeatDelay: 0.5 - m_ForceModuleActive: 1 + m_ForceModuleActive: 0 --- !u!114 &1398248577 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5162,7 +5303,7 @@ MonoBehaviour: TimeText: {fileID: 13294516} LivesText: {fileID: 13294516} pauseFirstButton: {fileID: 312387577} - gameOverFirstButton: {fileID: 745391730} + gameOverFirstButton: {fileID: 630916946} --- !u!1 &1734965523 GameObject: m_ObjectHideFlags: 0 @@ -5913,3 +6054,159 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2057687440} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2108163941 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2108163942} + - component: {fileID: 2108163944} + - component: {fileID: 2108163943} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2108163942 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108163941} + 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_Children: [] + m_Father: {fileID: 630916950} + 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 &2108163943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108163941} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: RETRY + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2} + m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 1 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 11400000, guid: de18700ae6836544d88ed0e4f3576ea0, + type: 2} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 64 + m_fontSizeBase: 64 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_textAlignment: 514 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 2108163943} + characterCount: 5 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2108163944 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108163941} + m_CullTransparentMesh: 0 diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index f1574b4..def2e65 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -21,10 +21,26 @@ public class PauseMenu : MonoBehaviour public GameObject pauseFirstButton; public GameObject gameOverFirstButton; + private int gameOver = 0; + // Update is called once per frame void Update() { + if(SceneManager.GetActiveScene().name == "Floor Level") + { + ScoreText.text = "LEVEL: " + FloorLevel.escalation + "-" + FloorLevel.level; + LivesText.text = "LIVES: " + PlayerController.shownLives; + } + + if(SceneManager.GetActiveScene().name == "Waypoint Race") + { + + ScoreText.text = "LEVEL: " + (WaypointRace.size - 1) + "-" + WaypointRace.level; + TimeText.text = "TIME: " + Mathf.Round((WaypointRace.countdown + WaypointRace.completionTime) - Time.time); + + } + if(Input.GetButtonDown("Pause")) { if(GameIsPaused) @@ -41,6 +57,15 @@ public class PauseMenu : MonoBehaviour if(GameIsOver) { GameOver(); + + if(gameOver == 0) + { + EventSystem.current.SetSelectedGameObject(null); + EventSystem.current.SetSelectedGameObject(gameOverFirstButton); + } + + gameOver++; + } } @@ -75,8 +100,6 @@ public class PauseMenu : MonoBehaviour gameOverUI.SetActive(true); Time.timeScale = 0f; GameIsPaused = true; - EventSystem.current.SetSelectedGameObject(null); - EventSystem.current.SetSelectedGameObject(gameOverFirstButton); if(FloorLevel.gameOver == true) { @@ -110,6 +133,25 @@ public class PauseMenu : MonoBehaviour Cursor.lockState = CursorLockMode.None; } + public void Retry() + { + Time.timeScale = 1f; + GameIsPaused = false; + Cursor.visible = false; + Cursor.lockState = CursorLockMode.Locked; + + if(FloorLevel.gameOver == true) + { + SceneManager.LoadScene("Floor Level", LoadSceneMode.Single); + } + + if(WaypointRace.gameOver == true) + { + SceneManager.LoadScene("Waypoint Race", LoadSceneMode.Single); + } + + } + public void Quit() {