Skip to content

Commit c9557b1

Browse files
LPLafontaineBLPLafontaineB
committed
removing TransportPicker
1 parent 11de374 commit c9557b1

File tree

6 files changed

+17
-139
lines changed

6 files changed

+17
-139
lines changed

‎Assets/BossRoom/Prefabs/NetworkingManager.prefab

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -60,66 +60,6 @@ MonoBehaviour:
6060
PacketDelayMS: 0
6161
PacketJitterMS: 0
6262
PacketDropRate: 0
63-
--- !u!1 &503411707
64-
GameObject:
65-
m_ObjectHideFlags: 0
66-
m_CorrespondingSourceObject: {fileID: 0}
67-
m_PrefabInstance: {fileID: 0}
68-
m_PrefabAsset: {fileID: 0}
69-
serializedVersion: 6
70-
m_Component:
71-
- component: {fileID: 503411708}
72-
- component: {fileID: 503411709}
73-
m_Layer: 0
74-
m_Name: Relay UTP
75-
m_TagString: Untagged
76-
m_Icon: {fileID: 0}
77-
m_NavMeshLayer: 0
78-
m_StaticEditorFlags: 0
79-
m_IsActive: 1
80-
--- !u!4 &503411708
81-
Transform:
82-
m_ObjectHideFlags: 0
83-
m_CorrespondingSourceObject: {fileID: 0}
84-
m_PrefabInstance: {fileID: 0}
85-
m_PrefabAsset: {fileID: 0}
86-
m_GameObject: {fileID: 503411707}
87-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
88-
m_LocalPosition: {x: 0, y: 0, z: 0}
89-
m_LocalScale: {x: 1, y: 1, z: 1}
90-
m_ConstrainProportionsScale: 0
91-
m_Children: []
92-
m_Father: {fileID: 5436007408952557925}
93-
m_RootOrder: 1
94-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
95-
--- !u!114 &503411709
96-
MonoBehaviour:
97-
m_ObjectHideFlags: 0
98-
m_CorrespondingSourceObject: {fileID: 0}
99-
m_PrefabInstance: {fileID: 0}
100-
m_PrefabAsset: {fileID: 0}
101-
m_GameObject: {fileID: 503411707}
102-
m_Enabled: 1
103-
m_EditorHideFlags: 0
104-
m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
105-
m_Name:
106-
m_EditorClassIdentifier:
107-
m_ProtocolType: 1
108-
m_MaxPacketQueueSize: 512
109-
m_MaxPayloadSize: 32000
110-
m_MaxSendQueueSize: 50000000
111-
m_HeartbeatTimeoutMS: 500
112-
m_ConnectTimeoutMS: 1000
113-
m_MaxConnectAttempts: 60
114-
m_DisconnectTimeoutMS: 10000
115-
ConnectionData:
116-
Address: 127.0.0.1
117-
Port: 7777
118-
ServerListenAddress:
119-
DebugSimulator:
120-
PacketDelayMS: 0
121-
PacketJitterMS: 0
122-
PacketDropRate: 0
12363
--- !u!1 &5436007408952557947
12464
GameObject:
12565
m_ObjectHideFlags: 0
@@ -129,7 +69,6 @@ GameObject:
12969
serializedVersion: 6
13070
m_Component:
13171
- component: {fileID: 5436007408952557925}
132-
- component: {fileID: 1359040526}
13372
- component: {fileID: 5436007408952557924}
13473
m_Layer: 0
13574
m_Name: NetworkingManager
@@ -151,24 +90,9 @@ Transform:
15190
m_ConstrainProportionsScale: 0
15291
m_Children:
15392
- {fileID: 347284043}
154-
- {fileID: 503411708}
15593
m_Father: {fileID: 0}
15694
m_RootOrder: 0
15795
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
158-
--- !u!114 &1359040526
159-
MonoBehaviour:
160-
m_ObjectHideFlags: 0
161-
m_CorrespondingSourceObject: {fileID: 0}
162-
m_PrefabInstance: {fileID: 0}
163-
m_PrefabAsset: {fileID: 0}
164-
m_GameObject: {fileID: 5436007408952557947}
165-
m_Enabled: 1
166-
m_EditorHideFlags: 0
167-
m_Script: {fileID: 11500000, guid: 0c0e18361257a9f409d6064bac74e732, type: 3}
168-
m_Name:
169-
m_EditorClassIdentifier:
170-
m_IpHostTransport: {fileID: 5486862276979889515}
171-
m_UnityRelayTransport: {fileID: 503411709}
17296
--- !u!114 &5436007408952557924
17397
MonoBehaviour:
17498
m_ObjectHideFlags: 0

‎Assets/BossRoom/Scripts/Client/UI/IPConnectionWindow.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using TMPro;
44
using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
55
using Unity.Netcode;
6+
using Unity.Netcode.Transports.UTP;
67
using UnityEngine;
78

