more refactoring

Assets/Scenes/Main.unity

@@ -214,7 +214,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PanelSettings: {fileID: 11400000, guid: 2ed681da194cc15f383dd20d59d1226f, type: 2}
   m_ParentUI: {fileID: 0}
-  sourceAsset: {fileID: 9197481963319205126, guid: 8c18fadf28797192cb95360376cdf508, type: 3}
+  sourceAsset: {fileID: 9197481963319205126, guid: 59c75f243b2251b6aa02eec69db9c6ed, type: 3}
   m_SortingOrder: 0
 --- !u!114 &558072413
 MonoBehaviour:
@@ -228,6 +228,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8563a49d0f8f416b8de4ccb2d65a40f8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  roomUI: {fileID: 0}
 --- !u!1 &2137504927
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Menu/MainMenuUI.cs

@@ -1,22 +1,24 @@
-using Game;
 using Global;
-using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UIElements;
 
 namespace Menu {
-	public class MenuUI : MonoBehaviour {
+	public class MainMenuUI {
-
+		
 		private VisualElement mainMenu, playMenu, settingsMenu;
+		public VisualElement Root { get; set; }
+		
+		public void Show() {
+			Root.style.display = DisplayStyle.Flex;
+		}
 
-		private VisualElement root;
+		private void Hide() {
-
+			Root.style.display = DisplayStyle.None;
-		private void OnEnable() {
+		}
-			root = GetComponent<UIDocument>().rootVisualElement;
+		
-
+		public void ResetAndShow() {
-			mainMenu = root.Q("main_menu");
+			mainMenu = Root.Q("main_menu");
-			playMenu = root.Q("play_menu");
+			playMenu = Root.Q("play_menu");
-			settingsMenu = root.Q("settings_menu");
+			settingsMenu = Root.Q("settings_menu");
 
 			mainMenu.Q("btn_play").RegisterCallback<ClickEvent>(PlayPressed);
 			mainMenu.Q("btn_settings").RegisterCallback<ClickEvent>(SettingsPressed);
@@ -26,8 +28,14 @@ namespace Menu {
 			playMenu.Q("btn_join").RegisterCallback<ClickEvent>(JoinPressed);
 			playMenu.Q("btn_bot").RegisterCallback<ClickEvent>(BotPressed);
 			playMenu.Q("btn_bots").RegisterCallback<ClickEvent>(BotsPressed);
+			
+			mainMenu.style.display = DisplayStyle.Flex;
+			playMenu.style.display = DisplayStyle.None;
+			settingsMenu.style.display = DisplayStyle.None;
+			
+			Show();
 		}
-
+		
 		private void PlayPressed(ClickEvent evt) {
 			mainMenu.style.display = DisplayStyle.None;
 			playMenu.style.display = DisplayStyle.Flex;
@@ -51,16 +59,19 @@ namespace Menu {
 
 		private void BotPressed(ClickEvent evt) {
 			RoomSettings.Type = Type.Hybrid;
-			RoomSettings.AIDifficulty = Difficulty.VeryHard;
 
-			SceneManager.LoadScene("Game");
+			GoToRoom();
 		}
 
 		private void BotsPressed(ClickEvent evt) {
 			RoomSettings.Type = Type.AI;
-			RoomSettings.AIDifficulty = Difficulty.VeryHard;
+			
+			GoToRoom();
+		}
 
-			SceneManager.LoadScene("Game");
+		private void GoToRoom() {
+			Hide();
+			MainUI.Instance.roomUI.Show();
 		}
 	}
 }

Assets/Scripts/Menu/MainMenuUI.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 06da811c70ca4fd398fc8155d2783017
+timeCreated: 1682506834

Assets/Scripts/Menu/MainUI.cs

@@ -0,0 +1,27 @@
+using Game;
+using Global;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+
+namespace Menu {
+	public class MainUI : MonoBehaviour {
+		
+		private VisualElement root;
+		public RoomUI roomUI;
+		public MainMenuUI mainMenuUI;
+		
+		public static MainUI Instance { get; private set; }
+
+		private void Awake() {
+			Instance = this;
+			
+			root = GetComponent<UIDocument>().rootVisualElement;
+			mainMenuUI = new MainMenuUI{Root = root.Q<TemplateContainer>("MainMenu").contentContainer};
+			roomUI = new RoomUI{Root = root.Q("Room")};
+			
+			mainMenuUI.ResetAndShow();
+			roomUI.Hide();
+		}
+	}
+}

Assets/Scripts/Menu/RoomUI.cs

@@ -1,5 +1,24 @@
+using System;
+using UnityEngine;
+using UnityEngine.Serialization;
+using UnityEngine.UIElements;
+
 namespace Menu {
 	public class RoomUI {
-		
+		public VisualElement Root { get; set; }
+
+		public void Show() {
+			
+			Root.style.display = DisplayStyle.Flex;
+		}
+
+		public void Hide() {
+			Root.style.display = DisplayStyle.None;
+		}
+
+		private void BackToMainMenu() {
+			Hide();
+			MainUI.Instance.mainMenuUI.ResetAndShow();
+		}
 	}
 }

Assets/UI/Main.uxml

@@ -0,0 +1,7 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:Template name="MainMenu" src="project://database/Assets/UI/MainMenu.uxml?fileID=9197481963319205126&amp;guid=8c18fadf28797192cb95360376cdf508&amp;type=3#MainMenu" />
+    <ui:Template name="Room" src="project://database/Assets/UI/Room.uxml?fileID=9197481963319205126&amp;guid=413eb0fe30f77d6f6a3f14b36a8c5b49&amp;type=3#Room" />
+    <Style src="project://database/Assets/UI/Styles/Main/main.uss?fileID=7433441132597879392&amp;guid=bf06c821ac0da0c7ea35aebdb8b6f154&amp;type=3#main" />
+    <ui:Instance template="MainMenu" name="MainMenu" class="entry" />
+    <ui:Instance template="Room" name="Room" class="entry" style="display: none;" />
+</ui:UXML>

Assets/UI/Main.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 59c75f243b2251b6aa02eec69db9c6ed
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

Assets/UI/Room.uxml

@@ -0,0 +1,6 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="project://database/Assets/UI/Styles/global.uss?fileID=7433441132597879392&amp;guid=f6d2ff1ab9bcd826f88710e642615fa6&amp;type=3#global" />
+    <Style src="project://database/Assets/UI/Styles/Main/room.uss?fileID=7433441132597879392&amp;guid=c15d8498d3bc788d5b018c73af37f733&amp;type=3#room" />
+    <Style src="project://database/Assets/UI/Styles/Main/menu.uss?fileID=7433441132597879392&amp;guid=a6abab2f6d20ba823bad41d2081810e9&amp;type=3#menu" />
+    <ui:Button text="Button" display-tooltip-when-elided="true" />
+</ui:UXML>

Assets/UI/Room.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 413eb0fe30f77d6f6a3f14b36a8c5b49
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

Assets/UI/Styles/Game.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f387b1fd1334ee889aa311741a7e062
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Styles/Main.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c2eeee4a0183fc06b7b877afcef840d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Styles/Main/main.uss

@@ -0,0 +1,4 @@
+.entry {
+    width: 100%;
+    height: 100%;
+}

Assets/UI/Styles/Main/main.uss.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bf06c821ac0da0c7ea35aebdb8b6f154
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0

Assets/UI/Styles/Main/room.uss.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c15d8498d3bc788d5b018c73af37f733
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0