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

fix: merge

Browse Source
This commit is contained in:
Michel Roux 2024-01-27 20:01:45 +01:00
parent fbf4dac1c0
commit bb45f55ece
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/GameManager.cs
View File

@ -15,7 +15,7 @@ public class GameManager : MonoBehaviour
{ {
private GameState currentState; private GameState currentState;
private List<Player> players = new List<Player>(); private List<Player> players = new List<Player>();
private Player currentPlayer = null; public Player currentPlayer = null;

1
Assets/Scripts/RoomManager.cs
View File

@ -4,7 +4,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using System;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.Linq; using System.Linq;

7
Packages/packages-lock.json
View File

@ -69,6 +69,13 @@
}, },
"url": "https://packages.unity.com" "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": { "com.unity.performance.profile-analyzer": {
"version": "1.2.2", "version": "1.2.2",
"depth": 1, "depth": 1,