From 8519964e0623b92e373cf5fd06f9ce2df9737249 Mon Sep 17 00:00:00 2001 From: Marine Date: Sat, 27 Jan 2024 23:50:57 +0100 Subject: [PATCH 1/2] update current state + sendExplanation --- Assets/Scripts/GameManager.cs | 86 +++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index b711e5a..814a219 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using Firebase.Database; using Firebase.Extensions; using Newtonsoft.Json; @@ -11,9 +12,7 @@ /// public class GameManager : MonoBehaviour { - private GameState currentState; private List players = new(); - private bool isFirst = false; public Player currentPlayer = null; public Question currentQuestion = null; @@ -58,15 +57,13 @@ private void Start() } private void OnApplicationQuit() { - myOnlineRoom.Child("players").Child(currentPlayer.id).RemoveValueAsync(); - Debug.Log($"delete player {currentPlayer.name}"); - myRoom = null; + myOnlineRoom.Child("players").Child(currentPlayer.id).RemoveValueAsync().ContinueWithOnMainThread(task => + { + Debug.Log($"delete player {currentPlayer.name}"); + myOnlineRoom.ValueChanged -= OnRoomUpdate; + }); } - public GameState GetCurrentState() - { - return currentState; - } private void Initialize() { @@ -125,7 +122,7 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code) { //then subscribe to it myOnlineRoom.ValueChanged += OnRoomUpdate; - currentState = GameState.WaitingForOtherPlayersToJoin; + myRoom.currentState = (int)GameState.WaitingForOtherPlayersToJoin; players.Add(currentPlayer); WaitingRoom.SetActive(true); @@ -203,19 +200,13 @@ public void StartGame() Debug.Log(JSON); try { - myOnlineRoom.Child("currentState").SetValueAsync(2).ContinueWithOnMainThread(task => + sendCurrentState(GameState.Explanation, () => { - if (task.IsFaulted) - { - Debug.LogException(task.Exception); - } - else - { - Debug.Log($"start the game", this); - currentState = GameState.Explanation; - WaitingRoom.SetActive(false); - BeforeStart.SetActive(true); - } + Debug.Log($"start the game", this); + myRoom.currentState = (int)GameState.Explanation; + WaitingRoom.SetActive(false); + BeforeStart.SetActive(true); + }); } catch (Exception ex) @@ -233,7 +224,7 @@ public void StartGame() /// The prompt to display public void MakeAProposition(Prompt _prompt) { - currentState = GameState.MakeProposition; + //currentState = GameState.MakeProposition; } /// @@ -283,13 +274,30 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs e) { Debug.LogException(ex); } - - switch (currentState) + if(myRoom == null) { + return; + } + switch (myRoom.currentState) { - case GameState.WaitingForOtherPlayersToJoin: + case (int)GameState.WaitingForOtherPlayersToJoin: { CheckIfIAmTheFirst(myRoom.GetPlayerList()); UpdateDisplayedListUser(myRoom.GetPlayerList()); + break; + } + case (int)GameState.Explanation: + { + + break; + } + case (int)GameState.MakeProposition: + { + if (BeforeStart.activeInHierarchy) + { + BeforeStart.SetActive(false); + TakePicture.SetActive(true); + } + break; } } @@ -307,16 +315,38 @@ private void UpdateDisplayedListUser(List players) private void CheckIfIAmTheFirst(List players) { + bool isFirst = false; if (players.Count > 1) { + IOrderedEnumerable sortedList = players.OrderBy(x=>x.creationDate); + + if(sortedList.Last().id == currentPlayer.id) + { + isFirst = true; + } } - else + + if (isFirst) { - + submitStartGame.SetActive(true); } } + public void sendCurrentState(GameState state,Action callback_oncCurrentStateSent) + { + myOnlineRoom.Child("currentState").SetValueAsync((int)state).ContinueWithOnMainThread(task => + { + if (task.IsFaulted) + { + Debug.LogException(task.Exception); + } + else + { + callback_oncCurrentStateSent?.Invoke(); + } + }); ; + } public void OnClickSubmitSignIn() { From ad324a1ed4f83a93f54fa5878c7bfd2e1b894cb0 Mon Sep 17 00:00:00 2001 From: Otaku9999 Date: Sun, 28 Jan 2024 00:03:13 +0100 Subject: [PATCH 2/2] End music --- Assets/Music.meta | 8 ++++++++ Assets/Music/Ending.mp3 | 3 +++ Assets/Music/Ending.mp3.meta | 23 +++++++++++++++++++++++ Assets/Music/Menu.mp3 | 3 +++ Assets/Music/Menu.mp3.meta | 23 +++++++++++++++++++++++ Assets/Music/Taking picture.mp3 | 3 +++ Assets/Music/Taking picture.mp3.meta | 23 +++++++++++++++++++++++ 7 files changed, 86 insertions(+) create mode 100644 Assets/Music.meta create mode 100644 Assets/Music/Ending.mp3 create mode 100644 Assets/Music/Ending.mp3.meta create mode 100644 Assets/Music/Menu.mp3 create mode 100644 Assets/Music/Menu.mp3.meta create mode 100644 Assets/Music/Taking picture.mp3 create mode 100644 Assets/Music/Taking picture.mp3.meta 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: