janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 20:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed github bug

Browse Source
This commit is contained in:
DerTyp187
2021-11-03 07:46:31 +01:00
parent c1711713b9
commit fa0a7fc9cf
16 changed files with 996 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Scripts/GameManager/GameMaster.cs
View File

@@ -12,20 +12,11 @@ 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()
{
if (Input.GetKeyDown(KeyCode.H))
@@ -41,13 +32,4 @@ public class GameMaster : MonoBehaviour
Cursor.visible = false;
}
}
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
}