fix merge bags
This commit is contained in:
parent
0ea1f44072
commit
c737089e7f
3 changed files with 7 additions and 7 deletions
|
@ -98,7 +98,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
|
|||
|
||||
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;
|
||||
foreach (var ip in ipList)
|
||||
{
|
||||
|
@ -106,8 +106,8 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
|
|||
{
|
||||
return ip;
|
||||
}
|
||||
}
|
||||
return IPAddress.Loopback;
|
||||
}*/
|
||||
return IPAddress.Parse("127.0.0.1");
|
||||
}
|
||||
|
||||
//поток 2
|
||||
|
|
|
@ -52,7 +52,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
|
|||
/// <returns></returns>
|
||||
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;
|
||||
foreach (var ip in ipList)
|
||||
{
|
||||
|
@ -60,8 +60,8 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
|
|||
{
|
||||
return ip;
|
||||
}
|
||||
}
|
||||
return IPAddress.Loopback;
|
||||
}*/
|
||||
return IPAddress.Parse("127.0.0.1");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -127,7 +127,7 @@ namespace ZoFo.GameCore
|
|||
players = new List<Player>();
|
||||
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 Zombie(new Vector2(1000, 1000)));
|
||||
AppManager.Instance.server.RegisterGameObject(new Ammo(new Vector2(140, 440)));
|
||||
|
|
Loading…
Add table
Reference in a new issue