From c56f1d4a491a9447b0274f10729831c37b5808c2 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Sun, 28 Nov 2021 20:20:11 +0100 Subject: [PATCH] added Ready, NameChange, LobbyTitleChange Added the function "AuthHost" (lobby.cs) )which can be used to check if the request comes from a host --- Assets/Prefabs/NetManager.prefab | 72 +- Assets/Prefabs/Player/LobbyPlayer.prefab | 358 +++++++++- Assets/Prefabs/VariableSaver.prefab | 47 ++ Assets/Prefabs/VariableSaver.prefab.meta | 7 + Assets/Scenes/HomeScene.unity | 129 +++- Assets/Scenes/Lobby.unity | 679 ++++++++++++++++--- Assets/Scripts/HomeMenu/Lobby/Lobby.cs | 35 +- Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs | 59 +- Assets/Scripts/HomeMenu/MenuStartClient.cs | 14 +- Assets/Scripts/HomeMenu/MenuStartHost.cs | 10 +- Assets/Scripts/VariableSaver.cs | 11 + Assets/Scripts/VariableSaver.cs.meta | 11 + Packages/packages-lock.json | 2 +- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/TagManager.asset | 5 + UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2021.dwlt | 184 ++--- 17 files changed, 1342 insertions(+), 289 deletions(-) create mode 100644 Assets/Prefabs/VariableSaver.prefab create mode 100644 Assets/Prefabs/VariableSaver.prefab.meta create mode 100644 Assets/Scripts/VariableSaver.cs create mode 100644 Assets/Scripts/VariableSaver.cs.meta diff --git a/Assets/Prefabs/NetManager.prefab b/Assets/Prefabs/NetManager.prefab index 2891e9a..553515b 100644 --- a/Assets/Prefabs/NetManager.prefab +++ b/Assets/Prefabs/NetManager.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2504770964117222970 +--- !u!1 &7086846156459211638 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,23 +8,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2504770964117222917} - - component: {fileID: 2504770964117222916} - - component: {fileID: 2504770964117222971} + - component: {fileID: 7086846156459211593} + - component: {fileID: 7086846156459211639} + - component: {fileID: 8462299686178468946} m_Layer: 0 m_Name: NetManager - m_TagString: Untagged + m_TagString: NetManager m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2504770964117222917 +--- !u!4 &7086846156459211593 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2504770964117222970} + m_GameObject: {fileID: 7086846156459211638} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 354.46393, y: 179.54048, z: -5.4055643} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,40 +33,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2504770964117222916 +--- !u!114 &7086846156459211639 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2504770964117222970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 145706024aa7ca34b9312d85f68fc209, type: 3} - m_Name: - m_EditorClassIdentifier: - dontDestroyOnLoad: 1 - PersistNetworkManagerToOfflineScene: 0 - runInBackground: 1 - autoStartServerBuild: 1 - serverTickRate: 30 - offlineScene: Assets/Scenes/HomeScene.unity - onlineScene: Assets/Scenes/Lobby.unity - transport: {fileID: 2504770964117222971} - networkAddress: localhost - maxConnections: 100 - authenticator: {fileID: 0} - playerPrefab: {fileID: 5433024255890593569, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - autoCreatePlayer: 1 - playerSpawnMethod: 0 - spawnPrefabs: [] ---- !u!114 &2504770964117222971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2504770964117222970} + m_GameObject: {fileID: 7086846156459211638} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} @@ -85,3 +58,30 @@ MonoBehaviour: debugLog: 0 statisticsGUI: 0 statisticsLog: 0 +--- !u!114 &8462299686178468946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7086846156459211638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3} + m_Name: + m_EditorClassIdentifier: + dontDestroyOnLoad: 1 + PersistNetworkManagerToOfflineScene: 0 + runInBackground: 1 + autoStartServerBuild: 1 + serverTickRate: 30 + offlineScene: Assets/Scenes/HomeScene.unity + onlineScene: Assets/Scenes/Lobby.unity + transport: {fileID: 7086846156459211639} + networkAddress: localhost + maxConnections: 100 + authenticator: {fileID: 0} + playerPrefab: {fileID: 9010945563893975427, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} + autoCreatePlayer: 1 + playerSpawnMethod: 0 + spawnPrefabs: [] diff --git a/Assets/Prefabs/Player/LobbyPlayer.prefab b/Assets/Prefabs/Player/LobbyPlayer.prefab index 9a01c08..fb938e4 100644 --- a/Assets/Prefabs/Player/LobbyPlayer.prefab +++ b/Assets/Prefabs/Player/LobbyPlayer.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5433024255890593569 +--- !u!1 &494624751549720714 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,10 +8,282 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 721738633423542023} - - component: {fileID: 8445863620830884911} - - component: {fileID: 2783342664697629268} - - component: {fileID: 5144927127391288211} + - component: {fileID: 6750575182086368650} + - component: {fileID: 4753069323318117137} + - component: {fileID: 5389031206522201274} + m_Layer: 5 + m_Name: Username + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6750575182086368650 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494624751549720714} + 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: 9010945563893975453} + m_RootOrder: 0 + 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: 5.2387, y: 0.00009346} + m_SizeDelta: {x: 189.52, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4753069323318117137 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494624751549720714} + m_CullTransparentMesh: 1 +--- !u!114 &5389031206522201274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494624751549720714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Username + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 15 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8974039884308211525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3456907609101338979} + - component: {fileID: 35600547831869191} + - component: {fileID: 1402728989962887689} + m_Layer: 5 + m_Name: ReadyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3456907609101338979 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974039884308211525} + 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: 9010945563893975453} + 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: 44.66983, y: -0.94048} + m_SizeDelta: {x: 89.3396, y: 33.119} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &35600547831869191 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974039884308211525} + m_CullTransparentMesh: 1 +--- !u!114 &1402728989962887689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974039884308211525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Not Ready + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 12 + m_fontSizeBase: 12 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9010945563893975427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9010945563893975453} + - component: {fileID: 9010945563893975426} + - component: {fileID: 9010945563893975454} + - component: {fileID: 9010945563893975449} + - component: {fileID: -1177971783685519829} + - component: {fileID: -4147287593466185180} m_Layer: 5 m_Name: LobbyPlayer m_TagString: Untagged @@ -19,41 +291,43 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &721738633423542023 +--- !u!224 &9010945563893975453 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5433024255890593569} + m_GameObject: {fileID: 9010945563893975427} 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_Children: + - {fileID: 6750575182086368650} + - {fileID: 3456907609101338979} m_Father: {fileID: 0} 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: 135} - m_SizeDelta: {x: 0, y: -281.3138} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 35} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8445863620830884911 +--- !u!222 &9010945563893975426 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5433024255890593569} + m_GameObject: {fileID: 9010945563893975427} m_CullTransparentMesh: 1 ---- !u!114 &2783342664697629268 +--- !u!114 &9010945563893975454 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5433024255890593569} + m_GameObject: {fileID: 9010945563893975427} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -77,13 +351,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5144927127391288211 +--- !u!114 &9010945563893975449 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5433024255890593569} + m_GameObject: {fileID: 9010945563893975427} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} @@ -94,3 +368,51 @@ MonoBehaviour: visible: 0 m_AssetId: fc0476cecf5ea1047aeb1f4981bfc16f hasSpawned: 0 +--- !u!114 &-1177971783685519829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9010945563893975427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6947f097045a71a499212176b7475daf, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + rdyBtn: {fileID: 0} + usernameText: {fileID: 5389031206522201274} + rdyText: {fileID: 1402728989962887689} + username: + ready: 0 +--- !u!114 &-4147287593466185180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9010945563893975427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + clientAuthority: 0 + sendInterval: 0.05 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + showGizmos: 0 + showOverlay: 0 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} diff --git a/Assets/Prefabs/VariableSaver.prefab b/Assets/Prefabs/VariableSaver.prefab new file mode 100644 index 0000000..5ba13a2 --- /dev/null +++ b/Assets/Prefabs/VariableSaver.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7631475222009660907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7631475222009660906} + - component: {fileID: 904614521450498635} + m_Layer: 0 + m_Name: VariableSaver + m_TagString: VariableSaver + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7631475222009660906 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7631475222009660907} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 469.40167, y: 260.95886, z: 4.045637} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &904614521450498635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7631475222009660907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57fc6cd6aec47d54a8d9dc70e91de8d1, type: 3} + m_Name: + m_EditorClassIdentifier: + username: diff --git a/Assets/Prefabs/VariableSaver.prefab.meta b/Assets/Prefabs/VariableSaver.prefab.meta new file mode 100644 index 0000000..31cc139 --- /dev/null +++ b/Assets/Prefabs/VariableSaver.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 05731c1ab7f50df438d8ad4231f0e4e5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/HomeScene.unity b/Assets/Scenes/HomeScene.unity index cdaab10..efb833a 100644 --- a/Assets/Scenes/HomeScene.unity +++ b/Assets/Scenes/HomeScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -773,7 +773,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &858665539 PrefabInstance: @@ -1147,7 +1147,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &979232035 stripped RectTransform: @@ -1408,7 +1408,7 @@ RectTransform: m_Children: - {fileID: 1535827566} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1480,7 +1480,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1209917631 PrefabInstance: @@ -2174,6 +2174,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8580211107013450537, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} m_PrefabInstance: {fileID: 1982041348} m_PrefabAsset: {fileID: 0} +--- !u!114 &1797400608 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 163137781302496742, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} + m_PrefabInstance: {fileID: 38874694} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1813956223 GameObject: m_ObjectHideFlags: 0 @@ -2408,6 +2419,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8580211107013450537, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} m_PrefabInstance: {fileID: 1209917631} m_PrefabAsset: {fileID: 0} +--- !u!114 &1955114751 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 163137781302496742, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} + m_PrefabInstance: {fileID: 1209917631} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1960138656 GameObject: m_ObjectHideFlags: 0 @@ -2766,6 +2788,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IpInput: {fileID: 979232037} + UsernameInput: {fileID: 1955114751} --- !u!1 &2030526436 stripped GameObject: m_CorrespondingSourceObject: {fileID: 759482234963316101, guid: a973691757099224ca132b32daabf67c, type: 3} @@ -2783,6 +2806,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba11870b778d63f44b93c88ab9ee53e2, type: 3} m_Name: m_EditorClassIdentifier: + UsernameInput: {fileID: 1797400608} --- !u!1001 &2087597532 PrefabInstance: m_ObjectHideFlags: 0 @@ -3154,60 +3178,127 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} ---- !u!1001 &2504770963688188196 +--- !u!1001 &7086846158179689576 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: -802718431767115137, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + propertyPath: sceneId + value: 1165708651 + objectReference: {fileID: 0} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalPosition.x value: 354.46393 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalPosition.y value: 179.54048 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalPosition.z value: -5.4055643 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222917, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211593, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2504770964117222970, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} + - target: {fileID: 7086846156459211638, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} propertyPath: m_Name value: NetManager objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} + - {fileID: -802718431767115137, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0f6d9d1e97686d34d9872b5028512de5, type: 3} +--- !u!1001 &7631475220867830191 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 812996639148968459, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: sceneId + value: 1313060343 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalPosition.x + value: 469.40167 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalPosition.y + value: 260.95886 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalPosition.z + value: 4.045637 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660906, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631475222009660907, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} + propertyPath: m_Name + value: VariableSaver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05731c1ab7f50df438d8ad4231f0e4e5, type: 3} diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 88125ea..1337c06 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -238,6 +238,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &251905562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 251905563} + - component: {fileID: 251905565} + - component: {fileID: 251905564} + m_Layer: 5 + m_Name: Panel (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &251905563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251905562} + 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: 527711836} + 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: 193.2, y: -36.946} + m_SizeDelta: {x: 192.8636, y: 342.9526} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &251905564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251905562} + 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: 0.392} + 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: 10907, 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 &251905565 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251905562} + m_CullTransparentMesh: 1 --- !u!1 &338048061 GameObject: m_ObjectHideFlags: 0 @@ -545,9 +621,10 @@ GameObject: - component: {fileID: 506194853} - component: {fileID: 506194855} - component: {fileID: 506194854} + - component: {fileID: 506194856} m_Layer: 5 m_Name: Team1Panel - m_TagString: Untagged + m_TagString: Team1 m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -563,8 +640,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3849186633239573056} + m_Children: [] m_Father: {fileID: 1335086799} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -611,6 +687,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506194852} m_CullTransparentMesh: 1 +--- !u!114 &506194856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506194852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &527711835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 527711836} + - component: {fileID: 527711838} + - component: {fileID: 527711837} + m_Layer: 5 + m_Name: SelectTeam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &527711836 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527711835} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.021752, y: 1.021752, z: 1.021752} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1075817827} + - {fileID: 1009884108} + - {fileID: 251905563} + - {fileID: 1891671923} + m_Father: {fileID: 1511280966} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &527711837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527711835} + 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: 0.17254902, g: 0.18431373, b: 0.2, 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: 10907, 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 &527711838 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527711835} + m_CullTransparentMesh: 1 --- !u!1001 &594583493 PrefabInstance: m_ObjectHideFlags: 0 @@ -620,7 +802,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 759482234963316101, guid: a973691757099224ca132b32daabf67c, type: 3} propertyPath: m_Name - value: MenuBtn + value: ReadyButton objectReference: {fileID: 0} - target: {fileID: 1513820883277351791, guid: a973691757099224ca132b32daabf67c, type: 3} propertyPath: m_text @@ -722,6 +904,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6292287315077470204, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6292287315077470204, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6292287315077470204, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a973691757099224ca132b32daabf67c, type: 3} --- !u!224 &594583494 stripped @@ -805,6 +999,217 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 836383290} m_CullTransparentMesh: 1 +--- !u!1 &1009884107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1009884108} + - component: {fileID: 1009884110} + - component: {fileID: 1009884109} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1009884108 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009884107} + 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: 527711836} + 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: -163.9, y: -36.94628} + m_SizeDelta: {x: 192.8636, y: 342.9526} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1009884109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009884107} + 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: 0.392} + 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: 10907, 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 &1009884110 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009884107} + m_CullTransparentMesh: 1 +--- !u!1 &1075817826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1075817827} + - component: {fileID: 1075817829} + - component: {fileID: 1075817828} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1075817827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075817826} + 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: 527711836} + m_RootOrder: 0 + 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: -1.4681, y: 219.1} + m_SizeDelta: {x: 700, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1075817828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075817826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Select A Team + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 17 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1075817829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075817826} + m_CullTransparentMesh: 1 --- !u!224 &1253593180 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} @@ -822,7 +1227,7 @@ GameObject: - component: {fileID: 1335086801} - component: {fileID: 1335086800} m_Layer: 5 - m_Name: Panel + m_Name: Main m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1016,6 +1421,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1335086799} + - {fileID: 527711836} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1188,6 +1594,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1891671923 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + m_PrefabInstance: {fileID: 1921353392} + m_PrefabAsset: {fileID: 0} --- !u!1 &1907881003 GameObject: m_ObjectHideFlags: 0 @@ -1264,6 +1675,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1907881003} m_CullTransparentMesh: 1 +--- !u!1001 &1921353392 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 527711836} + m_Modifications: + - target: {fileID: 759482234963316101, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_Name + value: QuitBtn + objectReference: {fileID: 0} + - target: {fileID: 1513820883277351791, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_text + value: Quit + objectReference: {fileID: 0} + - target: {fileID: 1513820883277351791, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 1513820883277351791, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_fontSizeBase + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_SizeDelta.x + value: 99.674 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_SizeDelta.y + value: 28.978 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalScale.x + value: 0.978711 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalScale.y + value: 0.978711 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalScale.z + value: 0.978711 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_AnchoredPosition.x + value: -263.808 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 156.18 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4846970278929914545, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_Color.b + value: 0.04084658 + objectReference: {fileID: 0} + - target: {fileID: 4846970278929914545, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_Color.g + value: 0.031372547 + objectReference: {fileID: 0} + - target: {fileID: 4846970278929914545, guid: a973691757099224ca132b32daabf67c, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a973691757099224ca132b32daabf67c, type: 3} --- !u!1 &1990995212 GameObject: m_ObjectHideFlags: 0 @@ -1274,6 +1818,7 @@ GameObject: m_Component: - component: {fileID: 1990995213} - component: {fileID: 1990995214} + - component: {fileID: 1990995215} m_Layer: 0 m_Name: LobbyManager m_TagString: Untagged @@ -1308,110 +1853,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b6183dbb3c561ed44803ffda1c859dc9, type: 3} m_Name: m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 LobbyPlayers: [] ---- !u!1001 &3849186633239573055 -PrefabInstance: + lobbyTitle: +--- !u!114 &1990995215 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 506194853} - m_Modifications: - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_SizeDelta.y - value: -281.3138 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_AnchoredPosition.y - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5144927127391288211, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: sceneId - value: 2772255242 - objectReference: {fileID: 0} - - target: {fileID: 5433024255890593569, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - propertyPath: m_Name - value: LobbyPlayer - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} ---- !u!224 &3849186633239573056 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 721738633423542023, guid: fc0476cecf5ea1047aeb1f4981bfc16f, type: 3} - m_PrefabInstance: {fileID: 3849186633239573055} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990995212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 2342159728 + serverOnly: 0 + visible: 0 + m_AssetId: + hasSpawned: 0 diff --git a/Assets/Scripts/HomeMenu/Lobby/Lobby.cs b/Assets/Scripts/HomeMenu/Lobby/Lobby.cs index f47c28d..83235a9 100644 --- a/Assets/Scripts/HomeMenu/Lobby/Lobby.cs +++ b/Assets/Scripts/HomeMenu/Lobby/Lobby.cs @@ -1,9 +1,40 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - -public class Lobby : MonoBehaviour +using Mirror; +using TMPro; +public class Lobby : NetworkBehaviour { [SerializeField] public List LobbyPlayers = new List(); + + [SyncVar(hook = "ChangeTitle")] + [SerializeField] private string lobbyTitle; + + public bool AuthHost(LobbyPlayer player) + { + if(LobbyPlayers.IndexOf(player) == 0) + { + return true; + } + return false; + } + + public void SetTitle(LobbyPlayer player, string text) + { + if (AuthHost(player)) + { + lobbyTitle = text; + } + } + + public void RegisterPlayer(LobbyPlayer player) + { + LobbyPlayers.Add(player); + } + + public void ChangeTitle(string oldTitle, string newTitle) + { + GameObject.Find("title").GetComponent().text = newTitle; + } } diff --git a/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs index 6cd1f2d..32677ff 100644 --- a/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs +++ b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs @@ -1,12 +1,69 @@ using Mirror; using UnityEngine; +using TMPro; +using UnityEngine.UI; public class LobbyPlayer : NetworkBehaviour { - private Lobby lobby = this.gameobject.getComponent(); + [SerializeField] private Button rdyBtn; + [SerializeField] private TextMeshProUGUI usernameText; + [SerializeField] private TextMeshProUGUI rdyText; + + [SyncVar(hook = "DisplayPlayerName")] + [SerializeField] public string username; + + [SyncVar(hook = "ChangeReadyState")] + [SerializeField] bool ready = false; + + Lobby lobby; public override void OnStartClient() { + lobby = GameObject.Find("LobbyManager").GetComponent(); + lobby.RegisterPlayer(this); + gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team1").transform; } + public void Start() + { + if (isLocalPlayer) + { + VariableSaver vs = GameObject.FindGameObjectWithTag("VariableSaver").GetComponent(); + rdyBtn = GameObject.Find("ReadyButton").GetComponent