Fix: GameOver text.
This commit is contained in:
parent
2a348436d3
commit
ffabbf808f
@ -119,7 +119,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
|||||||
if (botTypesInGame.Contains(playerType))
|
if (botTypesInGame.Contains(playerType))
|
||||||
{
|
{
|
||||||
allPlayerTypes.Add(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)
|
else if (selectedPlayerData.playerType == playerType)
|
||||||
{
|
{
|
||||||
@ -967,14 +967,16 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
|||||||
if (allPlayerTypes.Contains(currentPlayerTypeTurn))
|
if (allPlayerTypes.Contains(currentPlayerTypeTurn))
|
||||||
{
|
{
|
||||||
allPlayerTypes.Remove(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)
|
if (allPlayerTypes.Count == 1)
|
||||||
{
|
{
|
||||||
// Game is over
|
// Game is over
|
||||||
allPlayerTypes.RemoveAt(0);
|
allPlayerTypes.RemoveAt(0);
|
||||||
playerDatas[(int)currentPlayerTypeTurn].ranking = TotalPlayersInGame - allPlayerTypes.Count;
|
playerDatas.FirstOrDefault(data => data.playerType == currentPlayerTypeTurn).ranking = TotalPlayersInGame - allPlayerTypes.Count;
|
||||||
|
|
||||||
// Show Game Over panel
|
// Show Game Over panel
|
||||||
gameManager.OnGameStateChanged(GameState.GameOver);
|
gameManager.OnGameStateChanged(GameState.GameOver);
|
||||||
|
|||||||
@ -59,5 +59,16 @@ public class GameOverPopup : PopupBase
|
|||||||
|
|
||||||
texts[i].text = $"{(i + 1)}. {playerDatas[i].playerName}";
|
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}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user