From bb45f55ece2e9fe42947c388376a97e994121672 Mon Sep 17 00:00:00 2001 From: Michel Roux Date: Sat, 27 Jan 2024 20:01:45 +0100 Subject: [PATCH] fix: merge --- Assets/Scripts/GameManager.cs | 2 +- Assets/Scripts/RoomManager.cs | 1 - Packages/packages-lock.json | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 5b03e9b..a81c231 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -15,7 +15,7 @@ public class GameManager : MonoBehaviour { private GameState currentState; private List players = new List(); - private Player currentPlayer = null; + public Player currentPlayer = null; diff --git a/Assets/Scripts/RoomManager.cs b/Assets/Scripts/RoomManager.cs index e085557..b5d30fa 100644 --- a/Assets/Scripts/RoomManager.cs +++ b/Assets/Scripts/RoomManager.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using TMPro; using UnityEngine; -using System; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System.Linq; diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 4ce32a3..ef0f82e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -69,6 +69,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1,