From 967ec03eee646cf6e3a96e1a0bb1f91bb3cfed1e Mon Sep 17 00:00:00 2001 From: Paul-Louis NECH Date: Thu, 27 Oct 2016 23:46:45 -0400 Subject: [PATCH] GameOver: Refactor from timer screen to submit score/play again --- Assets/Images/play-again.png | Bin 0 -> 1051 bytes Assets/Images/play-again.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Scenes/GameOver.unity | Bin 44280 -> 0 bytes Assets/Scripts/GameOver.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Scripts/GameOver.cs.meta | 12 ++++++++++++ Assets/Scripts/GameOverTimeout.cs | 21 --------------------- Assets/Scripts/GameOverTimeout.cs.meta | 12 ------------ 7 files changed, 120 insertions(+), 33 deletions(-) create mode 100644 Assets/Images/play-again.png create mode 100644 Assets/Images/play-again.png.meta create mode 100644 Assets/Scripts/GameOver.cs create mode 100644 Assets/Scripts/GameOver.cs.meta delete mode 100644 Assets/Scripts/GameOverTimeout.cs delete mode 100644 Assets/Scripts/GameOverTimeout.cs.meta diff --git a/Assets/Images/play-again.png b/Assets/Images/play-again.png new file mode 100644 index 0000000..f99eeef Binary files /dev/null and b/Assets/Images/play-again.png differ diff --git a/Assets/Images/play-again.png.meta b/Assets/Images/play-again.png.meta new file mode 100644 index 0000000..7845f9a --- /dev/null +++ b/Assets/Images/play-again.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 2193b2c370579481da2949d275ff44dd +timeCreated: 1477625045 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity index 2d75d4f..f3b5844 100644 Binary files a/Assets/Scenes/GameOver.unity and b/Assets/Scenes/GameOver.unity differ diff --git a/Assets/Scripts/GameOver.cs b/Assets/Scripts/GameOver.cs new file mode 100644 index 0000000..6052d20 --- /dev/null +++ b/Assets/Scripts/GameOver.cs @@ -0,0 +1,49 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; +using UnityEngine.SceneManagement; +using Assets.Scripts; +using Assets.Scripts.API; + +public class GameOver : MonoBehaviour +{ + private float _timer = 0f; + private int score; + + private Player _player; + public InputField PlayerName; + public InputField TeamName; + public Text Score; + + void Start() + { + _player = GameObject.FindWithTag("Player").GetComponent(); + score = _player.Score; + Score.text = "You scored " + score; + } + + void Update () + { +// _timer += Time.deltaTime; +// if (_timer > 4f) +// SceneManager.LoadScene("Menu"); + } + + public void OnButtonPlayClicked() + { + SceneManager.LoadScene("Main"); + } + + public void OnButtonSubmitClicked() + { + string playerText = PlayerName.text; + if (playerText == null || playerText.Length == 0) { + playerText = "Random Randy"; + } + string teamText = PlayerName.text; + if (teamText == null || teamText.Length == 0) { + teamText = null; + } + Server.PostScore(score, playerText, teamText); + } +} diff --git a/Assets/Scripts/GameOver.cs.meta b/Assets/Scripts/GameOver.cs.meta new file mode 100644 index 0000000..ff05e66 --- /dev/null +++ b/Assets/Scripts/GameOver.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 87812edcd943348fb992562afc20f611 +timeCreated: 1477625221 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameOverTimeout.cs b/Assets/Scripts/GameOverTimeout.cs deleted file mode 100644 index 74d0913..0000000 --- a/Assets/Scripts/GameOverTimeout.cs +++ /dev/null @@ -1,21 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.SceneManagement; - -public class GameOverTimeout : MonoBehaviour -{ - private float _timer = 0f; - - void Start() - { - - } - - void Update () - { - _timer += Time.deltaTime; - - if (_timer > 4f) - SceneManager.LoadScene("Menu"); - } -} diff --git a/Assets/Scripts/GameOverTimeout.cs.meta b/Assets/Scripts/GameOverTimeout.cs.meta deleted file mode 100644 index 3396273..0000000 --- a/Assets/Scripts/GameOverTimeout.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: db1617bc54ffa5d418ba76a2af51731b -timeCreated: 1477408259 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- libgit2 0.27.0