OpenCodeBox/fishbait
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added server status into inspector

Browse source
This commit is contained in:
Derek S 2021-04-06 19:31:26 -05:00
parent 35704ea649
commit 3da331e048
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
UnityProject/Assets/Mirror/Runtime/Transport/LRM/Editor/LRMInspector.cs
View file

@ -231,6 +231,7 @@ namespace LightReflectiveMirror
// Other tab... // Other tab...
GUI.enabled = false; GUI.enabled = false;
EditorGUILayout.TextField("Server Status", lrm.serverStatus);
EditorGUILayout.TextField("Server ID", lrm.serverId == -1 ? "Not Hosting" : lrm.serverId.ToString()); EditorGUILayout.TextField("Server ID", lrm.serverId == -1 ? "Not Hosting" : lrm.serverId.ToString());
GUI.enabled = true; GUI.enabled = true;

2
UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportRequests.cs
View file

@ -21,7 +21,7 @@ namespace LightReflectiveMirror
IEnumerator RelayConnect() IEnumerator RelayConnect()
{ {
string url = $"http://{loadBalancerAddress}:{loadBalancerPort}/api/join/"; string url = $"http://{loadBalancerAddress}:{loadBalancerPort}/api/join/";
serverStatus = "Waiting for LLB...";
using (UnityWebRequest webRequest = UnityWebRequest.Get(url)) using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
{ {
// Request and wait for the desired page. // Request and wait for the desired page.

1
UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportVariables.cs
View file

@ -37,6 +37,7 @@ namespace LightReflectiveMirror
public List<Room> relayServerList { private set; get; } = new List<Room>(); public List<Room> relayServerList { private set; get; } = new List<Room>();
// Current Server Information // Current Server Information
public string serverStatus = "Not Started.";
public int serverId = -1; public int serverId = -1;
private LRMDirectConnectModule _directConnectModule; private LRMDirectConnectModule _directConnectModule;

5
UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LightReflectiveMirrorTransport.cs
View file

@ -59,6 +59,7 @@ namespace LightReflectiveMirror
_connectedToRelay = false; _connectedToRelay = false;
_isAuthenticated = false; _isAuthenticated = false;
diconnectedFromRelay?.Invoke(); diconnectedFromRelay?.Invoke();
serverStatus = "Disconnected from relay.";
} }
public void ConnectToRelay() public void ConnectToRelay()
@ -101,7 +102,7 @@ namespace LightReflectiveMirror
this.serverIP = serverIP; this.serverIP = serverIP;
serverStatus = "Connecting to relay...";
_clientSendBuffer = new byte[clientToServerTransport.GetMaxPacketSize()]; _clientSendBuffer = new byte[clientToServerTransport.GetMaxPacketSize()];
clientToServerTransport.ClientConnect(serverIP); clientToServerTransport.ClientConnect(serverIP);
} }
@ -150,9 +151,11 @@ namespace LightReflectiveMirror
switch (opcode) switch (opcode)
{ {
case OpCodes.Authenticated: case OpCodes.Authenticated:
serverStatus = "Authenticated! Good to go!";
_isAuthenticated = true; _isAuthenticated = true;
break; break;
case OpCodes.AuthenticationRequest: case OpCodes.AuthenticationRequest:
serverStatus = "Sent authentication to relay...";
SendAuthKey(); SendAuthKey();
break; break;
case OpCodes.GetData: case OpCodes.GetData: