diff --git a/namedropper/Assets/Scenes/Title.unity b/namedropper/Assets/Scenes/Title.unity index f90a165..9e8dbd7 100644 --- a/namedropper/Assets/Scenes/Title.unity +++ b/namedropper/Assets/Scenes/Title.unity @@ -1145,7 +1145,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: Roll ball to play + m_Text: title --- !u!222 &1225785574 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/namedropper/Assets/Scripts/Game.cs b/namedropper/Assets/Scripts/Game.cs index eba1f47..bab1648 100644 --- a/namedropper/Assets/Scripts/Game.cs +++ b/namedropper/Assets/Scripts/Game.cs @@ -45,17 +45,17 @@ public class Game : Level if (GameManager.Instance.Round == 1) { CategoriesRound1.SetActive(true); - _seconds = 50; + _seconds = 35; } else if (GameManager.Instance.Round == 2) { CategoriesRound2.SetActive(true); - _seconds = 60; + _seconds = 40; } else if (GameManager.Instance.Round == 3) { CategoriesRound3.SetActive(true); - _seconds = 70; + _seconds = 45; } _originalFontSize = Timer.fontSize; diff --git a/namedropper/Assets/Scripts/JoinPlayer.cs b/namedropper/Assets/Scripts/JoinPlayer.cs index 81d846a..70eb8fb 100644 --- a/namedropper/Assets/Scripts/JoinPlayer.cs +++ b/namedropper/Assets/Scripts/JoinPlayer.cs @@ -131,10 +131,18 @@ public class JoinPlayer : MonoBehaviour // Update is called once per frame void Update() { + if (Input.GetKeyDown(KeyCode.C)) + { + SceneManager.LoadScene("Calibration"); + } + + /* if (Input.GetMouseButtonDown(0)) { LoadTopicSelect(); } + */ + if (Input.GetKeyDown(KeyCode.Alpha1)) { _NumPlayersJoined = 1; diff --git a/namedropper/Assets/Scripts/Player.cs b/namedropper/Assets/Scripts/Player.cs index 2607d3f..22f6a68 100644 --- a/namedropper/Assets/Scripts/Player.cs +++ b/namedropper/Assets/Scripts/Player.cs @@ -8,7 +8,7 @@ using UnityEngine.UIElements; public class Player : MonoBehaviour { const bool ALLOW_DROP = false; - const float SPEED = 2000f; + const float SPEED = 1500f; [SerializeField] KeyCode _keyLeft; [SerializeField] KeyCode _keyRight; [SerializeField] KeyCode _keyDown; @@ -231,7 +231,7 @@ public class Player : MonoBehaviour category.ShowFeedbackBad(_categoryName); this.gameObject.SetActive(false); //Respawn(); - Invoke("Respawn", 2f); + Invoke("Respawn", 1f); } }