Browse Source

reverted to: first in picks topic, but also added an intro to topic select screen

combinedRaceAndNameDropper
Josh 2 years ago
parent
commit
1524b1c0d5
  1. 5
      namedropper/Assets/Scenes/TopicSelect.unity
  2. 6
      namedropper/Assets/Scripts/Game.cs
  3. 29
      namedropper/Assets/Scripts/Level.cs
  4. 11
      namedropper/Assets/Scripts/Level.cs.meta
  5. 25
      namedropper/Assets/Scripts/TopicSelect.cs
  6. 5822
      original art assets/plexi control panel.ai

5
namedropper/Assets/Scenes/TopicSelect.unity

@ -1385,6 +1385,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0a576bc4a288add46aa64939a69432e5, type: 3} m_Script: {fileID: 11500000, guid: 0a576bc4a288add46aa64939a69432e5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_players:
- {fileID: 261236787}
- {fileID: 1272407095}
- {fileID: 1192266244}
- {fileID: 1003872902}
_topic1Box: {fileID: 1797572950} _topic1Box: {fileID: 1797572950}
_topic2Box: {fileID: 1500576227} _topic2Box: {fileID: 1500576227}
_topic3Box: {fileID: 18155122} _topic3Box: {fileID: 18155122}

6
namedropper/Assets/Scripts/Game.cs

@ -4,7 +4,7 @@ using System.Collections.Generic;
using UnityEngine.UI; using UnityEngine.UI;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
public class Game : MonoBehaviour public class Game : Level
{ {
const bool HIDE_SCORES = true; const bool HIDE_SCORES = true;
int _seconds = 70; int _seconds = 70;
@ -21,7 +21,7 @@ public class Game : MonoBehaviour
[SerializeField] GameObject CategoriesRound2; [SerializeField] GameObject CategoriesRound2;
[SerializeField] GameObject CategoriesRound3; [SerializeField] GameObject CategoriesRound3;
[SerializeField] List<GameObject> _players;
ScoreStack _blueScoreStack; ScoreStack _blueScoreStack;
ScoreStack _redScoreStack; ScoreStack _redScoreStack;
@ -116,12 +116,12 @@ public class Game : MonoBehaviour
RoundNumber.text = GameManager.Instance.GetRoundName(); RoundNumber.text = GameManager.Instance.GetRoundName();
Topic.text = GameDataManager.Instance.CurrentTopic.Topic; Topic.text = GameDataManager.Instance.CurrentTopic.Topic;
ActivatePlayers(false);
StartCoroutine("StartupProcess"); StartCoroutine("StartupProcess");
} }
IEnumerator StartupProcess() IEnumerator StartupProcess()
{ {
ActivatePlayers(false);
Topic.gameObject.SetActive(false); Topic.gameObject.SetActive(false);
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
Topic.gameObject.SetActive(true); Topic.gameObject.SetActive(true);

29
namedropper/Assets/Scripts/Level.cs

@ -0,0 +1,29 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Level : MonoBehaviour
{
public List<GameObject> _players;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
protected void ActivatePlayers(bool value)
{
foreach (GameObject player in _players)
{
player.SetActive(value);
}
}
}

11
namedropper/Assets/Scripts/Level.cs.meta

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1d589aba966b028449d1902f78c63837
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

25
namedropper/Assets/Scripts/TopicSelect.cs

@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
public class TopicSelect : MonoBehaviour public class TopicSelect : Level
{ {
[SerializeField] TopicBox _topic1Box; [SerializeField] TopicBox _topic1Box;
[SerializeField] TopicBox _topic2Box; [SerializeField] TopicBox _topic2Box;
@ -18,16 +18,35 @@ public class TopicSelect : MonoBehaviour
[SerializeField] GameObject _player4; [SerializeField] GameObject _player4;
public const bool WORST_PLAYER_PICKS = false; public const bool WORST_PLAYER_PICKS = false;
public const bool VOTE_ON_TOPIC = true; public const bool VOTE_ON_TOPIC = false;
// Start is called before the first frame update // Start is called before the first frame update
void Awake() void Awake()
{ {
InitRound(); InitRound();
StartCoroutine("StartupProcess");
}
IEnumerator StartupProcess()
{
ActivatePlayers(false);
_subTitle.gameObject.SetActive(false);
_title.gameObject.SetActive(false);
yield return new WaitForSeconds(.3f);
_title.gameObject.SetActive(true);
yield return new WaitForSeconds(1f);
_subTitle.gameObject.SetActive(true);
yield return new WaitForSeconds(2f);
_subTitle.text = "";
_title.text = "GO!";
ActivatePlayers(true);
yield return new WaitForSeconds(1f);
_title.gameObject.SetActive(false);
} }
void InitRound() void InitRound()
{ {
_title.text = GameManager.Instance.GetRoundName(); _title.text = GameManager.Instance.GetRoundName();

5822
original art assets/plexi control panel.ai

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save