added join code to the UI

This commit is contained in:
logzinga 2023-03-06 10:02:42 +11:00
parent 675e5bfb89
commit 3eb54c9c50
4 changed files with 318 additions and 61 deletions

View File

@ -116,7 +116,7 @@ Rigidbody:
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
m_CollisionDetection: 2
--- !u!114 &5037713273676016673
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -1324,6 +1324,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
joinTextCode: {fileID: 2023582112}
joinCodeText: {fileID: 1355554335}
--- !u!1 &619248189
GameObject:
m_ObjectHideFlags: 0
@ -3419,6 +3420,86 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223756953}
m_CullTransparentMesh: 1
--- !u!1 &1355554333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1355554334}
- component: {fileID: 1355554336}
- component: {fileID: 1355554335}
m_Layer: 5
m_Name: JoinCode
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1355554334
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355554333}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1732865424}
m_RootOrder: 1
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: -310.7, y: 157.8}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1355554335
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355554333}
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: 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_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: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!222 &1355554336
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1355554333}
m_CullTransparentMesh: 1
--- !u!1 &1685596311
GameObject:
m_ObjectHideFlags: 0
@ -3592,6 +3673,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 586010484}
- {fileID: 1355554334}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4109,6 +4191,177 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2023582110}
m_CullTransparentMesh: 1
--- !u!1 &2095660257
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2095660265}
- component: {fileID: 2095660264}
- component: {fileID: 2095660263}
- component: {fileID: 2095660262}
- component: {fileID: 2095660261}
- component: {fileID: 2095660260}
- component: {fileID: 2095660259}
- component: {fileID: 2095660258}
m_Layer: 0
m_Name: Wall (17)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2095660258
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 2803913564
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &2095660259
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f6c0be61502bb534f922ebb746851216, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2095660260
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
SyncRotAngleX: 1
SyncRotAngleY: 1
SyncRotAngleZ: 1
SyncScaleX: 0
SyncScaleY: 0
SyncScaleZ: 0
PositionThreshold: 0.001
RotAngleThreshold: 0.01
ScaleThreshold: 0.01
InLocalSpace: 0
Interpolate: 1
--- !u!54 &2095660261
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 2
--- !u!65 &2095660262
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &2095660263
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2095660264
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &2095660265
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2095660257}
m_LocalRotation: {x: -0, y: 0.99989885, z: -0, w: -0.014222753}
m_LocalPosition: {x: 17.03, y: 10.05, z: 6.3}
m_LocalScale: {x: 31.661625, y: 3.46528, z: 4.000864}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 181.63, z: 0}
--- !u!1 &2098125088
GameObject:
m_ObjectHideFlags: 0

View File

@ -43,6 +43,7 @@ public class ServerMenu : MonoBehaviour
NetworkManager.Singleton.StartHost();
joinCodeText.text = joinCode;
return joinCode;
} catch (RelayServiceException e) {
Debug.Log(e);
@ -52,6 +53,8 @@ public class ServerMenu : MonoBehaviour
public InputField joinTextCode;
public Text joinCodeText;
public void ServerJoinButton()
{
string joinCode = joinTextCode.text;
@ -70,6 +73,7 @@ public class ServerMenu : MonoBehaviour
NetworkManager.Singleton.StartClient();
return joinCode;
}
catch (RelayServiceException e)

View File

@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 978
m_ShowMode: 4
m_Title: Hierarchy
m_Title: Project
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 71
controlID: 3116
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@ -64,9 +64,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1466
x: 1419
y: 0
width: 454
width: 501
height: 928
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
@ -92,7 +92,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 363
width: 285
height: 550
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
@ -111,23 +111,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow
m_Name: ProjectBrowser
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 550
width: 1466
width: 1419
height: 378
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17}
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 12}
- {fileID: 17}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -218,12 +218,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1466
width: 1419
height: 928
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 72
controlID: 3117
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@ -243,12 +243,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1466
width: 1419
height: 550
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 73
controlID: 27
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@ -264,9 +264,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 363
x: 285
y: 0
width: 1103
width: 1134
height: 550
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@ -298,7 +298,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 638
width: 1465
width: 1418
height: 357
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -317,22 +317,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets
- Assets/Scripts
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Noble Connect
- Assets/Scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: /home/logan/HatGunner
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 9c640000
m_LastClickedID: 25756
m_ExpandedIDs: 000000008a660000
m_SelectedIDs: 54680000
m_LastClickedID: 26708
m_ExpandedIDs: 000000008a66000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -385,9 +385,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 8e660000
m_LastClickedInstanceID: 26254
m_HadKeyboardFocusLastEvent: 0
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
@ -436,9 +436,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1466
x: 1419
y: 88
width: 453
width: 500
height: 907
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -479,7 +479,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 88
width: 362
width: 284
height: 529
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -488,9 +488,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: cc650000
m_LastClickedID: 26060
m_ExpandedIDs: 38fbffffc0650000cc6500001e660000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: e881ffff3882ffff9483ffff9a83ffff4c85ffffa285fffffe86ffff0487ffff38fbffffc0650000cc6500001e660000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -534,9 +534,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 363
x: 285
y: 88
width: 1101
width: 1132
height: 529
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -767,14 +767,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
m_2DMode: 1
m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 568.29144, y: 257.84183, z: 3.0044832}
m_Target: {x: 5.374711, y: -18.373812, z: -16.373707}
speed: 2
m_Value: {x: 568.29144, y: 257.84183, z: 3.0044832}
m_Value: {x: 5.374711, y: -18.373812, z: -16.373707}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -803,17 +803,17 @@ MonoBehaviour:
m_Size: {x: 0, y: 0}
yGrid:
m_Fade:
m_Target: 0
m_Target: 1
speed: 2
m_Value: 0
m_Value: 1
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
zGrid:
m_Fade:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
@ -821,17 +821,17 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0, y: 0, z: 0, w: 1}
m_Target: {x: -0.005227073, y: -0.95514464, z: 0.29578322, w: -0.016546505}
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Value: {x: -0.0052268375, y: -0.9551016, z: 0.2957699, w: -0.01654576}
m_Size:
m_Target: 374.20465
m_Target: 25.51966
speed: 2
m_Value: 374.20465
m_Value: 25.51966
m_Ortho:
m_Target: 1
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_CameraSettings:
m_Speed: 1
m_SpeedNormalized: 0.5
@ -872,9 +872,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 363
x: 285
y: 88
width: 1101
width: 1132
height: 529
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@ -886,7 +886,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1101, y: 508}
m_TargetSize: {x: 1132, y: 508}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@ -901,8 +901,8 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -550.5
m_HBaseRangeMax: 550.5
m_HBaseRangeMin: -566
m_HBaseRangeMax: 566
m_VBaseRangeMin: -254
m_VBaseRangeMax: 254
m_HAllowExceedBaseRangeMin: 1
@ -922,23 +922,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1101
width: 1132
height: 508
m_Scale: {x: 1, y: 1}
m_Translation: {x: 550.5, y: 254}
m_Translation: {x: 566, y: 254}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -550.5
x: -566
y: -254
width: 1101
width: 1132
height: 508
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1101, y: 529}
m_LastWindowPixelSize: {x: 1132, y: 529}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@ -966,7 +966,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 638
width: 1465
width: 1418
height: 357
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: