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

fix merge bags

Browse source
This commit is contained in:
Lev 2024-08-18 15:52:35 +03:00
parent 0ea1f44072
commit c737089e7f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs
View file

@ -98,7 +98,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
public static IPAddress GetIp() public static IPAddress GetIp()
{ {
string hostName = Dns.GetHostName(); // Retrive the Name of HOST /*string hostName = Dns.GetHostName(); // Retrive the Name of HOST
var ipList = Dns.GetHostByName(hostName).AddressList; var ipList = Dns.GetHostByName(hostName).AddressList;
foreach (var ip in ipList) foreach (var ip in ipList)
{ {
@ -106,8 +106,8 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
{ {
return ip; return ip;
} }
} }*/
return IPAddress.Loopback; return IPAddress.Parse("127.0.0.1");
} }
//поток 2 //поток 2

6
ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
View file

@ -52,7 +52,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
/// <returns></returns> /// <returns></returns>
public static IPAddress GetIp() public static IPAddress GetIp()
{ {
string hostName = Dns.GetHostName(); // Retrive the Name of HOST /*string hostName = Dns.GetHostName(); // Retrive the Name of HOST
var ipList = Dns.GetHostByName(hostName).AddressList; var ipList = Dns.GetHostByName(hostName).AddressList;
foreach (var ip in ipList) foreach (var ip in ipList)
{ {
@ -60,8 +60,8 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
{ {
return ip; return ip;
} }
} }*/
return IPAddress.Loopback; return IPAddress.Parse("127.0.0.1");
} }
/// <summary> /// <summary>

2
ZoFo/GameCore/Server.cs
View file

@ -127,7 +127,7 @@ namespace ZoFo.GameCore
players = new List<Player>(); players = new List<Player>();
new MapManager().LoadMap(); new MapManager().LoadMap();
AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(0, 0))); //AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(0, 0)));
AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(740, 140))); AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(740, 140)));
AppManager.Instance.server.RegisterGameObject(new Zombie(new Vector2(1000, 1000))); AppManager.Instance.server.RegisterGameObject(new Zombie(new Vector2(1000, 1000)));
AppManager.Instance.server.RegisterGameObject(new Ammo(new Vector2(140, 440))); AppManager.Instance.server.RegisterGameObject(new Ammo(new Vector2(140, 440)));