Skip to content

fix: applying address inside TMP field to UTP connection data as host #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 6, 2023
Merged

fix: applying address inside TMP field to UTP connection data as host #112

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d589829
applying address inside TMP field to UTP connection data
fernando-cortez Mar 3, 2023
ab65fb8
scene text reference update
fernando-cortez Mar 3, 2023
119806d
comment removal
fernando-cortez Mar 3, 2023
82daba8
changelog addition
fernando-cortez Mar 3, 2023
ad1059b
merge develop
fernando-cortez Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Basic/Invaders/Assets/Scenes/StartMenu.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_ForceModuleActive: 0
--- !u!114 &388206763
MonoBehaviour:
Expand All @@ -449,6 +450,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
Expand Down Expand Up @@ -575,7 +577,7 @@ GameObject:
- component: {fileID: 604336998}
- component: {fileID: 604336997}
m_Layer: 5
m_Name: StartLocalButton
m_Name: StartButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -650,7 +652,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 698002439}
m_TargetAssemblyTypeName:
m_MethodName: StartLocalGame
m_MethodName: StartGame
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
Expand Down Expand Up @@ -947,7 +949,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f6caebb4c9b3cb4abe107a550d8ed9a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HostIpInput: {fileID: 1160858181}
m_IPAddressText: {fileID: 1160858181}
m_LobbySceneName: InvadersLobby
--- !u!1 &1016699296
GameObject:
Expand Down Expand Up @@ -2085,7 +2087,7 @@ GameObject:
- component: {fileID: 1810564612}
- component: {fileID: 1810564611}
m_Layer: 5
m_Name: JoinLocalButton
m_Name: JoinButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -2160,7 +2162,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 698002439}
m_TargetAssemblyTypeName:
m_MethodName: JoinLocalGame
m_MethodName: JoinGame
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
Expand Down
34 changes: 16 additions & 18 deletions Basic/Invaders/Assets/Scripts/MenuControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
using Unity.Netcode;
using Unity.Netcode.Transports.UTP;
using UnityEngine;
using UnityEngine.UI;

public class MenuControl : MonoBehaviour
{
[SerializeField]
private TMP_Text m_HostIpInput;
TMP_Text m_IPAddressText;

[SerializeField]
private string m_LobbySceneName = "InvadersLobby";
string m_LobbySceneName = "InvadersLobby";

public void StartLocalGame()
public void StartGame()
{
// Update the current HostNameInput with whatever we have set in the NetworkConfig as default
var utpTransport = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
if (utpTransport) m_HostIpInput.text = "127.0.0.1";
if (utpTransport)
{
utpTransport.SetConnectionData(Sanitize(m_IPAddressText.text), 7777);
}
if (NetworkManager.Singleton.StartHost())
{
SceneTransitionHandler.sceneTransitionHandler.RegisterCallbacks();
Expand All @@ -29,23 +30,20 @@ public void StartLocalGame()
}
}

public void JoinLocalGame()
public void JoinGame()
{
if (m_HostIpInput.text != "Hostname")
var utpTransport = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
if (utpTransport)
{
utpTransport.SetConnectionData(Sanitize(m_IPAddressText.text), 7777);
}
if (!NetworkManager.Singleton.StartClient())
{
var utpTransport = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
if (utpTransport)
{
utpTransport.SetConnectionData(Sanitize(m_HostIpInput.text), 7777);
}
if (!NetworkManager.Singleton.StartClient())
{
Debug.LogError("Failed to start client.");
}
Debug.LogError("Failed to start client.");
}
}

public static string Sanitize(string dirtyString)
static string Sanitize(string dirtyString)
{
// sanitize the input for the ip address
return Regex.Replace(dirtyString, "[^A-Za-z0-9.]", "");
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Change log

## [unreleased] - yyyy-mm-dd
N/A

### Invaders

#### Fixed
- IP address input field text value is now passed into UTP's ConnectionData, allowing for remote IP address hosting (#112)

## [1.2.1] - 2023-02-17

Expand Down