diff --git a/ZoFo/GameCore/Client.cs b/ZoFo/GameCore/Client.cs index 4bc324e..10f2ef0 100644 --- a/ZoFo/GameCore/Client.cs +++ b/ZoFo/GameCore/Client.cs @@ -39,7 +39,7 @@ namespace ZoFo.GameCore } public void GameEndedUnexpectedly() { } - public void JoinRoom(string ip) + public void JoinRoom(string ip, int port) { networkManager.JoinRoom(ip); } diff --git a/ZoFo/GameCore/GameManagers/AppManager.cs b/ZoFo/GameCore/GameManagers/AppManager.cs index afff18d..afda697 100644 --- a/ZoFo/GameCore/GameManagers/AppManager.cs +++ b/ZoFo/GameCore/GameManagers/AppManager.cs @@ -59,7 +59,7 @@ namespace ZoFo.GameCore.GameManagers SettingsManager.LoadSettings(); SoundManager = new SoundManager(); SoundManager.LoadSounds(); - + currentGUI = new MainMenuGUI(); debugHud = new DebugHUD(); @@ -70,7 +70,7 @@ namespace ZoFo.GameCore.GameManagers protected override void Initialize() { currentGUI.Initialize(); - debugHud.Initialize(); + debugHud.Initialize(); base.Initialize(); @@ -83,15 +83,15 @@ namespace ZoFo.GameCore.GameManagers currentGUI.LoadContent(); animationBuilder = new AnimationBuilder(); animationBuilder.LoadAnimations(); - + } protected override void Update(GameTime gameTime) { if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || - Keyboard.GetState().IsKeyDown(Keys.Escape)) - Exit(); + Keyboard.GetState().IsKeyDown(Keys.Escape)) { server.CloseConnection(); Exit(); } + debugHud.Set("key", "value"); diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs b/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs index c178154..b8ba458 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs @@ -60,7 +60,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager /// /// /// - public void JoinRoom(string ip) // multyplayer + public void JoinRoom(string ip, int port) // multyplayer { endPoint = new IPEndPoint(IPAddress.Parse(ip), port); diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs b/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs index 658605e..eeaee4c 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs @@ -152,7 +152,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager string response = Encoding.UTF8.GetString(buff, 0, answ); GetDataSend(response); } - Thread.Sleep(-1); + Task.Delay(-1); } } diff --git a/ZoFo/GameCore/Server.cs b/ZoFo/GameCore/Server.cs index f374401..fe2e470 100644 --- a/ZoFo/GameCore/Server.cs +++ b/ZoFo/GameCore/Server.cs @@ -46,6 +46,11 @@ namespace ZoFo.GameCore //ТУТ Switch case будет честное слово } + public void CloseConnection() + { + networkManager.CloseConnection(); + } + /// /// Для красоты) Отдел Серверов /// добавляет в лист updates новую data