From ff6e8cc32cdef1ed22ceffb0dc89e30dce302185 Mon Sep 17 00:00:00 2001 From: logzinga <65839350+logzinga@users.noreply.github.com> Date: Tue, 21 Feb 2023 13:00:08 +1100 Subject: [PATCH] main menu updates, should work now --- Assets/Scenes/MainMenu.unity | 172 +++++++++++++++++++++- Assets/Scripts/MainMenu.cs | 15 +- ProjectSettings/EditorBuildSettings.asset | 5 +- 3 files changed, 182 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index faaab2a..9f3539e 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -286,7 +286,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 23523817} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 28480380} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: JoinGame + 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 --- !u!114 &23523817 MonoBehaviour: m_ObjectHideFlags: 0 @@ -337,6 +349,7 @@ GameObject: - component: {fileID: 28480378} - component: {fileID: 28480377} - component: {fileID: 28480376} + - component: {fileID: 28480380} m_Layer: 5 m_Name: MainMenu m_TagString: Untagged @@ -424,13 +437,124 @@ RectTransform: - {fileID: 1958727159} - {fileID: 1002644886} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &28480380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28480375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b77194e77ba5b025b8fd3e43ebf8ab78, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &81088555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 81088556} + - component: {fileID: 81088558} + - component: {fileID: 81088557} + m_Layer: 0 + m_Name: NetworkManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &81088556 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81088555} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 472.84747, y: 268.84888, z: 1.3574015} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &81088557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81088555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ProtocolType: 0 + m_MaxPacketQueueSize: 128 + m_MaxPayloadSize: 6144 + m_HeartbeatTimeoutMS: 500 + m_ConnectTimeoutMS: 1000 + m_MaxConnectAttempts: 60 + m_DisconnectTimeoutMS: 30000 + ConnectionData: + Address: 127.0.0.1 + Port: 7777 + ServerListenAddress: + DebugSimulator: + PacketDelayMS: 0 + PacketJitterMS: 0 + PacketDropRate: 0 +--- !u!114 &81088558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81088555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3} + m_Name: + m_EditorClassIdentifier: + RunInBackground: 1 + LogLevel: 1 + NetworkConfig: + ProtocolVersion: 0 + NetworkTransport: {fileID: 81088557} + PlayerPrefab: {fileID: 5037713273676016863, guid: e4d6789fa0b00ceb1a6e5d6e5e801e06, type: 3} + NetworkPrefabs: + - Override: 0 + Prefab: {fileID: 5037713273676016863, guid: e4d6789fa0b00ceb1a6e5d6e5e801e06, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + TickRate: 30 + ClientConnectionBufferTimeout: 10 + ConnectionApproval: 0 + ConnectionData: + EnableTimeResync: 0 + TimeResyncInterval: 30 + EnsureNetworkVariableLengthSafety: 0 + EnableSceneManagement: 1 + ForceSamePrefabs: 1 + RecycleNetworkIds: 1 + NetworkIdRecycleDelay: 120 + RpcHashSize: 0 + LoadSceneTimeOut: 120 + SpawnTimeout: 1 + EnableNetworkLogs: 1 --- !u!1 &112335091 GameObject: m_ObjectHideFlags: 0 @@ -497,7 +621,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &188501258 GameObject: @@ -840,7 +964,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 601941605} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 28480380} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: ServerMode + 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 --- !u!114 &601941605 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1042,7 +1178,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1172479341} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 28480380} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: HostGame + 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 --- !u!114 &1172479341 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1320,7 +1468,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1958727161} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 28480380} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: QuitGame + 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 --- !u!114 &1958727161 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs index 1a69a75..f35c4dd 100644 --- a/Assets/Scripts/MainMenu.cs +++ b/Assets/Scripts/MainMenu.cs @@ -2,12 +2,21 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using Unity.Netcode; public class MainMenu : MonoBehaviour { - public void Host { - + public void HostGame () { SceneManager.LoadScene("Level01"); - + } + public void JoinGame () { + SceneManager.LoadScene("Level01"); + } + public void ServerMode () { + SceneManager.LoadScene("Level01"); + } + public void QuitGame () { + Debug.Log("Exiting Game..."); + Application.Quit(); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..1a485db 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/MainMenu.unity + guid: 5fbb5a5f4be8f68318223370d24aa511 m_configObjects: {}