From 343f063422690e368850f5ed58d5f4415fda85d2 Mon Sep 17 00:00:00 2001 From: rawer470 Date: Fri, 16 Aug 2024 12:19:54 +0300 Subject: [PATCH] AddComments --- ZoFo/GameCore/Client.cs | 8 -------- ZoFo/GameCore/GUI/MainMenuGUI.cs | 2 +- ZoFo/GameCore/Server.cs | 12 ++++++++++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ZoFo/GameCore/Client.cs b/ZoFo/GameCore/Client.cs index c42dad7..49b1813 100644 --- a/ZoFo/GameCore/Client.cs +++ b/ZoFo/GameCore/Client.cs @@ -32,15 +32,7 @@ namespace ZoFo.GameCore networkManager.JoinRoom(ip); } -<<<<<<< HEAD public void JoinYourself(){ networkManager.JoinYourself(); } -======= - public void JoinYourself() - { - networkManager.JoinYourself(); - } ->>>>>>> 2e9fccd99a44f3e5ae11ac70f5e7282ec85d9f98 - internal void Update(GameTime gameTime) { } diff --git a/ZoFo/GameCore/GUI/MainMenuGUI.cs b/ZoFo/GameCore/GUI/MainMenuGUI.cs index 3412802..9117807 100644 --- a/ZoFo/GameCore/GUI/MainMenuGUI.cs +++ b/ZoFo/GameCore/GUI/MainMenuGUI.cs @@ -40,7 +40,7 @@ public class MainMenuGUI : AbstractGUI }; playButton.LeftButtonPressed += () => { - Server server = new Server(); + Server server = new Server(); //Server Logic SinglePlayer Client client = new Client(); server.CreateRoom(1); client.JoinYourself(); diff --git a/ZoFo/GameCore/Server.cs b/ZoFo/GameCore/Server.cs index 61756fb..c758fba 100644 --- a/ZoFo/GameCore/Server.cs +++ b/ZoFo/GameCore/Server.cs @@ -37,13 +37,21 @@ namespace ZoFo.GameCore { networkManager.AddData(data); } - public void CreateRoom(int players) //Создает комнату и запускает ожидание подключений + /// + /// Создает комнату и запускает ожидание подключений + /// + /// + public void CreateRoom(int players) { networkManager.Start(players); } // public void StartGame() { } принудительный запуск - public void EndGame() //Добавляет UpdateGameEnded и отключает игроков + + /// + /// Добавляет UpdateGameEnded и отключает игроков + /// + public void EndGame() { UpdateGameEnded gameEnded = new UpdateGameEnded(); networkManager.AddData(gameEnded);