diff --git a/testproject/Assets/Prefabs/ConnectionModeButtons.prefab b/testproject/Assets/Prefabs/ConnectionModeButtons.prefab
index e73e194034..229420cd27 100644
--- a/testproject/Assets/Prefabs/ConnectionModeButtons.prefab
+++ b/testproject/Assets/Prefabs/ConnectionModeButtons.prefab
@@ -1,5 +1,335 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1075789769728122334
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1075789769728122333}
+ - component: {fileID: 1075789769728122331}
+ - component: {fileID: 1075789769728122332}
+ m_Layer: 5
+ m_Name: Placeholder
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1075789769728122333
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789769728122334}
+ 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: 1075789770412922202}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -0.5}
+ m_SizeDelta: {x: -20, y: -13}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1075789769728122331
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789769728122334}
+ m_CullTransparentMesh: 1
+--- !u!114 &1075789769728122332
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789769728122334}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 2
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Relay Join Code
+--- !u!1 &1075789770185154495
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1075789770185154494}
+ - component: {fileID: 1075789770185154492}
+ - component: {fileID: 1075789770185154493}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1075789770185154494
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770185154495}
+ 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: 1075789770412922202}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -0.5}
+ m_SizeDelta: {x: -20, y: -13}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1075789770185154492
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770185154495}
+ m_CullTransparentMesh: 1
+--- !u!114 &1075789770185154493
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770185154495}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 0
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!1 &1075789770412922203
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1075789770412922202}
+ - component: {fileID: 1075789770412922150}
+ - component: {fileID: 1075789770412922151}
+ - component: {fileID: 1075789770412922200}
+ - component: {fileID: 1075789770412922201}
+ m_Layer: 5
+ m_Name: InputField
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1075789770412922202
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770412922203}
+ 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:
+ - {fileID: 1075789769728122333}
+ - {fileID: 1075789770185154494}
+ m_Father: {fileID: 6633621479308595792}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -474, y: 263}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0, y: 1}
+--- !u!222 &1075789770412922150
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770412922203}
+ m_CullTransparentMesh: 1
+--- !u!114 &1075789770412922151
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770412922203}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1075789770412922200
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770412922203}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1075789770412922151}
+ m_TextComponent: {fileID: 1075789770185154493}
+ m_Placeholder: {fileID: 1075789769728122332}
+ m_ContentType: 0
+ m_InputType: 0
+ m_AsteriskChar: 42
+ m_KeyboardType: 0
+ m_LineType: 0
+ m_HideMobileInput: 0
+ m_CharacterValidation: 0
+ m_CharacterLimit: 0
+ m_OnEndEdit:
+ m_PersistentCalls:
+ m_Calls: []
+ m_OnSubmit:
+ m_PersistentCalls:
+ m_Calls: []
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1075789770412922201}
+ m_TargetAssemblyTypeName: RelayJoinCodeInput, TestProject
+ m_MethodName: SetJoinCode
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_CustomCaretColor: 0
+ m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+ m_Text:
+ m_CaretBlinkRate: 0.85
+ m_CaretWidth: 1
+ m_ReadOnly: 0
+ m_ShouldActivateOnSelect: 1
+--- !u!114 &1075789770412922201
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075789770412922203}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 903872102732f5c4cbdd3863de5dbc97, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ConnectionScript: {fileID: 4850072633501053442}
--- !u!1 &1249278213434350085
GameObject:
m_ObjectHideFlags: 0
@@ -153,8 +483,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4850072633501053442}
- m_TargetAssemblyTypeName: ConnectionModeScript, Assembly-CSharp
- m_MethodName: OnStartServer
+ m_TargetAssemblyTypeName: ConnectionModeScript, TestProject
+ m_MethodName: OnStartServerButton
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -286,8 +616,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4850072633501053442}
- m_TargetAssemblyTypeName: ConnectionModeScript, Assembly-CSharp
- m_MethodName: OnStartClient
+ m_TargetAssemblyTypeName: ConnectionModeScript, TestProject
+ m_MethodName: OnStartClientButton
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -498,8 +828,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4850072633501053442}
- m_TargetAssemblyTypeName: ConnectionModeScript, Assembly-CSharp
- m_MethodName: OnStartHost
+ m_TargetAssemblyTypeName: ConnectionModeScript, TestProject
+ m_MethodName: OnStartHostButton
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -863,6 +1193,7 @@ RectTransform:
m_Children:
- {fileID: 1265025556613751300}
- {fileID: 598016439257704092}
+ - {fileID: 1075789770412922202}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -885,6 +1216,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ConnectionModeButtons: {fileID: 6957137875088695540}
m_AuthenticationButtons: {fileID: 1249278213434350085}
+ m_JoinCodeInput: {fileID: 1075789770412922203}
+ m_MaxConnections: 10
+ m_RelayAllocationBasePath: https://relay-allocations-stg.services.api.unity.com
--- !u!1 &8777614647619606221
GameObject:
m_ObjectHideFlags: 0
diff --git a/testproject/Assets/Scenes/SampleScene.unity b/testproject/Assets/Scenes/SampleScene.unity
index 1d97bee118..ba450b9656 100644
--- a/testproject/Assets/Scenes/SampleScene.unity
+++ b/testproject/Assets/Scenes/SampleScene.unity
@@ -181,6 +181,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -219,18 +220,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 19899154}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &102484700 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 4850072633501053442, guid: d725b5588e1b956458798319e6541d84,
- type: 3}
- m_PrefabInstance: {fileID: 1928839749}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 50623966c8d88ab40982cc2b0e4c2d2e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &225870858
GameObject:
m_ObjectHideFlags: 0
@@ -275,85 +264,6 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &284590168
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 284590169}
- - component: {fileID: 284590171}
- - component: {fileID: 284590170}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &284590169
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 284590168}
- 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: 509741757}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -0.5}
- m_SizeDelta: {x: -20, y: -13}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &284590170
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 284590168}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 0
- m_AlignByGeometry: 0
- m_RichText: 0
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text:
---- !u!222 &284590171
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 284590168}
- m_CullTransparentMesh: 1
--- !u!1 &354062834
GameObject:
m_ObjectHideFlags: 0
@@ -530,6 +440,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -624,9 +535,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
- Authority: 0
- Channel: 10
+ SyncPositionX: 1
+ SyncPositionY: 1
+ SyncPositionZ: 1
+ SyncRotAngleX: 1
+ SyncRotAngleY: 1
+ SyncRotAngleZ: 1
+ SyncScaleX: 1
+ SyncScaleY: 1
+ SyncScaleZ: 1
+ PositionThreshold: 0
+ RotAngleThreshold: 0
+ ScaleThreshold: 0
InLocalSpace: 1
+ Interpolate: 1
FixedSendsPerSecond: 30
--- !u!1 &403665142
GameObject:
@@ -730,6 +652,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -768,175 +691,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 457860556}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &509741756
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 509741757}
- - component: {fileID: 509741761}
- - component: {fileID: 509741760}
- - component: {fileID: 509741759}
- - component: {fileID: 509741758}
- m_Layer: 5
- m_Name: InputField
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &509741757
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 509741756}
- 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:
- - {fileID: 900776506}
- - {fileID: 284590169}
- m_Father: {fileID: 1333567166}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 10, y: -10}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0, y: 1}
---- !u!114 &509741758
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 509741756}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 903872102732f5c4cbdd3863de5dbc97, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- ConnectionScript: {fileID: 102484700}
---- !u!114 &509741759
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 509741756}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 509741760}
- m_TextComponent: {fileID: 284590170}
- m_Placeholder: {fileID: 900776507}
- m_ContentType: 0
- m_InputType: 0
- m_AsteriskChar: 42
- m_KeyboardType: 0
- m_LineType: 0
- m_HideMobileInput: 0
- m_CharacterValidation: 0
- m_CharacterLimit: 0
- m_OnEndEdit:
- m_PersistentCalls:
- m_Calls: []
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 509741758}
- m_TargetAssemblyTypeName: RelayJoinCodeInput, TestProject
- m_MethodName: SetJoinCode
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
- m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_CustomCaretColor: 0
- m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
- m_Text:
- m_CaretBlinkRate: 0.85
- m_CaretWidth: 1
- m_ReadOnly: 0
- m_ShouldActivateOnSelect: 1
---- !u!114 &509741760
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 509741756}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &509741761
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 509741756}
- m_CullTransparentMesh: 1
--- !u!1 &535968794
GameObject:
m_ObjectHideFlags: 0
@@ -995,6 +749,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1114,12 +869,6 @@ MonoBehaviour:
ConnectAddress: 127.0.0.1
ConnectPort: 7777
ServerListenPort: 7777
- ServerWebsocketListenPort: 8887
- SupportWebsocket: 0
- Channels: []
- UseNetcodeRelay: 0
- NetcodeRelayAddress: 127.0.0.1
- NetcodeRelayPort: 8888
MessageSendMode: 0
--- !u!114 &620561611
MonoBehaviour:
@@ -1139,9 +888,6 @@ MonoBehaviour:
NetworkConfig:
ProtocolVersion: 0
NetworkTransport: {fileID: 620561613}
- RegisteredScenes:
- - SampleScene
- AllowRuntimeSceneChanges: 0
PlayerPrefab: {fileID: 8685790303553767886, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
type: 3}
NetworkPrefabs:
@@ -1151,10 +897,7 @@ MonoBehaviour:
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
- ReceiveTickrate: 64
- NetworkTickIntervalSec: 0.016
- MaxReceiveEventsPerTickRate: 500
- EventTickrate: 64
+ TickRate: 30
ClientConnectionBufferTimeout: 10
ConnectionApproval: 0
ConnectionData:
@@ -1198,6 +941,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ProtocolType: 1
m_MessageBufferSize: 1024
+ m_ReciveQueueSize: 128
+ m_SendQueueSize: 128
+ m_SendQueueBatchSize: 4096
m_ServerAddress: 127.0.0.1
m_ServerPort: 7777
--- !u!1001 &627808638
@@ -1979,6 +1725,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2017,85 +1764,12 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 878759701}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &900776505
+--- !u!1 &889928732 stripped
GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 900776506}
- - component: {fileID: 900776508}
- - component: {fileID: 900776507}
- m_Layer: 5
- m_Name: Placeholder
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &900776506
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 900776505}
- 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: 509741757}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -0.5}
- m_SizeDelta: {x: -20, y: -13}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &900776507
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 900776505}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 2
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 0
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: Relay Join Code
---- !u!222 &900776508
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 1075789770412922203, guid: d725b5588e1b956458798319e6541d84,
+ type: 3}
+ m_PrefabInstance: {fileID: 1928839749}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 900776505}
- m_CullTransparentMesh: 1
--- !u!1 &963826002
GameObject:
m_ObjectHideFlags: 0
@@ -2130,7 +1804,7 @@ Transform:
m_LocalScale: {x: 0.42366, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!114 &963826004
MonoBehaviour:
@@ -2156,9 +1830,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
- Authority: 0
- Channel: 10
+ SyncPositionX: 1
+ SyncPositionY: 1
+ SyncPositionZ: 1
+ SyncRotAngleX: 1
+ SyncRotAngleY: 1
+ SyncRotAngleZ: 1
+ SyncScaleX: 1
+ SyncScaleY: 1
+ SyncScaleZ: 1
+ PositionThreshold: 0
+ RotAngleThreshold: 0
+ ScaleThreshold: 0
InLocalSpace: 0
+ Interpolate: 1
FixedSendsPerSecond: 30
--- !u!114 &963826006
MonoBehaviour:
@@ -2200,6 +1885,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2281,7 +1967,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1237561005
GameObject:
@@ -2555,7 +2241,6 @@ RectTransform:
m_Children:
- {fileID: 627808639}
- {fileID: 1536251758}
- - {fileID: 509741757}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2593,7 +2278,7 @@ Transform:
m_Children:
- {fileID: 1475593094}
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1397037315
GameObject:
@@ -2643,9 +2328,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
- Authority: 2
- Channel: 10
+ SyncPositionX: 1
+ SyncPositionY: 1
+ SyncPositionZ: 1
+ SyncRotAngleX: 1
+ SyncRotAngleY: 1
+ SyncRotAngleZ: 1
+ SyncScaleX: 1
+ SyncScaleY: 1
+ SyncScaleZ: 1
+ PositionThreshold: 0
+ RotAngleThreshold: 0
+ ScaleThreshold: 0
InLocalSpace: 1
+ Interpolate: 1
FixedSendsPerSecond: 30
--- !u!114 &1397037319
MonoBehaviour:
@@ -2703,6 +2399,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2754,7 +2451,7 @@ Transform:
m_Children:
- {fileID: 772203958}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1398767341
GameObject:
@@ -2814,6 +2511,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -2900,9 +2598,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
- Authority: 1
- Channel: 10
+ SyncPositionX: 1
+ SyncPositionY: 1
+ SyncPositionZ: 1
+ SyncRotAngleX: 1
+ SyncRotAngleY: 1
+ SyncRotAngleZ: 1
+ SyncScaleX: 1
+ SyncScaleY: 1
+ SyncScaleZ: 1
+ PositionThreshold: 0
+ RotAngleThreshold: 0
+ ScaleThreshold: 0
InLocalSpace: 1
+ Interpolate: 1
FixedSendsPerSecond: 30
--- !u!114 &1402467446
MonoBehaviour:
@@ -2960,6 +2669,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3011,7 +2721,7 @@ Transform:
m_Children:
- {fileID: 1237561006}
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1463459130
GameObject:
@@ -3057,6 +2767,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3167,6 +2878,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3263,6 +2975,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3343,9 +3056,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
- Authority: 0
- Channel: 10
+ SyncPositionX: 1
+ SyncPositionY: 1
+ SyncPositionZ: 1
+ SyncRotAngleX: 1
+ SyncRotAngleY: 1
+ SyncRotAngleZ: 1
+ SyncScaleX: 1
+ SyncScaleY: 1
+ SyncScaleZ: 1
+ PositionThreshold: 0
+ RotAngleThreshold: 0
+ ScaleThreshold: 0
InLocalSpace: 0
+ Interpolate: 1
FixedSendsPerSecond: 30
--- !u!224 &1536251758 stripped
RectTransform:
@@ -3490,6 +3214,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -3602,7 +3327,7 @@ PrefabInstance:
type: 3}
propertyPath: m_JoinCodeInput
value:
- objectReference: {fileID: 509741756}
+ objectReference: {fileID: 889928732}
- target: {fileID: 4850072633501053442, guid: d725b5588e1b956458798319e6541d84,
type: 3}
propertyPath: m_RelayAllocationBasePath
@@ -3778,6 +3503,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
diff --git a/testproject/Assets/Scripts/ConnectionModeScript.cs b/testproject/Assets/Scripts/ConnectionModeScript.cs
index 965a351d9d..2b18f648a4 100644
--- a/testproject/Assets/Scripts/ConnectionModeScript.cs
+++ b/testproject/Assets/Scripts/ConnectionModeScript.cs
@@ -28,15 +28,13 @@ public class ConnectionModeScript : MonoBehaviour
private CommandLineProcessor m_CommandLineProcessor;
- private bool m_UsingRelay = false;
-
-#if ENABLE_RELAY_SERVICE
+ // Will be used for Relay support when it becomes available.
+ // TODO: Remove this comment once relay support is available.
[SerializeField]
private string m_RelayAllocationBasePath = "https://relay-allocations-stg.services.api.unity.com";
[HideInInspector]
public string RelayJoinCode { get; set; }
-#endif
internal void SetCommandLineHandler(CommandLineProcessor commandLineProcessor)
{
@@ -72,16 +70,29 @@ private IEnumerator WaitForNetworkManager()
yield return null;
}
+ ///
+ /// Check whether we are even using UnityTransport and
+ /// if so whether it is using the RelayUnityTransport
+ ///
+ private bool HasRelaySupport()
+ {
+ var unityTransport = NetworkManager.Singleton.GetComponent();
+ if (unityTransport != null && unityTransport.Protocol == UnityTransport.ProtocolType.RelayUnityTransport)
+ {
+ return true;
+ }
+ return false;
+ }
+
// Start is called before the first frame update
private void Start()
{
//If we have a NetworkManager instance and we are not listening and m_ConnectionModeButtons is not null then show the connection mode buttons
if (m_ConnectionModeButtons && m_AuthenticationButtons)
{
-#if ENABLE_RELAY_SERVICE
- if (NetworkManager.Singleton.GetComponent().Protocol == UnityTransport.ProtocolType.RelayUnityTransport)
+
+ if (HasRelaySupport())
{
- m_UsingRelay = true;
m_JoinCodeInput.SetActive(true);
//If Start() is called on the first frame update, it's not likely that the AuthenticationService is going to be instantiated yet
//Moved old logic for this out to OnServicesInitialized
@@ -89,8 +100,8 @@ private void Start()
m_AuthenticationButtons.SetActive(true);
}
else
-#endif
{
+
m_JoinCodeInput.SetActive(false);
m_AuthenticationButtons.SetActive(false);
m_ConnectionModeButtons.SetActive(NetworkManager.Singleton && !NetworkManager.Singleton.IsListening);
@@ -100,14 +111,12 @@ private void Start()
private void OnServicesInitialized()
{
-#if ENABLE_RELAY_SERVICE
- if (NetworkManager.Singleton.GetComponent().Protocol == UnityTransport.ProtocolType.RelayUnityTransport)
+ if (HasRelaySupport())
{
m_JoinCodeInput.SetActive(true);
m_ConnectionModeButtons.SetActive(false || AuthenticationService.Instance.IsSignedIn);
m_AuthenticationButtons.SetActive(NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && !AuthenticationService.Instance.IsSignedIn);
}
-#endif
}
///
@@ -117,7 +126,7 @@ public void OnStartServerButton()
{
if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
{
- if (m_UsingRelay)
+ if (HasRelaySupport())
{
StartCoroutine(StartRelayServer(StartServer));
}
@@ -176,7 +185,7 @@ public void OnStartHostButton()
{
if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
{
- if (m_UsingRelay)
+ if (HasRelaySupport())
{
StartCoroutine(StartRelayServer(StartHost));
}
@@ -201,11 +210,14 @@ public void OnStartClientButton()
{
if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
{
-#if ENABLE_RELAY_SERVICE
- StartCoroutine(StartRelayClient());
-#else
- StartClient();
-#endif
+ if (HasRelaySupport())
+ {
+ StartCoroutine(StartRelayClient());
+ }
+ else
+ {
+ StartClient();
+ }
}
}
@@ -252,12 +264,14 @@ private IEnumerator StartRelayClient()
#endif
}
+ // Will be used for Relay support when it becomes available.
+ // TODO: Remove this comment once relay support is available.
+#if ENABLE_RELAY_SERVICE
///
/// Handles authenticating UnityServices, needed for Relay
///
public async void OnSignIn()
{
-#if ENABLE_RELAY_SERVICE
await UnityServices.InitializeAsync();
OnServicesInitialized();
await AuthenticationService.Instance.SignInAnonymouslyAsync();
@@ -269,8 +283,8 @@ public async void OnSignIn()
m_ConnectionModeButtons.SetActive(true);
m_AuthenticationButtons.SetActive(false);
}
-#endif
}
+#endif
public void Reset()
{