Role separated text in day

This commit is contained in:
Ilya 2021-02-10 22:11:55 +03:00
parent 4e721afba1
commit bbe190fa2b
4 changed files with 17 additions and 7 deletions

View File

@ -3,10 +3,12 @@
public class GameStageChangedPacket : Packet public class GameStageChangedPacket : Packet
{ {
public readonly GameState GameState; public readonly GameState GameState;
public readonly Role Role;
public GameStageChangedPacket(GameState gameState) : base(PacketType.GameStateChanged) public GameStageChangedPacket(GameState gameState, Role role) : base(PacketType.GameStateChanged)
{ {
GameState = gameState; GameState = gameState;
Role = role;
} }
} }
} }

View File

@ -271,18 +271,26 @@ namespace MafiaGame
} }
public void ShowDay(bool voting) public void ShowDay(bool voting, Role role)
{ {
HideAll(); HideAll();
GameDaySelect.IsEnabled = voting; GameDaySelect.IsEnabled = voting;
if (voting) if (role == Role.Died)
{ {
GameDayHotBar.Text = "Обсуждай и думай"; GameDayHotBar.Text = "Коли умер, жди";
} }
else else
{
if (voting)
{ {
GameDayHotBar.Text = "Голосуй и молись"; GameDayHotBar.Text = "Голосуй и молись";
} }
else
{
GameDayHotBar.Text = "Обсуждай и думай";
}
}
GameDay.Visibility = Visibility.Visible; GameDay.Visibility = Visibility.Visible;
} }
} }

View File

@ -263,7 +263,7 @@ namespace MafiaGame
case GameState.Day: case GameState.Day:
App.Current.Dispatcher.Invoke((Action) (() => App.Current.Dispatcher.Invoke((Action) (() =>
{ {
MainWindow.Instance.ShowDay(false); MainWindow.Instance.ShowDay(false,((GameStageChangedPacket)packet).Role);
})); }));
App.Instance.GetRpcClient().UpdateDetails("День"); App.Instance.GetRpcClient().UpdateDetails("День");
break; break;

View File

@ -146,7 +146,7 @@ namespace MafiaServer
WorkDeath(killed); WorkDeath(killed);
foreach (PlayerSocketWorker player in _players) foreach (PlayerSocketWorker player in _players)
{ {
player.sendPacket(new GameStageChangedPacket(GameState.Day)); player.sendPacket(new GameStageChangedPacket(GameState.Day,player.Role));
player.sendPacket(new MessageReceivePacket(ChatType.Day,true,"System",killed.PlayerName+" был убит!")); player.sendPacket(new MessageReceivePacket(ChatType.Day,true,"System",killed.PlayerName+" был убит!"));
} }
} }