kskclzzzfer
This commit is contained in:
parent
e3879697f0
commit
723632178a
1 changed files with 4 additions and 20 deletions
|
@ -178,7 +178,7 @@ namespace DangerousD.GameCore
|
||||||
{
|
{
|
||||||
foreach (NetworkTask networkTask in networkTasks)
|
foreach (NetworkTask networkTask in networkTasks)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
switch (networkTask.operation)
|
switch (networkTask.operation)
|
||||||
{
|
{
|
||||||
case NetworkTaskOperationEnum.TakeDamage:
|
case NetworkTaskOperationEnum.TakeDamage:
|
||||||
|
@ -199,25 +199,9 @@ namespace DangerousD.GameCore
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
case NetworkTaskOperationEnum.TakeDamage:
|
|
||||||
break;
|
|
||||||
case NetworkTaskOperationEnum.SendSound:
|
|
||||||
// SoundManager.StartSound(networkTask.name, networkTask.position, GameManager.GetPlayer1.Pos);
|
|
||||||
break;
|
|
||||||
case NetworkTaskOperationEnum.CreateEntity:
|
|
||||||
break;
|
|
||||||
case NetworkTaskOperationEnum.SendPosition:
|
|
||||||
break;
|
|
||||||
case NetworkTaskOperationEnum.ChangeState:
|
|
||||||
break;
|
|
||||||
case NetworkTaskOperationEnum.ConnectToHost:
|
|
||||||
break;
|
|
||||||
case NetworkTaskOperationEnum.GetClientPlayerId:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
>>>>>>> livingEntitiesVlad
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue