diff --git a/Assets/Scripts/DatabaseClasses/Player.cs b/Assets/Scripts/DatabaseClasses/Player.cs index 3e96353..e66b376 100644 --- a/Assets/Scripts/DatabaseClasses/Player.cs +++ b/Assets/Scripts/DatabaseClasses/Player.cs @@ -1,8 +1,9 @@ +using Newtonsoft.Json; using System; using System.Text.RegularExpressions; [Serializable] -[Newtonsoft.Json.JsonObject] +[JsonObject] public class Player { public string name; diff --git a/Assets/Scripts/DatabaseClasses/Prompt.cs b/Assets/Scripts/DatabaseClasses/Prompt.cs index 47f068b..183ca15 100644 --- a/Assets/Scripts/DatabaseClasses/Prompt.cs +++ b/Assets/Scripts/DatabaseClasses/Prompt.cs @@ -1,9 +1,10 @@ using Firebase.Firestore; +using Newtonsoft.Json; using System; using UnityEngine; [Serializable, FirestoreData] -[Newtonsoft.Json.JsonObject] +[JsonObject] public class Prompt { [field: SerializeField] diff --git a/Assets/Scripts/DatabaseClasses/Proposition.cs b/Assets/Scripts/DatabaseClasses/Proposition.cs index 8d6196e..2fe170c 100644 --- a/Assets/Scripts/DatabaseClasses/Proposition.cs +++ b/Assets/Scripts/DatabaseClasses/Proposition.cs @@ -1,7 +1,8 @@ +using Newtonsoft.Json; using System; [Serializable] -[Newtonsoft.Json.JsonObject] +[JsonObject] public class Proposition { public string photoUrl; diff --git a/Assets/Scripts/DatabaseClasses/Question.cs b/Assets/Scripts/DatabaseClasses/Question.cs index d22621e..12f3c6b 100644 --- a/Assets/Scripts/DatabaseClasses/Question.cs +++ b/Assets/Scripts/DatabaseClasses/Question.cs @@ -1,7 +1,8 @@ +using Newtonsoft.Json; using System; [Serializable] -[Newtonsoft.Json.JsonObject] +[JsonObject] public class Question { public string promptId; diff --git a/Assets/Scripts/DatabaseClasses/Room.cs b/Assets/Scripts/DatabaseClasses/Room.cs index eaaf31b..65ad7ee 100644 --- a/Assets/Scripts/DatabaseClasses/Room.cs +++ b/Assets/Scripts/DatabaseClasses/Room.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using UnityEngine; using Newtonsoft.Json; -using System.Collections; [Serializable] -[Newtonsoft.Json.JsonObject] +[JsonObject] public class Room { public string code;