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

Merge pull request #16 from sableangle/main

Browse source 
Add package.json and fix issue on LRM inspector
This commit is contained in:
Derek S 2021-04-16 14:30:17 -05:00 committed by GitHub
commit 09b652b9ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -194,11 +194,11 @@ namespace LightReflectiveMirror
// They have completed the "setup guide" Show them the main UI
// Remove unused transports...
foreach(var transport in lrm.GetComponentsInChildren<Transport>())
foreach (var transport in lrm.GetComponentsInChildren<Transport>())
{
if(!(transport is LightReflectiveMirrorTransport))
if (!(transport is LightReflectiveMirrorTransport))
{
if(transport != lrm.clientToServerTransport && (directModule == null ? true : directModule.directConnectTransport != transport))
if (transport != lrm.clientToServerTransport && (directModule == null ? true : directModule.directConnectTransport != transport))
{
if (transport.gameObject == lrm.gameObject)
DestroyImmediate(transport);
@ -223,25 +223,34 @@ namespace LightReflectiveMirror
switch (currentTab)
{
case 0:
// They are in the LRM Settings tab.
if (lrm.useLoadBalancer)
using (var change = new EditorGUI.ChangeCheckScope())
{
EditorGUILayout.HelpBox("While using a Load Balancer, you don't set the LRM node IP or port.", MessageType.Info);
GUI.enabled = false;
}
lrm.serverIP = EditorGUILayout.TextField("LRM Node IP", lrm.serverIP);
lrm.serverPort = (ushort)Mathf.Clamp(EditorGUILayout.IntField("LRM Node Port", lrm.serverPort), ushort.MinValue, ushort.MaxValue);
lrm.endpointServerPort = (ushort)Mathf.Clamp(EditorGUILayout.IntField("Endpoint Port", lrm.endpointServerPort), ushort.MinValue, ushort.MaxValue);
if (lrm.useLoadBalancer)
{
GUI.enabled = true;
}
lrm.authenticationKey = EditorGUILayout.TextField("LRM Auth Key", lrm.authenticationKey);
lrm.heartBeatInterval = EditorGUILayout.Slider("Heartbeat Time", lrm.heartBeatInterval, 0.1f, 5f);
lrm.connectOnAwake = EditorGUILayout.Toggle("Connect on Awake", lrm.connectOnAwake);
lrm.clientToServerTransport = (Transport)EditorGUILayout.ObjectField("LRM Transport", lrm.clientToServerTransport, typeof(Transport), true);
// They are in the LRM Settings tab.
if (lrm.useLoadBalancer)
{
EditorGUILayout.HelpBox("While using a Load Balancer, you don't set the LRM node IP or port.", MessageType.Info);
GUI.enabled = false;
}
lrm.serverIP = EditorGUILayout.TextField("LRM Node IP", lrm.serverIP);
lrm.serverPort = (ushort)Mathf.Clamp(EditorGUILayout.IntField("LRM Node Port", lrm.serverPort), ushort.MinValue, ushort.MaxValue);
lrm.endpointServerPort = (ushort)Mathf.Clamp(EditorGUILayout.IntField("Endpoint Port", lrm.endpointServerPort), ushort.MinValue, ushort.MaxValue);
if (lrm.useLoadBalancer)
{
GUI.enabled = true;
}
lrm.authenticationKey = EditorGUILayout.TextField("LRM Auth Key", lrm.authenticationKey);
lrm.heartBeatInterval = EditorGUILayout.Slider("Heartbeat Time", lrm.heartBeatInterval, 0.1f, 5f);
lrm.connectOnAwake = EditorGUILayout.Toggle("Connect on Awake", lrm.connectOnAwake);
lrm.clientToServerTransport = (Transport)EditorGUILayout.ObjectField("LRM Transport", lrm.clientToServerTransport, typeof(Transport), true);
if (change.changed)
{
EditorUtility.SetDirty(lrm);
}
}
break;
case 1:
// NAT punch tab.

9
UnityProject/Assets/Mirror/Runtime/Transport/LRM/package.json Normal file
View file

@ -0,0 +1,9 @@
{
"name": "com.derek-r-s.lrm",
"version": "0.10.120",
"displayName": "Light-Reflective-Mirror",
"description": "Light Reflective Mirror is a transport for Mirror Networking which relays network traffic through your own servers.",
"unity": "2019.4",
"dependencies": {},
"keywords": []
}

7
UnityProject/Assets/Mirror/Runtime/Transport/LRM/package.json.meta Normal file
View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 09ee2ee51265449fea67160707630572
PackageManifestImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: