Merge branch 'game-manager'

Assets/Scripts/GameManager/GameMaster.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using Mirror;
+
 
 
 // Erstellung von Teams
@@ -12,11 +12,10 @@ using Mirror;
 public class GameMaster : MonoBehaviour
 {
     [Header("GameMaster")]
-    [SerializeField] private List<Player> Players = new List<Player>();
+    [SerializeField] private List<Player> Players = new List<Player>(); 
+    [SerializeField] private int countOfRounds = 10;
+
     public GameObject localPlayer;
-    private void Start()
-    {
-    }
 
     private void Update()
     {
@@ -34,7 +33,6 @@ public class GameMaster : MonoBehaviour
         }
     }
 
- 
 
 
 }

Assets/Scripts/GameManager/JoinLeaveManager.cs

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

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: 

Assets/Scripts/TestOfflineScene/HostBtnScript.cs

@@ -4,15 +4,13 @@ using UnityEngine;
 
 public class HostBtnScript : MonoBehaviour
 {
-    private GameObject GameManager;
     private void Start()
     {
         gameObject.GetComponent<Button>().onClick.AddListener(HostServer);
-        GameManager = GameObject.Find("GameManager");
     }
 
     public void HostServer()
     {
-        GameManager.GetComponent<NetworkManager>().StartHost();
+        GameObject.Find("GameManager").GetComponent<JoinLeaveManager>().Host();
     }
 }

Assets/Scripts/TestOfflineScene/JoinBtnScript.cs

@@ -7,22 +7,19 @@ public class JoinBtnScript : MonoBehaviour
 {
     [SerializeField] private TMP_InputField inputIp;
     [SerializeField] private TMP_InputField inputUsername;
-    private GameObject GameManager;
-    private NetworkManager networkManager;
-    public GameObject localPlayer;
+
+    private JoinLeaveManager joinLeaveManager;
 
     private void Start()
     {
         gameObject.GetComponent<Button>().onClick.AddListener(JoinServer);
-        GameManager = GameObject.Find("GameManager");
-        networkManager = GameManager.GetComponent<NetworkManager>();
+
+        joinLeaveManager = GameObject.Find("GameManager").GetComponent<JoinLeaveManager>();
     }
 
     public void JoinServer()
     {
-        networkManager.StartClient();
-        networkManager.networkAddress = inputIp.text;
-        
-        
+        NetworkClient.Connect(inputIp.text);
+        joinLeaveManager.Join(inputIp.text, inputUsername.text);        
     }
 }