From 1a1cd8e957f7a5d684b147bc587f40864f93832b Mon Sep 17 00:00:00 2001 From: Shawqeem <1004837646@qq.com> Date: Sun, 9 Apr 2023 02:17:02 +0800 Subject: [PATCH] style: :art: change the name of spectator change the name of spectator --- logic/Client/MainWindow.xaml.cs | 1 - logic/Client/StatusBarOfCircumstance.xaml.cs | 9 +++++++-- logic/cmd/gameServer.cmd | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/logic/Client/MainWindow.xaml.cs b/logic/Client/MainWindow.xaml.cs index 0768a1f..e870848 100644 --- a/logic/Client/MainWindow.xaml.cs +++ b/logic/Client/MainWindow.xaml.cs @@ -1358,7 +1358,6 @@ namespace Client private List listOfGate; private List listOfHiddenGate; private object drawPicLock = new object(); - private object recvLock = new object(); private MessageOfStudent? human = null; private MessageOfTricker? butcher = null; private bool humanOrButcher;//true for human diff --git a/logic/Client/StatusBarOfCircumstance.xaml.cs b/logic/Client/StatusBarOfCircumstance.xaml.cs index 5d4616c..47d95b0 100644 --- a/logic/Client/StatusBarOfCircumstance.xaml.cs +++ b/logic/Client/StatusBarOfCircumstance.xaml.cs @@ -12,6 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; using Protobuf; +using Preparation.Utility; namespace Client { @@ -56,14 +57,18 @@ namespace Client { time.Text += Convert.ToString(sec); } - if (playerId == 4) + if (playerId == GameData.numOfStudent) { name.Text = "šŸš€ Tricker's"; } - else + else if(playerId< GameData.numOfStudent) { name.Text = "šŸš€ Student" + Convert.ToString(playerId) + "'s"; } + else + { + name.Text = "šŸš€ Spectator's"; + } if (obj.SubjectFinished < Preparation.Utility.GameData.numOfGeneratorRequiredForRepair) { status.Text = "šŸ“±: " + Convert.ToString(obj.SubjectFinished) + "\n🚪: "; diff --git a/logic/cmd/gameServer.cmd b/logic/cmd/gameServer.cmd index f91b10b..6c4c56b 100644 --- a/logic/cmd/gameServer.cmd +++ b/logic/cmd/gameServer.cmd @@ -14,4 +14,4 @@ start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --ch start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 3 --type 1 --occupation 3 -::start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --ip 0.0.0.0 --port 8888 --characterID 2030 +start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 2030 \ No newline at end of file