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

QoL improvements for NAT Punch tab of inspector.

Browse source
This commit is contained in:
Derek S 2021-04-10 01:04:36 -05:00
parent f5269a837a
commit 42434042c6
2 changed files with 136 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

291
UnityProject/Assets/LRMTestScene.unity
View file

@ -195,59 +195,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 45, y: 180, z: 0} m_LocalEulerAnglesHint: {x: 45, y: 180, z: 0}
--- !u!1 &126344731
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 126344733}
- component: {fileID: 126344732}
m_Layer: 0
m_Name: LRM - Direct Connect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &126344732
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 126344731}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 7777
NoDelay: 1
Interval: 10
FastResend: 2
CongestionWindow: 0
SendWindowSize: 4096
ReceiveWindowSize: 4096
debugLog: 0
statisticsGUI: 0
statisticsLog: 0
--- !u!4 &126344733
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 126344731}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1282001518}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &171810013 --- !u!1 &171810013
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -421,59 +368,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3} m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &300300549
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 300300551}
- component: {fileID: 300300550}
m_Layer: 0
m_Name: LRM - Connector
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &300300550
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 300300549}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 7777
NoDelay: 1
Interval: 10
FastResend: 2
CongestionWindow: 0
SendWindowSize: 4096
ReceiveWindowSize: 4096
debugLog: 0
statisticsGUI: 0
statisticsLog: 0
--- !u!4 &300300551
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 300300549}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1282001518}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &535739935 --- !u!1 &535739935
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1180,6 +1074,112 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20} m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1226094907
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1226094909}
- component: {fileID: 1226094908}
m_Layer: 0
m_Name: LRM - Direct Connect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1226094908
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1226094907}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 7777
NoDelay: 1
Interval: 10
FastResend: 2
CongestionWindow: 0
SendWindowSize: 4096
ReceiveWindowSize: 4096
debugLog: 0
statisticsGUI: 0
statisticsLog: 0
--- !u!4 &1226094909
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1226094907}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1282001518}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1230990396
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1230990398}
- component: {fileID: 1230990397}
m_Layer: 0
m_Name: LRM - Connector
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1230990397
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230990396}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 7777
NoDelay: 1
Interval: 10
FastResend: 2
CongestionWindow: 0
SendWindowSize: 4096
ReceiveWindowSize: 4096
debugLog: 0
statisticsGUI: 0
statisticsLog: 0
--- !u!4 &1230990398
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230990396}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1282001518}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1282001517 --- !u!1 &1282001517
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1191,6 +1191,7 @@ GameObject:
- component: {fileID: 1282001518} - component: {fileID: 1282001518}
- component: {fileID: 1282001520} - component: {fileID: 1282001520}
- component: {fileID: 1282001519} - component: {fileID: 1282001519}
- component: {fileID: 1282001522}
- component: {fileID: 1282001521} - component: {fileID: 1282001521}
m_Layer: 0 m_Layer: 0
m_Name: NetworkManager m_Name: NetworkManager
@ -1210,9 +1211,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1884364513} - {fileID: 1230990398}
- {fileID: 126344733} - {fileID: 1226094909}
- {fileID: 300300551}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1252,7 +1252,7 @@ MonoBehaviour:
serverBatchInterval: 0 serverBatchInterval: 0
offlineScene: offlineScene:
onlineScene: onlineScene:
transport: {fileID: 0} transport: {fileID: 1282001522}
networkAddress: localhost networkAddress: localhost
maxConnections: 100 maxConnections: 100
disconnectInactiveConnections: 0 disconnectInactiveConnections: 0
@ -1265,6 +1265,20 @@ MonoBehaviour:
spawnPrefabs: spawnPrefabs:
- {fileID: 5890560936853567077, guid: b7dd46dbf38c643f09e206f9fa4be008, type: 3} - {fileID: 5890560936853567077, guid: b7dd46dbf38c643f09e206f9fa4be008, type: 3}
--- !u!114 &1282001521 --- !u!114 &1282001521
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1282001517}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c4cbff877abc42448dd829920c6c233, type: 3}
m_Name:
m_EditorClassIdentifier:
directConnectTransport: {fileID: 1226094908}
showDebugLogs: 0
--- !u!114 &1282001522
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -1276,7 +1290,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7064b1b1d0671194baf55fa8d5f564d6, type: 3} m_Script: {fileID: 11500000, guid: 7064b1b1d0671194baf55fa8d5f564d6, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
clientToServerTransport: {fileID: 300300550} clientToServerTransport: {fileID: 1230990397}
serverIP: 172.105.109.117 serverIP: 172.105.109.117
endpointServerPort: 8080 endpointServerPort: 8080
heartBeatInterval: 3 heartBeatInterval: 3
@ -1285,7 +1299,7 @@ MonoBehaviour:
diconnectedFromRelay: diconnectedFromRelay:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
useNATPunch: 0 useNATPunch: 1
NATPunchtroughPort: 1 NATPunchtroughPort: 1
useLoadBalancer: 0 useLoadBalancer: 0
loadBalancerPort: 7070 loadBalancerPort: 7070
@ -1549,59 +1563,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1862319967} m_GameObject: {fileID: 1862319967}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &1884364511
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1884364513}
- component: {fileID: 1884364512}
m_Layer: 0
m_Name: LRM - Connector
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1884364512
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1884364511}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
Port: 7777
NoDelay: 1
Interval: 10
FastResend: 2
CongestionWindow: 0
SendWindowSize: 4096
ReceiveWindowSize: 4096
debugLog: 0
statisticsGUI: 0
statisticsLog: 0
--- !u!4 &1884364513
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1884364511}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1282001518}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1933302368 --- !u!1 &1933302368
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -45,6 +45,7 @@ namespace LightReflectiveMirror
{ {
usingLLB = true; usingLLB = true;
lrm.loadBalancerAddress = "127.0.0.1"; lrm.loadBalancerAddress = "127.0.0.1";
serverPort = 7070;
} }
if (GUILayout.Button("Single LRM Node Setup")) if (GUILayout.Button("Single LRM Node Setup"))
@ -218,7 +219,7 @@ namespace LightReflectiveMirror
currentTab = GUILayout.Toolbar(currentTab, tabs); currentTab = GUILayout.Toolbar(currentTab, tabs);
EditorGUILayout.Space(); EditorGUILayout.Space();
EditorGUILayout.BeginVertical("Box"); EditorGUILayout.BeginVertical("Window");
switch (currentTab) switch (currentTab)
{ {
case 0: case 0:
@ -251,7 +252,15 @@ namespace LightReflectiveMirror
} }
else else
{ {
if (!(directModule.directConnectTransport is KcpTransport))
{
EditorGUILayout.HelpBox("NAT Punch only supports KCP currently.", MessageType.Info);
GUI.enabled = false;
lrm.useNATPunch = false;
}
lrm.useNATPunch = EditorGUILayout.Toggle("Use NAT Punch", lrm.useNATPunch); lrm.useNATPunch = EditorGUILayout.Toggle("Use NAT Punch", lrm.useNATPunch);
GUI.enabled = true;
directModule.directConnectTransport = (Transport)EditorGUILayout.ObjectField("Direct Transport", directModule.directConnectTransport, typeof(Transport), true); directModule.directConnectTransport = (Transport)EditorGUILayout.ObjectField("Direct Transport", directModule.directConnectTransport, typeof(Transport), true);
} }
break; break;