Merge branch 'game-manager'

This commit is contained in:
juliuse98
2021-11-04 08:23:17 +01:00
12 changed files with 712 additions and 540 deletions

View File

@@ -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
}
}
}

View File

@@ -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();
}
}

View File

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