diff --git a/Assets/Scenes/ComputerView.unity b/Assets/Scenes/ComputerView.unity index 26942e1..61f2147 100644 --- a/Assets/Scenes/ComputerView.unity +++ b/Assets/Scenes/ComputerView.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18018535, g: 0.22559482, b: 0.30677685, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1376,8 +1376,8 @@ MonoBehaviour: - {fileID: 2137991537} - {fileID: 340074661} promptList: {fileID: 0} - explanationPage: {fileID: 0} - counter: {fileID: 0} + explanationPage: {fileID: 45150984} + counter: {fileID: 1798182259} waitingForPropositionsPage: {fileID: 1730465902} waitingForPropositionsLabels: - {fileID: 972471162} diff --git a/Assets/Scripts/DatabaseClasses/Room.cs b/Assets/Scripts/DatabaseClasses/Room.cs index 9742598..c9f9830 100644 --- a/Assets/Scripts/DatabaseClasses/Room.cs +++ b/Assets/Scripts/DatabaseClasses/Room.cs @@ -20,7 +20,7 @@ public Room(string _code) players = new Dictionary(); questions = new Dictionary(); currentQuestion = 0; - currentState = 0; + currentState = 1; //default by PC } public List GetPlayerList() diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 437117b..cbebfea 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -133,7 +133,7 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) List list = new List(); list.Add(currentPlayer); - UpdateDisplayedListUser(list) ; + UpdateDisplayedListUser(list); }); } }); @@ -222,7 +222,7 @@ public void StartGame() Debug.LogException(ex); } - + } /// @@ -303,7 +303,7 @@ private void UpdateDisplayedListUser(List players) listPlayersUI.text += "\n" + players[i].name; } } - + private void CheckIfIAmTheFirst(List players) { if (players.Count > 1) @@ -312,7 +312,7 @@ private void CheckIfIAmTheFirst(List players) } else { - + } } @@ -334,8 +334,7 @@ public enum GameState PropositionsSent = 4, MakeVote = 5, VoteSent = 6, - Score = 7, - Ending = 8 + Score = 7 } diff --git a/Assets/Scripts/RoomManager.cs b/Assets/Scripts/RoomManager.cs index 7a7314e..3ec8f47 100644 --- a/Assets/Scripts/RoomManager.cs +++ b/Assets/Scripts/RoomManager.cs @@ -57,6 +57,10 @@ private void Awake() private void Start() { + explanationPage.SetActive(false); + waitingForPropositionsPage.SetActive(false); + waitingForPlayersPage.SetActive(true); + propositionCurrentTime = propositionTime; votingCurrentTime = votingTime; ResetAllPlayerLabels(); @@ -70,7 +74,7 @@ private void Update() if (myRoom.currentState == (int)GameState.Explanation && endOfExplanationDate != DateTime.MinValue) { TimeSpan duration = endOfExplanationDate - DateTime.Now; - counter.text = duration.TotalSeconds.ToString("D1"); + counter.text = ((int)duration.TotalSeconds).ToString("D1"); if (duration.TotalMilliseconds <= 0) { @@ -335,7 +339,7 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs value) case (int)GameState.Explanation: waitingForPlayersPage.SetActive(false); explanationPage.SetActive(true); - endOfExplanationDate = DateTime.Now.AddSeconds(30); + endOfExplanationDate = DateTime.Now.AddSeconds(3); break; case (int)GameState.MakeProposition: HostStartGame();