fixed github bug

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

View File

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