89
namespace Unity.Multiplayer.Samples.BossRoom.Visual
@@ -45,19 +46,16 @@ void Hide()
4546

4647
public void ShowConnectingWindow()
4748
{
48-
var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
49-
NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
50-
5149
void OnTimeElapsed()
5250
{
5351
m_ConnectStatusPublisher.Publish(ConnectStatus.StartClientFailed);
5452
Hide();
5553
m_IPUIMediator.DisableSignInSpinner();
5654
}
57-
58-
59-
var maxConnectAttempts= chosenTransport.MaxConnectAttempts;
60-
var connectTimeoutMS= chosenTransport.ConnectTimeoutMS;
55+
56+
var utp = (UnityTransport) NetworkManager.Singleton.NetworkConfig.NetworkTransport;
57+
var maxConnectAttempts= utp.MaxConnectAttempts;
58+
var connectTimeoutMS= utp.ConnectTimeoutMS;
6159
StartCoroutine(DisplayUTPConnectionDuration(maxConnectAttempts, connectTimeoutMS, OnTimeElapsed));
6260

6361
Show();

‎Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private IEnumerator TryToReconnect(string lobbyCode)
204204
if (joiningLobby.Result.Success)
205205
{
206206
m_LobbyServiceFacade.SetRemoteLobby(joiningLobby.Result.Lobby);
207-
var joiningRelay = JoinRelayAsync();
207+
var joiningRelay = StartClientUnityRelayModeAsync(null);
208208
yield return new WaitUntil(() => joiningRelay.IsCompleted);
209209
}
210210
else
@@ -243,24 +243,18 @@ private IEnumerator TryToReconnect(string lobbyCode)
243243
/// <param name="port">The port of the host to connect to. </param>
244244
public void StartClient(string ipaddress, int port)
245245
{
246-
var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
247-
NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
246+
//var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
247+
//NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
248+
249+
var utp = (UnityTransport) NetworkManager.Singleton.NetworkConfig.NetworkTransport;
248250

249251
// TODO: once this is exposed in the adapter we will be able to change it
250-
chosenTransport.SetConnectionData(ipaddress, (ushort)port);
252+
utp.SetConnectionData(ipaddress, (ushort)port);
251253

252254
ConnectClient();
253255
}
254256

255-
public async void StartClientUnityRelayModeAsync(Action<string> onFailure)
256-
{
257-
var utp = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
258-
NetworkManager.Singleton.NetworkConfig.NetworkTransport = utp;
259-
260-
await JoinRelayAsync(onFailure);
261-
}
262-
263-
async Task JoinRelayAsync(Action<string> onFailure = null)
257+
public async Task StartClientUnityRelayModeAsync(Action<string> onFailure)
264258
{
265259
Debug.Log($"Setting Unity Relay client with join code {m_LocalLobby.RelayJoinCode}");
266260

‎Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/GameNetPortal.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
66
using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
77
using Unity.Netcode;
8+
using Unity.Netcode.Transports.UTP;
89
using Unity.Services.Authentication;
910
using Unity.Services.Core;
1011
using UnityEngine;
@@ -176,18 +177,14 @@ private void OnNetworkReady()
176177
/// <param name="port">The port to connect to. </param>
177178
public bool StartHost(string ipaddress, int port)
178179
{
179-
var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().IpHostTransport;
180-
NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
181-
chosenTransport.SetConnectionData(ipaddress, (ushort)port);
180+
var utp = (UnityTransport) NetworkManager.Singleton.NetworkConfig.NetworkTransport;
181+
utp.SetConnectionData(ipaddress, (ushort)port);
182182

183183
return StartHost();
184184
}
185185

186186
public async void StartUnityRelayHost()
187187
{
188-
var chosenTransport = NetworkManager.Singleton.gameObject.GetComponent<TransportPicker>().UnityRelayTransport;
189-
NetworkManager.Singleton.NetworkConfig.NetworkTransport = chosenTransport;
190-
191188
Debug.Log("Setting up Unity Relay host");
192189

193190
try
@@ -201,7 +198,8 @@ public async void StartUnityRelayHost()
201198
await m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(allocationIdBytes.ToString(), joinCode);
202199

203200
// we now need to set the RelayCode somewhere :P
204-
chosenTransport.SetHostRelayData(ipv4Address, port, allocationIdBytes, key, connectionData, isSecure: true);
201+
var utp = (UnityTransport) NetworkManager.Singleton.NetworkConfig.NetworkTransport;
202+
utp.SetHostRelayData(ipv4Address, port, allocationIdBytes, key, connectionData, isSecure: true);
205203
}
206204
catch (Exception e)
207205
{

‎Assets/BossRoom/Scripts/Shared/TransportPicker.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Assets/BossRoom/Scripts/Shared/TransportPicker.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)