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

MapCOmmit

Browse source
This commit is contained in:
AnloGames 2024-08-19 21:49:41 +03:00
parent 332680a8eb
commit 68ab2a4498
2 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
ZoFo/GameCore/Client.cs
View file

@ -119,60 +119,64 @@ namespace ZoFo.GameCore
} }
} }
internal void GotData(UpdateData update) internal void GotData(List<UpdateData> updates)
{ {
if (update is UpdateTileCreated) foreach (UpdateData update in updates)
{ {
mapObjects.Add( if (update is UpdateTileCreated)
new MapObject(
(update as UpdateTileCreated).Position.GetVector2(),
(update as UpdateTileCreated).Size.GetPoint().ToVector2(),
(update as UpdateTileCreated).sourceRectangle.GetRectangle(),
(update as UpdateTileCreated).tileSetName
));
}
//else if (update is UpdateStopObjectCreated)
//{
// stopObjects.Add(
// new StopObject(
// (update as UpdateStopObjectCreated).Position,
// (update as UpdateStopObjectCreated).Size.ToVector2(),
// (update as UpdateStopObjectCreated).sourceRectangle,
// (update as UpdateStopObjectCreated).tileSetName
// ));
//}
else if (update is UpdateGameObjectCreated)
{
GameObject created_gameObject;
if ((update as UpdateGameObjectCreated).GameObjectType == "EntittyForAnimationTests")
gameObjects.Add(new EntittyForAnimationTests((update as UpdateGameObjectCreated).position.GetVector2()));
if ((update as UpdateGameObjectCreated).GameObjectType == "Player")
{ {
created_gameObject = new Player((update as UpdateGameObjectCreated).position.GetVector2()); mapObjects.Add(
players.Add(created_gameObject as Player); new MapObject(
gameObjects.Add(created_gameObject); (update as UpdateTileCreated).Position.GetVector2(),
(update as UpdateTileCreated).Size.GetPoint().ToVector2(),
(update as UpdateTileCreated).sourceRectangle.GetRectangle(),
(update as UpdateTileCreated).tileSetName
));
} }
if ((update as UpdateGameObjectCreated).GameObjectType == "Ammo") //else if (update is UpdateStopObjectCreated)
gameObjects.Add(new Ammo((update as UpdateGameObjectCreated).position.GetVector2())); //{
if ((update as UpdateGameObjectCreated).GameObjectType == "Zombie") // stopObjects.Add(
gameObjects.Add(new Zombie((update as UpdateGameObjectCreated).position.GetVector2())); // new StopObject(
// (update as UpdateStopObjectCreated).Position,
// (update as UpdateStopObjectCreated).Size.ToVector2(),
// (update as UpdateStopObjectCreated).sourceRectangle,
// (update as UpdateStopObjectCreated).tileSetName
// ));
//}
else if (update is UpdateGameObjectCreated)
{
GameObject created_gameObject;
if ((update as UpdateGameObjectCreated).GameObjectType == "EntittyForAnimationTests")
gameObjects.Add(new EntittyForAnimationTests((update as UpdateGameObjectCreated).position.GetVector2()));
if ((update as UpdateGameObjectCreated).GameObjectType == "Player")
{
created_gameObject = new Player((update as UpdateGameObjectCreated).position.GetVector2());
players.Add(created_gameObject as Player);
gameObjects.Add(created_gameObject);
}
if ((update as UpdateGameObjectCreated).GameObjectType == "Ammo")
gameObjects.Add(new Ammo((update as UpdateGameObjectCreated).position.GetVector2()));
if ((update as UpdateGameObjectCreated).GameObjectType == "Zombie")
gameObjects.Add(new Zombie((update as UpdateGameObjectCreated).position.GetVector2()));
(gameObjects.Last() as Entity).SetIdByClient((update as UpdateGameObjectCreated).IdEntity); (gameObjects.Last() as Entity).SetIdByClient((update as UpdateGameObjectCreated).IdEntity);
//var a = Assembly.GetAssembly(typeof(GameObject)); //var a = Assembly.GetAssembly(typeof(GameObject));
//gameObjects.Add( TODO reflection //gameObjects.Add( TODO reflection
//Activator.CreateInstance(Type.GetType("ZoFo.GameCore.GameObjects.Entities.EntittyForAnimationTests") //Activator.CreateInstance(Type.GetType("ZoFo.GameCore.GameObjects.Entities.EntittyForAnimationTests")
///*(update as UpdateGameObjectCreated).GameObjectType*/, new []{ new Vector2(100, 100) }) ///*(update as UpdateGameObjectCreated).GameObjectType*/, new []{ new Vector2(100, 100) })
//as GameObject //as GameObject
//); //);
} }
else if (update is UpdatePosition) //else if (update is UpdatePosition)
{ //{
var ent = FindEntityById(update.IdEntity); // var ent = FindEntityById(update.IdEntity);
ent.position = (update as UpdatePosition).NewPosition.GetVector2(); // ent.position = (update as UpdatePosition).NewPosition.GetVector2();
DebugHUD.Instance.Log("newPosition " + ent.position); // DebugHUD.Instance.Log("newPosition " + ent.position);
//}
} }
} }

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

@ -176,6 +176,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
} }
void ExecuteDatagramm(Datagramm Dgramm) void ExecuteDatagramm(Datagramm Dgramm)
{ {
AppManager.Instance.client.GotData(Dgramm.updateDatas);
//Достаёт Update и передает в ивент //Достаёт Update и передает в ивент
} }