Updated text sizing

- Ellipsis text larger then MaxLength (default 20)
- Resized text in various UI for better spacing

Author: dlweatherhead

Assets/EC2018/CountInDetailPopulator.cs

@@ -8,6 +8,7 @@ public class CountInDetailPopulator : MonoBehaviour {
 
     public TextMeshProUGUI tmpPlayerA;
     public TextMeshProUGUI tmpPlayerB;
+    public int MaxLength = 20;
 
 	void Start () {
         tmpPlayerA.text = GetPlayerName (PlayerType.A);
@@ -16,10 +17,17 @@ void Start () {
 
 	public string GetPlayerName(PlayerType playerType) {
 		var allPlayers = Directory.GetDirectories(GetReplayPathFromPrefs() + "/Round 000");
+        string playerName;
 		if (playerType == PlayerType.A) {
-			return new DirectoryInfo(allPlayers[0]).Name;
+			playerName = new DirectoryInfo(allPlayers[0]).Name;
 		}
-		return new DirectoryInfo(allPlayers[1]).Name;
+		playerName = new DirectoryInfo(allPlayers[1]).Name;
+
+        if(playerName.Length > MaxLength) {
+            playerName = playerName.Substring(0, MaxLength) + "...";
+        }
+
+        return playerName;
 	}
 
 	string GetReplayPathFromPrefs() {

Assets/EC2018/Countdown.cs

@@ -18,16 +18,16 @@ void Start () {
 
 	IEnumerator StartReplayScene() {
         yield return new WaitForSeconds (startDelay);
-		countdownText.fontSize = 50;
+		countdownText.fontSize = 40;
 		countdownText.text = "3";
         yield return new WaitForSeconds (counterTime);
-		countdownText.fontSize = 70;
+		countdownText.fontSize = 60;
 		countdownText.text = "2";
         yield return new WaitForSeconds (counterTime);
-		countdownText.fontSize = 100;
+		countdownText.fontSize = 80;
 		countdownText.text = "1";
         yield return new WaitForSeconds (counterTime);
-		countdownText.fontSize = 120;
+		countdownText.fontSize = 100;
 
         int i = Random.Range(0, kickOffPhrases.Length);
 

Assets/EC2018/EllipsisText.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class EllipsisText : MonoBehaviour {
+
+	public Text Text;
+    public int MaxLength;
+
+	void Update () {
+        InvokeRepeating("CheckAndSetText", 0f, 0.1f);
+	}
+
+	void CheckAndSetText() {
+        if(Text.text.Length > MaxLength) {
+            Text.text = Text.text.Substring(0, MaxLength) + "...";
+        }
+	}
+}

Assets/EC2018/EllipsisText.cs.meta

@@ -34,6 +34,8 @@ public class UIManager : MonoBehaviour {
         public BarrierHealth barrierHealthA;
         public BarrierHealth barrierHealthB;
 
+        public int MaxLength = 20;
+
         GameManager gameManager;
 
 		bool pulseIronCurtainPlayerA;
@@ -66,8 +68,12 @@ void Update() {
 		}
 
 		public void SetPlayerNames(string playerAName, string playerBName) {
-			PlayerAName.text = playerAName;
-			PlayerBName.text = playerBName;
+            PlayerAName.text = playerAName.Length > MaxLength ? 
+                                playerAName.Substring(0, MaxLength) + "..." : 
+                                playerAName;
+            PlayerBName.text = playerBName.Length > MaxLength ? 
+                                playerBName.Substring(0, MaxLength) + "..." : 
+                                playerBName;
 		}
 
 		public void UpdateUI(GameDetails gameDetails, Player playerA, Player playerB) {
@@ -123,21 +129,44 @@ public void UpdateUI(GameDetails gameDetails, Player playerA, Player playerB) {
 		}
 
         public void DisplayFinalGameMessage(GameState finalState, string namePlayerA, string namePlayerB) {
+
+            string nameA = namePlayerA.Length > MaxLength ?
+                                      namePlayerA.Substring(0, MaxLength) + "..." :
+                                      namePlayerA;
+            string nameB = namePlayerB.Length > MaxLength ?
+                                      namePlayerB.Substring(0, MaxLength) + "..." :
+                                      namePlayerB;
+            
             FinalGameHolder.SetActive(true);
+
+            string winnerStatsText = "";
+            string loserStatsText = "";
+
             if(winningPlayer == PlayerType.A) {
                 playerAWinHolder.SetActive(true);
-                winningPlayerText.text = namePlayerA + "\nWins!";
+                winningPlayerText.text = nameA + "\nWins!";
+
+                winnerStatsText = "Score: " + finalState.Players[0].Score + "\n" +
+                                  "Hits taken: " + finalState.Players[0].HitsTaken;
+
+                loserStatsText = "Player: " + nameB + "\n" +
+                                 "Score: " + finalState.Players[1].Score + "\n" +
+                                 "Hits taken: " + finalState.Players[1].HitsTaken;
             } else {
                 playerBWinHolder.SetActive(true);
-                winningPlayerText.text = namePlayerB + "\nWins!";
+                winningPlayerText.text = nameB + "\nWins!";
+
+                winnerStatsText = "Score: " + finalState.Players[1].Score + "\n" +
+                                  "Hits taken: " + finalState.Players[1].HitsTaken;
+
+                loserStatsText = "Player: " + nameA + "\n" +
+                                 "Score: " + finalState.Players[0].Score + "\n" +
+                                 "Hits taken: " + finalState.Players[0].HitsTaken;
             }
 
-            winningPlayerStatsText.text =   "Score: " + finalState.Players[0].Score + "\n" +
-                                            "Hits taken: " + finalState.Players[0].HitsTaken;
+            winningPlayerStatsText.text = winnerStatsText;
 
-            losingPlayerStatsText.text = "Player: " + namePlayerB + "\n" +
-                                            "Score: " + finalState.Players[1].Score + "\n" +
-                                            "Hits taken: " + finalState.Players[1].HitsTaken;
+            losingPlayerStatsText.text = loserStatsText;
 		}
 
         string GetPlayerType(Player player) {

Assets/EC2018/UIManager.cs

@@ -950,6 +950,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tmpPlayerA: {fileID: 300225247}
   tmpPlayerB: {fileID: 1831951726}
+  MaxLength: 20
 --- !u!1 &1116120781
 GameObject:
   m_ObjectHideFlags: 0
@@ -1330,9 +1331,9 @@ MonoBehaviour:
   kickOffPhrases:
   - Let the battle begin!
   - Bots starting up...
-  - Two enter, one leaves!
+  - 2 enter, 1 leaves!
   - Are ya ready kids?
-  - War. War never changes
+  - War never changes!
 --- !u!1 &1831951724
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/CountInScene.unity

@@ -2268,7 +2268,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -10}
   m_SizeDelta: {x: 0, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &125699162
@@ -2318,8 +2318,8 @@ MonoBehaviour:
   m_outlineColor:
     serializedVersion: 2
     rgba: 4278190080
-  m_fontSize: 42
-  m_fontSizeBase: 42
+  m_fontSize: 38
+  m_fontSizeBase: 38
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -2795,8 +2795,8 @@ MonoBehaviour:
   m_outlineColor:
     serializedVersion: 2
     rgba: 4278190080
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 34
+  m_fontSizeBase: 34
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -12460,6 +12460,7 @@ MonoBehaviour:
   losingPlayerStatsText: {fileID: 148899221}
   barrierHealthA: {fileID: 912874940}
   barrierHealthB: {fileID: 1641376618}
+  MaxLength: 20
 --- !u!114 &893612604
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16484,8 +16485,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 75}
-  m_SizeDelta: {x: 360, y: 400}
+  m_AnchoredPosition: {x: 0, y: 50}
+  m_SizeDelta: {x: 360, y: 425}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!1001 &1214056443
 Prefab:
@@ -23622,7 +23623,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 125}
+  m_SizeDelta: {x: 0, y: 140}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1726131729
 MonoBehaviour:
@@ -23643,7 +23644,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_text: B - Jan van der Westhuyzen wins!
+  m_text: "B - Jan van der Westhuyzen \nwins!"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 11ec85aa2b844468eb819656bb4ee6b8, type: 2}
   m_sharedMaterial: {fileID: 21045330511842694, guid: 11ec85aa2b844468eb819656bb4ee6b8,
@@ -23712,12 +23713,12 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_textInfo:
     textComponent: {fileID: 1726131729}
-    characterCount: 32
+    characterCount: 33
     spriteCount: 0
-    spaceCount: 6
+    spaceCount: 7
     wordCount: 7
     linkCount: 0
-    lineCount: 2
+    lineCount: 3
     pageCount: 1
     materialCount: 1
   m_havePropertiesChanged: 0
@@ -25479,7 +25480,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1871486360
 RectTransform:
   m_ObjectHideFlags: 0