From e6b1ac634e169f8add41406b239d3b97eb0589bc Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 7 Apr 2023 13:06:24 -0400 Subject: [PATCH] clearer game over screen --- namedropper/Assets/Scenes/GameOver.unity | 12 ++++++------ namedropper/Assets/Scripts/GameOverScreen.cs | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/namedropper/Assets/Scenes/GameOver.unity b/namedropper/Assets/Scenes/GameOver.unity index 197e6be..ef4368b 100644 --- a/namedropper/Assets/Scenes/GameOver.unity +++ b/namedropper/Assets/Scenes/GameOver.unity @@ -177,7 +177,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &280255757 RectTransform: m_ObjectHideFlags: 0 @@ -476,7 +476,7 @@ RectTransform: 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: 297.69} + m_AnchoredPosition: {x: 0, y: 442} m_SizeDelta: {x: 167.5, y: 231.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1225785573 @@ -500,7 +500,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b46f1d3bdf627d645a08de1c3a257a10, type: 3} + m_Font: {fileID: 12800000, guid: aceb68b22a47f0f4dbf70163ea752dad, type: 3} m_FontSize: 115 m_FontStyle: 0 m_BestFit: 0 @@ -615,7 +615,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1436005610 RectTransform: m_ObjectHideFlags: 0 @@ -884,7 +884,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1459316163 RectTransform: m_ObjectHideFlags: 0 @@ -1238,7 +1238,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2062771981 RectTransform: m_ObjectHideFlags: 0 diff --git a/namedropper/Assets/Scripts/GameOverScreen.cs b/namedropper/Assets/Scripts/GameOverScreen.cs index ef30768..625c9c5 100644 --- a/namedropper/Assets/Scripts/GameOverScreen.cs +++ b/namedropper/Assets/Scripts/GameOverScreen.cs @@ -10,7 +10,7 @@ public class GameOverScreen : Level void Start() { - if (GameManager.Instance.NumTeams == 1) { + if (GameManager.Instance.NumTeams == 1 && false) { int score = GameManager.Instance.Score1 + GameManager.Instance.Score2 + GameManager.Instance.Score3 + GameManager.Instance.Score4; if (score > GameManager.Instance.HighScore) @@ -23,8 +23,11 @@ public class GameOverScreen : Level { ScoreStack blueScoreStack = GameObject.Find("/ScoreStackBlue").GetComponent(); ScoreStack redScoreStack = GameObject.Find("/ScoreStackRed").GetComponent(); + //blueScoreStack.AddChecker(54, true); + //redScoreStack.AddChecker(57, true); - _gameOverMessage.text = "" + blueScoreStack.Score + " to " + redScoreStack.Score + "\n"; + const int scoreSize = 450; + _gameOverMessage.text = "" + blueScoreStack.Score + " to " + redScoreStack.Score + "\n"; if (blueScoreStack.Score > redScoreStack.Score) { _gameOverMessage.text += "BLUE TEAM WINS!";