GameJams/Snaparazzi
1
0
Fork 0
Code Issues 11 Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi

Browse Source
This commit is contained in:
Marine 2024-01-28 16:43:06 +01:00
commit d36dad28bd
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scenes/PhoneView.unity
View File

@ -316,8 +316,8 @@ MonoBehaviour:
propositionCounter: {fileID: 0} propositionCounter: {fileID: 0}
propositionTime: 60 propositionTime: 60
waitingForPropositionsLabels: [] waitingForPropositionsLabels: []
votingPage: {fileID: 0}
promptList: {fileID: 0} promptList: {fileID: 0}
votingTime: 20
--- !u!4 &157909815 --- !u!4 &157909815
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -987,6 +987,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3b41deef4ebd372d5a18eabdb00cfbb4, type: 3} m_Script: {fileID: 11500000, guid: 3b41deef4ebd372d5a18eabdb00cfbb4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
cameraManager: {fileID: 1181392807}
--- !u!114 &429358653 --- !u!114 &429358653
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1022,7 +1023,7 @@ MonoBehaviour:
EndGame: {fileID: 1850164816} EndGame: {fileID: 1850164816}
myRoom: myRoom:
code: code:
currentQuestion: 0 currentQuestionId:
creationDate: 0 creationDate: 0
currentState: 0 currentState: 0
--- !u!1 &436596783 --- !u!1 &436596783

6
Assets/Scripts/StorageManager.cs
View File

@ -6,7 +6,7 @@
public class StorageManager : MonoBehaviour public class StorageManager : MonoBehaviour
{ {
public GameObject managers; public CameraManager cameraManager;
private StorageReference storage; private StorageReference storage;
private DatabaseReference realtimeDB; private DatabaseReference realtimeDB;
@ -36,10 +36,8 @@ void Update()
public void UploadPhoto(string roomCode, string playerId, int question, int proposition) public void UploadPhoto(string roomCode, string playerId, int question, int proposition)
{ {
Texture2D photo = managers.GetComponent<CameraManager>().GetPhoto(); Texture2D photo = cameraManager.GetPhoto();
byte[] photoBytes = ImageConversion.EncodeToJPG(photo); byte[] photoBytes = ImageConversion.EncodeToJPG(photo);
GameManager game = managers.GetComponent<GameManager>();
string imageUuid = Guid.NewGuid().ToString(); string imageUuid = Guid.NewGuid().ToString();
StorageReference imageRef = storage.Child($"{roomCode}/{playerId}/{imageUuid}.png"); StorageReference imageRef = storage.Child($"{roomCode}/{playerId}/{imageUuid}.png");

33
Assets/Scripts/VotingPage.cs
View File

@ -38,7 +38,11 @@ private void Update()
return; return;
if (endOfTimer <= DateTime.Now) if (DateTime.Now < endOfTimer)
{
timerLabel.text = (DateTime.Now - endOfTimer).TotalSeconds.ToString("D2");
}
else
{ {
timerLabel.text = "0"; timerLabel.text = "0";
if (remainingQuestions.Count > 0) if (remainingQuestions.Count > 0)
@ -51,10 +55,6 @@ private void Update()
OnVoteEnded?.Invoke(); OnVoteEnded?.Invoke();
} }
} }
else
{
timerLabel.text = (DateTime.Now - endOfTimer).ToString("D2");
}
} }
@ -130,19 +130,24 @@ private void OnQuestionChanged(object sender, ValueChangedEventArgs _questionRef
private void UpdateVoters() private void UpdateVoters()
{ {
List<Player> playersThatHasVotedForFirstProposition = new List<Player>(); if (currentQuestion.propositions[0] != null)
foreach (string playerId in currentQuestion.propositions[0].voters)
{ {
playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]); List<Player> playersThatHasVotedForFirstProposition = new List<Player>();
foreach (string playerId in currentQuestion.propositions[0].voters)
{
playersThatHasVotedForFirstProposition.Add(currentPlayers[playerId]);
}
proposition1.UpdateVoters(playersThatHasVotedForFirstProposition);
} }
List<Player> playersThatHasVotedForSecondProposition = new List<Player>(); if (currentQuestion.propositions[1] != null)
foreach (string playerId in currentQuestion.propositions[1].voters)
{ {
playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]); List<Player> playersThatHasVotedForSecondProposition = new List<Player>();
foreach (string playerId in currentQuestion.propositions[1].voters)
{
playersThatHasVotedForSecondProposition.Add(currentPlayers[playerId]);
}
proposition2.UpdateVoters(playersThatHasVotedForSecondProposition);
} }
proposition1.UpdateVoters(playersThatHasVotedForFirstProposition);
proposition2.UpdateVoters(playersThatHasVotedForSecondProposition);
} }
} }