From 0014a2a05d3e67ea25505debc3fc95700d6fdc85 Mon Sep 17 00:00:00 2001 From: Fangh Date: Sun, 28 Jan 2024 16:52:13 +0100 Subject: [PATCH 1/2] fix somes things --- Assets/Scripts/RoomManager.cs | 2 +- Assets/Scripts/VotingPage.cs | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/RoomManager.cs b/Assets/Scripts/RoomManager.cs index 791d374..ec727d8 100644 --- a/Assets/Scripts/RoomManager.cs +++ b/Assets/Scripts/RoomManager.cs @@ -428,7 +428,7 @@ private void CheckPlayersPropositions() { if (string.IsNullOrEmpty(p.photoUrl)) { - Debug.Log($"player {p.owner} has a proposition without an URL"); + Debug.Log($"player {p.owner.name} has a proposition without an URL"); allPlayersHasProposedTwoPictures = false; } } diff --git a/Assets/Scripts/VotingPage.cs b/Assets/Scripts/VotingPage.cs index 6ec4eea..88b9c28 100644 --- a/Assets/Scripts/VotingPage.cs +++ b/Assets/Scripts/VotingPage.cs @@ -133,21 +133,27 @@ private void UpdateVoters() if (currentQuestion.propositions[0] != null) { List playersThatHasVotedForFirstProposition = new List(); - foreach (string playerId in currentQuestion.propositions[0].voters) + if (currentQuestion.propositions[0].voters != null) { - playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]); + foreach (string playerId in currentQuestion.propositions[0].voters) + { + playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]); + } + proposition1.UpdateVoters(playersThatHasVotedForFirstProposition); } - proposition1.UpdateVoters(playersThatHasVotedForFirstProposition); } if (currentQuestion.propositions[1] != null) { List playersThatHasVotedForSecondProposition = new List(); - foreach (string playerId in currentQuestion.propositions[1].voters) + if (currentQuestion.propositions[0].voters != null) { - playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]); + foreach (string playerId in currentQuestion.propositions[1].voters) + { + playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]); + } + proposition2.UpdateVoters(playersThatHasVotedForSecondProposition); } - proposition2.UpdateVoters(playersThatHasVotedForSecondProposition); } } } From e51740400dc5a7b7fb9450e85d5619acee15a73d Mon Sep 17 00:00:00 2001 From: Otaku9999 Date: Sun, 28 Jan 2024 16:58:43 +0100 Subject: [PATCH 2/2] Prompt + funny name --- Assets/Scenes/ComputerView.unity | 17 ++++++++++++- Assets/ScriptableObjects/PromptList.asset | 30 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/ComputerView.unity b/Assets/Scenes/ComputerView.unity index faa6178..b653cbd 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.18018535, g: 0.22559482, b: 0.30677685, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6759,6 +6759,21 @@ MonoBehaviour: m_EditorClassIdentifier: texts: - Hideo Kojima is not executive director on this project. + - Medium-hot mustard > all + - Glaceon best eeveelution + - Made with lots of coffee + - Sell Lada, very little used, will be used very little + - It's not very cold at the moment + - 'If laziness were a sport, we would all be champions ' + - Shinji Mikami has not approved this project (but we remain available) + - 'JRPG rules the world ' + - Bravo les lesbiennes ! + - 'Mer il est fou ! ' + - Au revoir... + - '*Angry cat noise*' + - Nyaaaa ~ + - Coded without JS (I think) + - I developed without counting --- !u!1 &1542177989 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ScriptableObjects/PromptList.asset b/Assets/ScriptableObjects/PromptList.asset index c957b6f..e2493e3 100644 --- a/Assets/ScriptableObjects/PromptList.asset +++ b/Assets/ScriptableObjects/PromptList.asset @@ -165,3 +165,33 @@ MonoBehaviour: - k__BackingField: 70f8b286-b245-45b9-a850-ac2e14bf9cef k__BackingField: Votre plus belle grimace k__BackingField: Your best grimace + - k__BackingField: bcd451ef-06f7-4517-8ed7-f8d6f24489bc + k__BackingField: "Un p\xE8re no\xEBl" + k__BackingField: A Santa Claus + - k__BackingField: d3ba94ba-d025-41ff-811f-a80619c34805 + k__BackingField: Parle beaucoup + k__BackingField: Talk a lot + - k__BackingField: c669f53a-aace-4658-95db-ad3df8eeb591 + k__BackingField: Un truc qui colle + k__BackingField: Something that sticks + - k__BackingField: 1bd84b74-0d40-4f84-bbe9-4d279d1c82bb + k__BackingField: Un objet qui prends des photos + k__BackingField: An object that takes photos + - k__BackingField: eb7ffe31-bf01-4b10-b923-0a9e82cb148e + k__BackingField: Le retour du fils prodigue + k__BackingField: The Return of the Prodigal Son + - k__BackingField: 1eea7cba-df04-4e7a-8785-2173da8f5477 + k__BackingField: "Nourriture agr\xE9able" + k__BackingField: Comfort food + - k__BackingField: 2c660b2b-82d7-45ab-b88c-38dbbf4505d1 + k__BackingField: Un lien entre deux mondes + k__BackingField: A link between two worlds + - k__BackingField: 720dbf48-5abc-4507-baaa-698ad7f06a44 + k__BackingField: "Un actionner des ann\xE9es 80" + k__BackingField: 'An action from the 80s ' + - k__BackingField: fc3de187-e7c2-4d16-a9d2-b8bbf7c9698c + k__BackingField: Vous dans dix ans + k__BackingField: You in ten years + - k__BackingField: 9676ca98-d488-4105-b25e-78f63ad44482 + k__BackingField: "Une excellente excuse pour un arr\xEAt maladie" + k__BackingField: An excellent excuse for sick leave