mirror of
https://github.com/DerTyp7/defrain-shooter-unity.git
synced 2025-10-30 21:17:09 +01:00
fixed github bug
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user