diff --git a/Assets/Scenes/Hub World.unity b/Assets/Scenes/Hub World.unity index abcdeb5..a22782d 100644 --- a/Assets/Scenes/Hub World.unity +++ b/Assets/Scenes/Hub World.unity @@ -1354,7 +1354,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -128} - m_SizeDelta: {x: 675.6, y: 114.3} + m_SizeDelta: {x: 850, y: 114.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &232712737 MonoBehaviour: @@ -7405,6 +7405,7 @@ MonoBehaviour: ScoreText: {fileID: 2045279608} TimeText: {fileID: 13294516} LivesText: {fileID: 13294516} + MiddleText: {fileID: 0} HighScoreText: {fileID: 1634177343} HighTimeText: {fileID: 232712737} CongratsText: {fileID: 1992981387} diff --git a/Assets/Scenes/Infinity Runner.unity b/Assets/Scenes/Infinity Runner.unity index 55e2d9a..ed3c457 100644 --- a/Assets/Scenes/Infinity Runner.unity +++ b/Assets/Scenes/Infinity Runner.unity @@ -660,6 +660,162 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484334937} m_CullTransparentMesh: 0 +--- !u!1 &664696628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 664696631} + - component: {fileID: 664696630} + - component: {fileID: 664696629} + m_Layer: 5 + m_Name: DistanceText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &664696629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664696628} + 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: + 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: 664696629} + characterCount: 0 + spriteCount: 0 + spaceCount: 0 + wordCount: 0 + linkCount: 0 + lineCount: 0 + pageCount: 0 + 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 &664696630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664696628} + m_CullTransparentMesh: 0 +--- !u!224 &664696631 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664696628} + 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: 1111617285} + 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: 478.62} + m_SizeDelta: {x: 900, y: 124.8} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &775331034 GameObject: m_ObjectHideFlags: 0 @@ -1396,6 +1552,7 @@ MonoBehaviour: ScoreText: {fileID: 90025025} TimeText: {fileID: 90025025} LivesText: {fileID: 1109346523} + MiddleText: {fileID: 664696629} HighScoreText: {fileID: 0} HighTimeText: {fileID: 0} CongratsText: {fileID: 0} @@ -1475,6 +1632,7 @@ RectTransform: - {fileID: 1273345009} - {fileID: 90025027} - {fileID: 1109346525} + - {fileID: 664696631} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/HighScore.cs b/Assets/Scripts/HighScore.cs index 8bc5756..4731de9 100644 --- a/Assets/Scripts/HighScore.cs +++ b/Assets/Scripts/HighScore.cs @@ -27,7 +27,7 @@ public class HighScore : MonoBehaviour InfinityScoreText.text = "HIGH SCORE: " + "\n" + PlayerPrefs.GetInt("RunnerHighFloor") + "-" + PlayerPrefs.GetInt("RunnerHighLevel"); - InfinityTimeText.text = "HIGH SCORE TIME: " + "\n" + Mathf.Round(PlayerPrefs.GetFloat("RunnerHighTime")); + InfinityTimeText.text = "HIGH SCORE DISTANCE: " + "\n" + Mathf.Round(PlayerPrefs.GetFloat("RunnerHighDistance")); } } diff --git a/Assets/Scripts/InfinityRunner.cs b/Assets/Scripts/InfinityRunner.cs index 8dbfaa3..5bd4bfd 100644 --- a/Assets/Scripts/InfinityRunner.cs +++ b/Assets/Scripts/InfinityRunner.cs @@ -12,6 +12,7 @@ public class InfinityRunner : MonoBehaviour public static int escalation = 1; public static int level = 1; public static float fullTime; + public static float distance; public GameObject player; public PlayerController script; public GameObject[] obstacleList; @@ -51,6 +52,8 @@ public class InfinityRunner : MonoBehaviour void Update() { + distance = player.transform.position.z; + if(spawnTime + countdownTime < Time.time) { diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index 3df7028..37db5ff 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -17,6 +17,7 @@ public class PauseMenu : MonoBehaviour public TextMeshProUGUI ScoreText; public TextMeshProUGUI TimeText; public TextMeshProUGUI LivesText; + public TextMeshProUGUI MiddleText; public TextMeshProUGUI HighScoreText; public TextMeshProUGUI HighTimeText; @@ -50,6 +51,7 @@ public class PauseMenu : MonoBehaviour { ScoreText.text = "LEVEL: " + InfinityRunner.escalation + "-" + InfinityRunner.level; LivesText.text = "LIVES: " + PlayerController.shownLives; + MiddleText.text = "DISTANCE: " + Mathf.Round(InfinityRunner.distance); } if(Input.GetButtonDown("Pause")) @@ -188,7 +190,7 @@ public class PauseMenu : MonoBehaviour if(InfinityRunner.gameOver == true) { ScoreText.text = "LEVEL: " + InfinityRunner.escalation + "-" + InfinityRunner.level; - TimeText.text = "TIME: " + Mathf.Round(InfinityRunner.fullTime); + TimeText.text = "DISTANCE: " + Mathf.Round(InfinityRunner.distance); if(InfinityRunner.escalation > PlayerPrefs.GetInt("RunnerHighFloor") || (InfinityRunner.escalation == PlayerPrefs.GetInt("RunnerHighFloor") && @@ -198,11 +200,11 @@ public class PauseMenu : MonoBehaviour if(InfinityRunner.escalation > PlayerPrefs.GetInt("RunnerHighFloor") || InfinityRunner.level > PlayerPrefs.GetInt("RunnerHighLevel") || (InfinityRunner.level == PlayerPrefs.GetInt("RunnerHighLevel") && - Mathf.Round(InfinityRunner.fullTime) < PlayerPrefs.GetFloat("RunnerHighTime"))) + Mathf.Round(InfinityRunner.distance) > PlayerPrefs.GetFloat("RunnerHighDistance"))) { PlayerPrefs.SetInt("RunnerHighFloor", InfinityRunner.escalation); PlayerPrefs.SetInt("RunnerHighLevel", InfinityRunner.level); - PlayerPrefs.SetFloat("RunnerHighTime", Mathf.Round(InfinityRunner.fullTime)); + PlayerPrefs.SetFloat("RunnerHighDistance", Mathf.Round(InfinityRunner.distance)); highscore = true; } @@ -218,7 +220,7 @@ public class PauseMenu : MonoBehaviour HighScoreText.text = "HIGH SCORE: " + PlayerPrefs.GetInt("RunnerHighFloor") + "-" + PlayerPrefs.GetInt("RunnerHighLevel"); - HighTimeText.text = "HIGH SCORE TIME: " + Mathf.Round(PlayerPrefs.GetFloat("RunnerHighTime")); + HighTimeText.text = "HIGH SCORE DISTANCE: " + Mathf.Round(PlayerPrefs.GetFloat("RunnerHighDistance")); } }