From dc82be7a33f1fdac819d38707cda7e4ca677912d Mon Sep 17 00:00:00 2001 From: cxxpxr <60411087+cxxpxr@users.noreply.github.com> Date: Fri, 27 Aug 2021 04:42:10 -0400 Subject: [PATCH] ignorance inspector --- .../Transport/LRM/Editor/LRMInspector.cs | 18 +++++++++++++++++- .../Transport/LRM/LRMDirectConnectModule.cs | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/Editor/LRMInspector.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/Editor/LRMInspector.cs index cc0381e..e9a515e 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/Editor/LRMInspector.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/Editor/LRMInspector.cs @@ -181,9 +181,16 @@ namespace LightReflectiveMirror foreach (var transport in supportedTransports) { - if (lrm.useNATPunch && transport != typeof(KcpTransport)) +#if !IGNORANCE + if (lrm.useNATPunch && (transport != typeof(KcpTransport))) continue; +#else + bool isSupported = transport == typeof(KcpTransport) || + transport == typeof(IgnoranceTransport.Ignorance); + if (lrm.useNATPunch && !isSupported) + continue; +#endif if (GUILayout.Button(transport.Name)) { var newTransportGO = new GameObject("LRM - Direct Connect"); @@ -257,9 +264,18 @@ namespace LightReflectiveMirror } else { +#if !IGNORANCE if (!(directModule.directConnectTransport is KcpTransport)) { 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; lrm.useNATPunch = false; } diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs index bb8fcca..e89fbe3 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs @@ -75,7 +75,7 @@ public class LRMDirectConnectModule : MonoBehaviour #else if (directConnectTransport is kcp2k.KcpTransport kcpTransport) kcpTransport.Port = (ushort)port; - if (directConnectTransport is IgnoranceTransport.Ignorance ignorance) + else if (directConnectTransport is IgnoranceTransport.Ignorance ignorance) ignorance.port = (ushort)port; else { @@ -97,7 +97,7 @@ public class LRMDirectConnectModule : MonoBehaviour #else if (directConnectTransport is kcp2k.KcpTransport kcpTransport) return kcpTransport.Port; - if (directConnectTransport is IgnoranceTransport.Ignorance ignorance) + else if (directConnectTransport is IgnoranceTransport.Ignorance ignorance) return ignorance.port; else {