diff --git a/Assets/Music.meta b/Assets/Music.meta new file mode 100644 index 0000000..a6bc371 --- /dev/null +++ b/Assets/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23eaa774a3a7d434183a4c336d52891f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Music/Ending.mp3 b/Assets/Music/Ending.mp3 new file mode 100644 index 0000000..7a2f9a5 --- /dev/null +++ b/Assets/Music/Ending.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a004520c6ebb46f1966c6d35d4bb25853e303a88c111315010fb35b6ad2953 +size 7008143 diff --git a/Assets/Music/Ending.mp3.meta b/Assets/Music/Ending.mp3.meta new file mode 100644 index 0000000..ae2380c --- /dev/null +++ b/Assets/Music/Ending.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e1135788bf319bd42b6ca512976f9028 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Music/Menu.mp3 b/Assets/Music/Menu.mp3 new file mode 100644 index 0000000..74c2184 --- /dev/null +++ b/Assets/Music/Menu.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4fdb901d2d6e7627073d7645dd97658b0e819afac9fbb01f8de09e8591fce4c +size 5630543 diff --git a/Assets/Music/Menu.mp3.meta b/Assets/Music/Menu.mp3.meta new file mode 100644 index 0000000..f8d41cc --- /dev/null +++ b/Assets/Music/Menu.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7ac3efdb5c840704aafbf19188b3e61e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Music/Taking picture.mp3 b/Assets/Music/Taking picture.mp3 new file mode 100644 index 0000000..602e992 --- /dev/null +++ b/Assets/Music/Taking picture.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee4f9285dac6a7b0925aed9cbb8314b44d4a996fa255a5100f138df2db0f97ed +size 2427023 diff --git a/Assets/Music/Taking picture.mp3.meta b/Assets/Music/Taking picture.mp3.meta new file mode 100644 index 0000000..6a4e838 --- /dev/null +++ b/Assets/Music/Taking picture.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0e86c0433979a2d4c884b368808d3cdf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: 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 ce43dd9..c04453e 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -133,7 +133,7 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) currentPlayer }; - UpdateDisplayedListUser(list) ; + UpdateDisplayedListUser(list); }); } }); @@ -216,7 +216,7 @@ public void StartGame() Debug.LogException(ex); } - + } /// @@ -314,7 +314,7 @@ private void UpdateDisplayedListUser(List players) listPlayersUI.text += "\n" + players[i].name; } } - + private void CheckIfIAmTheFirst(List players) { bool isFirst = false; @@ -367,8 +367,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();