Browse Source

"Final round"

combinedRaceAndNameDropper
Josh 2 years ago
parent
commit
aec8c36a94
  1. 3
      namedropper/Assets/RoundIntro.cs
  2. 2
      namedropper/Assets/Scripts/Game.cs
  3. 12
      namedropper/Assets/Scripts/GameManager.cs
  4. 2
      namedropper/Assets/Scripts/TopicSelect.cs

3
namedropper/Assets/RoundIntro.cs

@ -11,7 +11,8 @@ public class RoundIntro : MonoBehaviour
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
_roundNumber.text = "Round " + GameManager.Instance.Round.ToString(); _roundNumber.text = GameManager.Instance.GetRoundName();
_topic.text = GameDataManager.Instance.CurrentTopic.Topic; _topic.text = GameDataManager.Instance.CurrentTopic.Topic;
Invoke("StartGame", 3f); Invoke("StartGame", 3f);

2
namedropper/Assets/Scripts/Game.cs

@ -113,7 +113,7 @@ public class Game : MonoBehaviour
} }
} }
RoundNumber.text = "Round " + GameManager.Instance.Round.ToString(); RoundNumber.text = GameManager.Instance.GetRoundName();
Topic.text = GameDataManager.Instance.CurrentTopic.Topic; Topic.text = GameDataManager.Instance.CurrentTopic.Topic;
ActivatePlayers(false); ActivatePlayers(false);

12
namedropper/Assets/Scripts/GameManager.cs

@ -22,6 +22,18 @@ public class GameManager
public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop
public static int MAX_PLAYER_SKIN = 5; public static int MAX_PLAYER_SKIN = 5;
public string GetRoundName()
{
if (Round == 3)
{
return "Final round!";
}
else
{
return "Round " + GameManager.Instance.Round.ToString();
}
}
public GameManager() public GameManager()
{ {
Reset(); Reset();

2
namedropper/Assets/Scripts/TopicSelect.cs

@ -26,7 +26,7 @@ public class TopicSelect : MonoBehaviour
void InitRound() void InitRound()
{ {
_title.text = "Round " + GameManager.Instance.Round; _title.text = GameManager.Instance.GetRoundName();
if (WORST_PLAYER_PICKS) if (WORST_PLAYER_PICKS)
{ {

Loading…
Cancel
Save