progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor naming fixes with network

Browse source
This commit is contained in:
SergoDobro 2023-08-16 17:14:21 +03:00
parent c875c50407
commit 9f8e7bcbd4
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -7,6 +7,7 @@ using System.Text;
using DangerousD.GameCore.GUI;
using Microsoft.Xna.Framework.Input;
using DangerousD.GameCore.Graphics;
using DangerousD.GameCore.Network;
namespace DangerousD.GameCore
{
@ -23,8 +24,9 @@ namespace DangerousD.GameCore
IDrawableObject LoginGUI;
IDrawableObject LobbyGUI;
public GameManager GameManager { get; private set; }
public GameManager GameManager { get; private set; } = new GameManager();
public AnimationBuilder AnimationBuilder { get; private set; } = new AnimationBuilder();
public NetworkManager NetworkManager { get; private set; } = new NetworkManager();
public AppManager()
{
Instance = this;
@ -33,8 +35,7 @@ namespace DangerousD.GameCore
IsMouseVisible = true;
TargetElapsedTime = TimeSpan.FromMilliseconds(1000 / 30);
resolution = new Point(_graphics.PreferredBackBufferWidth, _graphics.PreferredBackBufferHeight);
GameManager = new GameManager();
resolution = new Point(_graphics.PreferredBackBufferWidth, _graphics.PreferredBackBufferHeight);
gameState = GameState.Menu;
MenuGUI = new MenuGUI();
LoginGUI = new LoginGUI();

11
DangerousD/GameCore/Network/NetworkManager.cs
View file

@ -4,12 +4,13 @@ using System.Text;
using System.Collections.Generic;
using System.Threading;
using System;
using Newtonsoft.Json;
namespace DangerousD.GameCore.Network
{
public class NetworkManager
{
public delegate void ReceivingHandler(string jsonMessage);
public delegate void ReceivingHandler(NetworkTask networkTask);
public event ReceivingHandler GetReceivingMessages;
@ -68,9 +69,9 @@ namespace DangerousD.GameCore.Network
Thread ReceivingThread = new Thread(ReceiveMsgFromHost);
ReceivingThread.Start();
}
public void SendMsg(string jsonMessage)
{
byte[] Data = Encoding.Unicode.GetBytes(jsonMessage);
public void SendMsg(NetworkTask networkTask)
{
byte[] Data = Encoding.Unicode.GetBytes(JsonConvert.SerializeObject(networkTask));
int count = Data.Length;
if (state == "Host")
{
@ -111,7 +112,7 @@ namespace DangerousD.GameCore.Network
}
else
{
GetReceivingMessages(so.sb.ToString());
GetReceivingMessages(JsonConvert.DeserializeObject<NetworkTask>(so.sb.ToString()));
}
}
}