From e8499c91d1d3ce43f3b02a3bd402f5bc250ef3a2 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Thu, 9 Dec 2021 13:12:02 +0100 Subject: [PATCH] Switching Teams with btns --- Assets/Scenes/Home.unity | 337 +++++++++++++++++- Assets/Scenes/{oldLobby.unity => Lobby.unity} | 6 +- .../{oldLobby.unity.meta => Lobby.unity.meta} | 0 Assets/Scripts/GameManager/TeamManager.cs | 11 +- Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs | 25 +- Assets/UI.meta | 8 + Assets/UI/Home.meta | 8 + ProjectSettings/EditorBuildSettings.asset | 2 +- UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 22 +- UserSettings/Layouts/default-2021.dwlt | 58 +-- 11 files changed, 424 insertions(+), 57 deletions(-) rename Assets/Scenes/{oldLobby.unity => Lobby.unity} (99%) rename Assets/Scenes/{oldLobby.unity.meta => Lobby.unity.meta} (100%) create mode 100644 Assets/UI.meta create mode 100644 Assets/UI/Home.meta diff --git a/Assets/Scenes/Home.unity b/Assets/Scenes/Home.unity index a8d3fcb..6a71694 100644 --- a/Assets/Scenes/Home.unity +++ b/Assets/Scenes/Home.unity @@ -5302,6 +5302,340 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1061761769} m_CullTransparentMesh: 1 +--- !u!1 &1484761827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1484761828} + - component: {fileID: 1484761830} + - component: {fileID: 1484761829} + m_Layer: 5 + m_Name: MenuBtn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1484761828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484761827} + 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: 1801785840} + m_RootOrder: 1 + 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: 358, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1484761829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484761827} + 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 &1484761830 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484761827} + m_CullTransparentMesh: 1 +--- !u!1 &1486293455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1486293456} + - component: {fileID: 1486293458} + - component: {fileID: 1486293457} + m_Layer: 5 + m_Name: MenuBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1486293456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486293455} + 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: 1801785840} + m_RootOrder: 0 + 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: 358, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1486293457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486293455} + 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 &1486293458 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486293455} + m_CullTransparentMesh: 1 +--- !u!1 &1799293905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1799293906} + - component: {fileID: 1799293908} + - component: {fileID: 1799293907} + m_Layer: 5 + m_Name: MenuBtn (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1799293906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1799293905} + 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: 1801785840} + m_RootOrder: 2 + 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: 358, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1799293907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1799293905} + 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 &1799293908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1799293905} + m_CullTransparentMesh: 1 +--- !u!1 &1801785839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1801785840} + - component: {fileID: 1801785843} + - component: {fileID: 1801785842} + - component: {fileID: 1801785841} + m_Layer: 5 + m_Name: Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1801785840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801785839} + 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: + - {fileID: 1486293456} + - {fileID: 1484761828} + - {fileID: 1799293906} + m_Father: {fileID: 2056883663} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 179, y: 0} + m_SizeDelta: {x: 358, y: 277.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1801785841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801785839} + 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: -125 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1801785842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801785839} + 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 &1801785843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801785839} + m_CullTransparentMesh: 1 --- !u!1 &2056883659 GameObject: m_ObjectHideFlags: 0 @@ -5378,7 +5712,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -5395,6 +5729,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 854561050} + - {fileID: 1801785840} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/oldLobby.unity b/Assets/Scenes/Lobby.unity similarity index 99% rename from Assets/Scenes/oldLobby.unity rename to Assets/Scenes/Lobby.unity index a26d81a..b8c17cd 100644 --- a/Assets/Scenes/oldLobby.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: @@ -615,7 +615,7 @@ GameObject: - component: {fileID: 393718072} - component: {fileID: 393718071} m_Layer: 5 - m_Name: Button + m_Name: Team2Btn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1448,7 +1448,7 @@ GameObject: - component: {fileID: 1441578312} - component: {fileID: 1441578311} m_Layer: 5 - m_Name: Button + m_Name: Team1Btn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/oldLobby.unity.meta b/Assets/Scenes/Lobby.unity.meta similarity index 100% rename from Assets/Scenes/oldLobby.unity.meta rename to Assets/Scenes/Lobby.unity.meta diff --git a/Assets/Scripts/GameManager/TeamManager.cs b/Assets/Scripts/GameManager/TeamManager.cs index 7b3fb74..3b4a790 100644 --- a/Assets/Scripts/GameManager/TeamManager.cs +++ b/Assets/Scripts/GameManager/TeamManager.cs @@ -5,10 +5,19 @@ using Mirror; public class TeamManager : NetworkBehaviour { - + [SerializeField] public List Teams = new List(); int teamIdCount = 0; + public void Start() + { + //Create Speactator Team with index 0 + Team specTeam = new Team("Spectators", 0, -1); + + Teams.Add(specTeam); + + } + public Team AddTeam(string name = "Team") { Team team = new Team(name, teamIdCount, -1); diff --git a/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs index 9f80554..795957d 100644 --- a/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs +++ b/Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs @@ -18,7 +18,7 @@ public class LobbyPlayer : NetworkBehaviour [SyncVar(hook = "ChangeReadyState")] [SerializeField] bool ready = false; - [SyncVar] + [SyncVar(hook = "ChangeDisplayTeam")] [SerializeField] int teamId = 0; Lobby lobby; @@ -26,14 +26,6 @@ public class LobbyPlayer : NetworkBehaviour { lobby = GameObject.Find("LobbyManager").GetComponent(); lobby.RegisterPlayer(this); - - if(teamId == 0) - { - gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team1").transform; - }else if(teamId == 1) - { - gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team2").transform; - } } public void Start() @@ -45,6 +37,10 @@ public class LobbyPlayer : NetworkBehaviour rdyBtn.onClick.AddListener(CmdChangeReady); CmdSendName(vs.username); lobby.SetTitle(this, "Game Of\n" + username); + team1Btn = GameObject.Find("Team1Btn").GetComponent