Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi
This commit is contained in:
commit
bbb2a98412
@ -307,8 +307,7 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs e)
|
||||
{
|
||||
OnNewGameState();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
//call this every time we are on this state
|
||||
switch (myRoom.currentState)
|
||||
{
|
||||
@ -322,7 +321,6 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs e)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Call this when Game state change
|
||||
|
@ -31,7 +31,7 @@ void OnDisable()
|
||||
void Redraw(int currentQuestion)
|
||||
{
|
||||
Prompt prompt = promptList.prompts.Find(x => x.id == player2questions[currentQuestion].promptId);
|
||||
Debug.Log(JsonUtility.ToJson(prompt));
|
||||
//Debug.Log(JsonUtility.ToJson(prompt));
|
||||
explainText.SetText(prompt.en);
|
||||
|
||||
CameraManager cameraManager = gameObject.GetComponent<CameraManager>();
|
||||
@ -52,7 +52,8 @@ public void OnSubmitButton()
|
||||
gameManager.myRoom.code,
|
||||
gameManager.currentPlayer.id,
|
||||
currentQuestion,
|
||||
GetPropRef(gameManager.currentPlayer), succeed =>
|
||||
GetPropRef(gameManager.currentPlayer),
|
||||
succeed =>
|
||||
{
|
||||
if(!succeed)
|
||||
{
|
||||
|
@ -49,7 +49,7 @@ public void UploadPhoto(string roomCode, string playerId, int question, int prop
|
||||
string path = $"{roomCode}/{playerId}/{imageUuid}.png";
|
||||
StorageReference imageRef = storage.Child(path);
|
||||
|
||||
imageRef.PutBytesAsync(photoBytes).ContinueWith((Task<StorageMetadata> task) =>
|
||||
imageRef.PutBytesAsync(photoBytes).ContinueWithOnMainThread(task =>
|
||||
{
|
||||
if (task.IsFaulted || task.IsCanceled)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user