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

MultiplyPlayersShootInterractCommit

Browse source
This commit is contained in:
AnloGames 2024-08-20 19:05:02 +03:00
parent a0208805ed
commit 128f304780
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ZoFo/GameCore/Client.cs
View file

@ -60,11 +60,11 @@ namespace ZoFo.GameCore
};
AppManager.Instance.InputManager.OnInteract += () =>
{
networkManager.AddData(new UpdateInputInteraction() { });
networkManager.AddData(new UpdateInputInteraction() {PlayerId = AppManager.Instance.client.networkManager.PlayerId });
};
AppManager.Instance.InputManager.ShootEvent += () =>
{
networkManager.AddData(new UpdateInputShoot() { });
networkManager.AddData(new UpdateInputShoot() { PlayerId = AppManager.Instance.client.networkManager.PlayerId });
};
}

2
ZoFo/GameCore/GameManagers/NetworkManager/Updates/ClientToServer/UpdateInputInteraction.cs
View file

@ -9,4 +9,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates.ClientToServer;
public class UpdateInputInteraction : UpdateData
{
public UpdateInputInteraction() { UpdateType = "UpdateInputInteraction"; }
public int PlayerId { get; set; }
}

1
ZoFo/GameCore/GameManagers/NetworkManager/Updates/ClientToServer/UpdateShootInteraction.cs
View file

@ -6,4 +6,5 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates.ClientToServer;
public class UpdateInputShoot : UpdateData
{
public UpdateInputShoot() { UpdateType = "UpdateInputShoot"; }
public int PlayerId { get; set; }
}

5
ZoFo/GameCore/GameObjects/Entities/Entity.cs
View file

@ -59,7 +59,10 @@ namespace ZoFo.GameCore.GameObjects
public virtual void Delete()
{
AppManager.Instance.server.DeleteObject(this);
if (AppManager.Instance.gamestate == GameState.HostPlaying)
{
AppManager.Instance.server.DeleteObject(this);
}
}
}
}

18
ZoFo/GameCore/Server.cs
View file

@ -70,8 +70,8 @@ namespace ZoFo.GameCore
case "UpdateInput":
if (players.Count > 0)
{
UpdateInput data = updateData as UpdateInput;
players[data.PlayerId-1].HandleNewInput(data);
UpdateInput data = updateData as UpdateInput;
players[data.PlayerId - 1].HandleNewInput(data);
}
//TODO id instead of 0
else
@ -80,13 +80,21 @@ namespace ZoFo.GameCore
case "UpdateTileCreated":
break;
case "UpdateInputInteraction":
players[0].HandleInteract(updateData as UpdateInputInteraction);
if (players.Count > 0)
{
UpdateInputInteraction data = updateData as UpdateInputInteraction;
players[data.PlayerId - 1].HandleInteract(data);
}
break;
case "UpdateInputShoot":
players[0].HandleShoot(updateData as UpdateInputShoot);
if (players.Count > 0)
{
UpdateInputShoot data = updateData as UpdateInputShoot;
players[data.PlayerId - 1].HandleShoot(data);
}
break;
}
}
}//Поспать
/// <summary>