idk 2

Assets/Scripts/GameManager/GameMaster.cs

@@ -12,11 +12,19 @@ using UnityEngine;
 public class GameMaster : MonoBehaviour
 {
     [Header("GameMaster")]
+<<<<<<< Updated upstream
     [SerializeField] private List<Player> Players = new List<Player>(); 
     private void Start()
     {
 
     }
+=======
+    [SerializeField] private List<Player> Players = new List<Player>();
+    [SerializeField] private int countOfRounds = 10;
+
+    public GameObject localPlayer;
+
+>>>>>>> Stashed changes
 
     private void Update()
     {
@@ -33,4 +41,13 @@ public class GameMaster : MonoBehaviour
             Cursor.visible = false;
         }
     }
+<<<<<<< Updated upstream
+=======
+
+    
+
+ 
+
+
+>>>>>>> Stashed changes
 }

Assets/Scripts/GameManager/JoinLeaveManager.cs

@@ -0,0 +1,18 @@
+using Mirror;
+using UnityEngine;
+
+public class JoinLeaveManager : MonoBehaviour
+{
+    private NetworkManager networkManager;
+
+    public void Join(string ip, string username)
+    {
+        networkManager = GetComponent<NetworkManager>();
+
+        Debug.Log("[JoinLeaveManager] Trying to join server: " + ip + " as " + username);
+
+        networkManager.StartClient();
+        networkManager.networkAddress = ip;
+        Debug.Log("[JoinLeaveManager] " + username + " joined the server: " + ip);
+    }
+}

Assets/Scripts/GameManager/JoinLeaveManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b62b46838717d934483010f517c5b772
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: