diff --git a/1080-1073-max.jpg b/1080-1073-max.jpg deleted file mode 100644 index 490501b..0000000 Binary files a/1080-1073-max.jpg and /dev/null differ diff --git a/1080-1073-max.jpg.meta b/1080-1073-max.jpg.meta deleted file mode 100644 index 80bf45f..0000000 --- a/1080-1073-max.jpg.meta +++ /dev/null @@ -1,104 +0,0 @@ -fileFormatVersion: 2 -guid: 5a1c6225d7ac1bc49b5f4ddc277b21bd -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Scenes.meta b/Scenes.meta deleted file mode 100644 index ded417b..0000000 --- a/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c7e8794d5f36567438a25d9395a25f18 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TextMesh Pro.meta b/TextMesh Pro.meta deleted file mode 100644 index f9da8b5..0000000 --- a/TextMesh Pro.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f54d1bd14bd3ca042bd867b519fee8cc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/endScreenScore.cs b/endScreenScore.cs new file mode 100644 index 0000000..da263fc --- /dev/null +++ b/endScreenScore.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class endScreenScore : MonoBehaviour +{ + TextMeshProUGUI textBox; + public float endTime = 0; + + void Start() + { + Cursor.lockState = CursorLockMode.None; + endTime = PlayerPrefs.GetFloat("timeScore"); + textBox = GetComponent(); + textBox.SetText("Time: {0}s", endTime); + } +} diff --git a/endTrigger.cs b/endTrigger.cs index fb0b3b8..ee45976 100644 --- a/endTrigger.cs +++ b/endTrigger.cs @@ -5,24 +5,12 @@ using UnityEngine.SceneManagement; public class endTrigger : MonoBehaviour { - - private void OnTriggerEnter(Collider other) + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.CompareTag("Player")) { - if (other.gameObject.CompareTag("Player")) - { - SceneManager.LoadScene("end"); - } - } - - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - + SceneManager.LoadScene("end"); + SceneManager.UnloadSceneAsync("game"); } + } } diff --git a/endTrigger.cs.meta b/endTrigger.cs.meta deleted file mode 100644 index 5b04d6e..0000000 --- a/endTrigger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b4a44684a45bb6e4aac48cd3c9502e65 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/gameExit.cs b/gameExit.cs new file mode 100644 index 0000000..bcc83c4 --- /dev/null +++ b/gameExit.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class gameExit : MonoBehaviour +{ + public void doExitGame() { + Application.Quit(); + } +} diff --git a/highScoreCheck.cs b/highScoreCheck.cs new file mode 100644 index 0000000..8eb1174 --- /dev/null +++ b/highScoreCheck.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class highScoreCheck : MonoBehaviour +{ + TextMeshProUGUI textBox; + public float highScore = 0; + + void Start() + { + highScore = PlayerPrefs.GetFloat("highScore"); + if (highScore > PlayerPrefs.GetFloat("timeScore")) + { + PlayerPrefs.SetFloat("highScore",PlayerPrefs.GetFloat("timeScore")); + highScore = PlayerPrefs.GetFloat("timeScore"); + } + + textBox = GetComponent(); + textBox.SetText("Shortest Time: {0}s", highScore); + } +} diff --git a/levelLoader.cs b/levelLoader.cs index cb59a51..9ba2030 100644 --- a/levelLoader.cs +++ b/levelLoader.cs @@ -5,19 +5,8 @@ using UnityEngine.SceneManagement; public class levelLoader : MonoBehaviour { - public void NextLevel() - { - SceneManager.LoadScene("game"); - } - - void Start() - { - - } - - - void Update() - { - - } + public void NextLevel() + { + SceneManager.LoadScene("game"); + } } diff --git a/levelLoader.cs.meta b/levelLoader.cs.meta deleted file mode 100644 index d8be53c..0000000 --- a/levelLoader.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f743923d9019d4448b0f753295a8b67e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/timerText.cs b/timerText.cs index 1c228d7..63c2c61 100644 --- a/timerText.cs +++ b/timerText.cs @@ -8,31 +8,31 @@ using UnityEngine.SceneManagement; public class timerText : MonoBehaviour { - TextMeshProUGUI textBox; + TextMeshProUGUI textBox; - public float time = 0; - protected float Timer; - public int delayAmount = 1; + public float time = 0; + protected float Timer; + public int delayAmount = 1; - void Start() + void Start() + { + textBox = GetComponent(); + textBox.SetText("0"); + } + + void Update() + { + if (SceneManager.GetActiveScene().name == "game") { - textBox = GetComponent(); - textBox.SetText("0"); - } + Timer += Time.deltaTime; - // Update is called once per frame - void Update() - { - if (SceneManager.GetActiveScene().name == "game") - { - Timer += Time.deltaTime; - - if (Timer >= delayAmount) - { - Timer = 0f; - time++; - textBox.SetText("{0}", time); - } - } + if (Timer >= delayAmount) + { + Timer = 0f; + time++; + textBox.SetText("{0}s", time); + PlayerPrefs.SetFloat("timeScore",time); + } } + } } diff --git a/timerText.cs.meta b/timerText.cs.meta deleted file mode 100644 index 29c4c53..0000000 --- a/timerText.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e6691515d312ae46a799868c12199c2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: