From ffabbf808f156ec81e069fff53d6baa7f61a49f1 Mon Sep 17 00:00:00 2001 From: Ashby Issac Date: Sat, 31 Jan 2026 00:05:18 +0530 Subject: [PATCH] Fix: GameOver text. --- Assets/Scripts/Gameplay/GameplayManager.cs | 8 +++++--- Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Gameplay/GameplayManager.cs b/Assets/Scripts/Gameplay/GameplayManager.cs index d7dda44..f860f55 100644 --- a/Assets/Scripts/Gameplay/GameplayManager.cs +++ b/Assets/Scripts/Gameplay/GameplayManager.cs @@ -119,7 +119,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader if (botTypesInGame.Contains(playerType)) { allPlayerTypes.Add(playerType); - playerDatas.Add(new PlayerData { playerType = selectedPlayerData.playerType, playerName = $"{playerType}" }); + playerDatas.Add(new PlayerData { playerType = playerType, playerName = $"{playerType}" }); } else if (selectedPlayerData.playerType == playerType) { @@ -967,14 +967,16 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader if (allPlayerTypes.Contains(currentPlayerTypeTurn)) { allPlayerTypes.Remove(currentPlayerTypeTurn); - playerDatas[(int)currentPlayerTypeTurn].ranking = TotalPlayersInGame - allPlayerTypes.Count; + Debug.Log($"currentPlayerTypeTurn: {currentPlayerTypeTurn}"); + Debug.Log($"playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn): {playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn)}"); + playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking = TotalPlayersInGame - allPlayerTypes.Count; } if (allPlayerTypes.Count == 1) { // Game is over allPlayerTypes.RemoveAt(0); - playerDatas[(int)currentPlayerTypeTurn].ranking = TotalPlayersInGame - allPlayerTypes.Count; + playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking = TotalPlayersInGame - allPlayerTypes.Count; // Show Game Over panel gameManager.OnGameStateChanged(GameState.GameOver); diff --git a/Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs b/Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs index a67e9df..250ba57 100644 --- a/Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs +++ b/Assets/Scripts/UI/Pages/PopUp/GameOverPopup.cs @@ -59,5 +59,16 @@ public class GameOverPopup : PopupBase texts[i].text = $"{(i + 1)}. {playerDatas[i].playerName}"; } + + foreach (var playerData in playerDatas) + { + if (playerData.ranking == 1) + { + texts[playerData.ranking - 1].text = $"{playerData.playerName} Wins";; + continue; + } + + texts[playerData.ranking - 1].text = $"{playerData.ranking}. {playerData.playerName}"; + } } }