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

ignorance inspector

Browse source
This commit is contained in:
cxxpxr 2021-08-27 04:42:10 -04:00
parent 6d25fc0022
commit dc82be7a33
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,9 +181,16 @@ namespace LightReflectiveMirror
foreach (var transport in supportedTransports) foreach (var transport in supportedTransports)
{ {
if (lrm.useNATPunch && transport != typeof(KcpTransport)) #if !IGNORANCE
if (lrm.useNATPunch && (transport != typeof(KcpTransport)))
continue; continue;
#else
bool isSupported = transport == typeof(KcpTransport) ||
transport == typeof(IgnoranceTransport.Ignorance);
if (lrm.useNATPunch && !isSupported)
continue;
#endif
if (GUILayout.Button(transport.Name)) if (GUILayout.Button(transport.Name))
{ {
var newTransportGO = new GameObject("LRM - Direct Connect"); var newTransportGO = new GameObject("LRM - Direct Connect");
@ -257,9 +264,18 @@ namespace LightReflectiveMirror
} }
else else
{ {
#if !IGNORANCE
if (!(directModule.directConnectTransport is KcpTransport)) if (!(directModule.directConnectTransport is KcpTransport))
{ {
EditorGUILayout.HelpBox("NAT Punch only supports KCP currently.", MessageType.Info); EditorGUILayout.HelpBox("NAT Punch only supports KCP currently.", MessageType.Info);
#else
bool isSupported = (directModule.directConnectTransport is KcpTransport) ||
(directModule.directConnectTransport is IgnoranceTransport.Ignorance);
if (!isSupported)
{
EditorGUILayout.HelpBox("NAT Punch only supports KCP and Ignorance currently.", MessageType.Info);
#endif
GUI.enabled = false; GUI.enabled = false;
lrm.useNATPunch = false; lrm.useNATPunch = false;
} }

4
UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs
View file

@ -75,7 +75,7 @@ public class LRMDirectConnectModule : MonoBehaviour
#else #else
if (directConnectTransport is kcp2k.KcpTransport kcpTransport) if (directConnectTransport is kcp2k.KcpTransport kcpTransport)
kcpTransport.Port = (ushort)port; kcpTransport.Port = (ushort)port;
if (directConnectTransport is IgnoranceTransport.Ignorance ignorance) else if (directConnectTransport is IgnoranceTransport.Ignorance ignorance)
ignorance.port = (ushort)port; ignorance.port = (ushort)port;
else else
{ {
@ -97,7 +97,7 @@ public class LRMDirectConnectModule : MonoBehaviour
#else #else
if (directConnectTransport is kcp2k.KcpTransport kcpTransport) if (directConnectTransport is kcp2k.KcpTransport kcpTransport)
return kcpTransport.Port; return kcpTransport.Port;
if (directConnectTransport is IgnoranceTransport.Ignorance ignorance) else if (directConnectTransport is IgnoranceTransport.Ignorance ignorance)
return ignorance.port; return ignorance.port;
else else
{ {