diff --git a/logic/Client/MainWindow.xaml.cs b/logic/Client/MainWindow.xaml.cs index be86526..597673d 100644 --- a/logic/Client/MainWindow.xaml.cs +++ b/logic/Client/MainWindow.xaml.cs @@ -49,8 +49,11 @@ namespace Client isPlaybackMode = false; drawPicLock = new(); listOfProp = new List(); - listOfHuman = new List(); - listOfButcher = new List(); + listOfHuman = new List(); + listOfButcher = new List(); + listOfBullet=new List(); + listOfBombedBullet = new List(); + listOfAll=new List(); WindowStartupLocation = WindowStartupLocation.CenterScreen; comInfo[0] = "183.172.208.156"; comInfo[1] = "8888"; @@ -62,12 +65,15 @@ namespace Client //OnReceive(); DrawMap(); ZoomMap(); - MessageOfHuman kurei = new MessageOfHuman(); + MessageOfStudent kurei = new MessageOfStudent(); kurei.X = 10000; kurei.Y = 20000; kurei.Speed = 1000; kurei.PlayerId = 0; listOfHuman.Add(kurei); + MessageOfAll all= new MessageOfAll(); + all.HiddenGateRefreshed = false; + listOfAll.Add(all); // ReactToCommandline(); } @@ -82,7 +88,7 @@ namespace Client } } - // 连接Server,comInfo[]的格式：0-ip 1- port 2-playerID 3-playerType 4-human/butcherType + // 连接Server,comInfo[]的格式：0-ip 1- port 2-playerID 3-playerType 4-human/TrickerType private void ConnectToServer(string[] comInfo) { if (!isPlaybackMode) @@ -103,8 +109,8 @@ namespace Client playerType = Convert.ToInt64(comInfo[3]) switch { 0 => PlayerType.NullPlayerType, - 1 => PlayerType.HumanPlayer, - 2 => PlayerType.ButcherPlayer, + 1 => PlayerType.StudentPlayer, + 2 => PlayerType.TrickerPlayer, }; if (Convert.ToInt64(comInfo[3]) == 1) { @@ -115,47 +121,47 @@ namespace Client humanOrButcher = false; } playerMsg.PlayerType = playerType; - if (playerType == PlayerType.HumanPlayer) + if (playerType == PlayerType.StudentPlayer) { switch (Convert.ToInt64(comInfo[4])) { case 0: - playerMsg.HumanType = HumanType.NullHumanType; + playerMsg.StudentType = StudentType.NullStudentType; break; case 1: - playerMsg.HumanType = HumanType._1; + playerMsg.StudentType = StudentType._1; break; case 2: - playerMsg.HumanType = HumanType._2; + playerMsg.StudentType = StudentType._2; break; case 3: - playerMsg.HumanType = HumanType._3; + playerMsg.StudentType = StudentType._3; break; case 4: - playerMsg.HumanType = HumanType._4; + playerMsg.StudentType = StudentType._4; break; default: break; } } - else if (playerType == PlayerType.ButcherPlayer) + else if (playerType == PlayerType.TrickerPlayer) { switch (Convert.ToInt64(comInfo[4])) { case 0: - playerMsg.ButcherType = ButcherType.NullButcherType; + playerMsg.TrickerType = TrickerType.NullTrickerType; break; case 1: - playerMsg.ButcherType = ButcherType._1; + playerMsg.TrickerType = TrickerType._1; break; case 2: - playerMsg.ButcherType = ButcherType._2; + playerMsg.TrickerType = TrickerType._2; break; case 3: - playerMsg.ButcherType = ButcherType._3; + playerMsg.TrickerType = TrickerType._3; break; case 4: - playerMsg.ButcherType = ButcherType._4; + playerMsg.TrickerType = TrickerType._4; break; default: break; @@ -188,7 +194,7 @@ namespace Client UpperLayerOfMap.Children.Add(icon); } - // 获得地图信息 + // 获得地图信息,未更新数值 private void GetMap(MessageOfMap obj) { int[,] map = new int[50, 50]; @@ -264,8 +270,14 @@ namespace Client mapPatches[i, j].Stroke = Brushes.LightSkyBlue; break;//door case 10: - mapPatches[i, j].Fill = Brushes.LightSalmon; - mapPatches[i, j].Stroke = Brushes.LightSalmon; + foreach (var obj in listOfAll) + { + if(obj.HiddenGateRefreshed) + { + mapPatches[i, j].Fill = Brushes.LightSalmon; + mapPatches[i, j].Stroke = Brushes.LightSalmon; + } + } break;//emergency default: break; @@ -305,7 +317,8 @@ namespace Client laserIcon.Points = laserEndPoints; UpperLayerOfMap.Children.Add(laserIcon); } - private async void OnReceive() // log未更新,switch1,2更新log + + private async void OnReceive() // 已按照3.5版proto更新信息，但是左侧信息栏还未填充。log未更新,switch1,2,3更新log { try { @@ -316,88 +329,90 @@ namespace Client listOfHuman.Clear(); listOfButcher.Clear(); listOfProp.Clear(); + listOfBombedBullet.Clear(); + listOfBullet.Clear(); + listOfAll.Clear(); MessageToClient content = responseStream.ResponseStream.Current; switch (content.GameState) { case GameState.GameStart: - foreach (var obj in content.HumanMessage) - { - if (humanOrButcher && obj.PlayerId == playerID) - { - human = obj; - } - listOfHuman.Add(obj); - } - foreach (var obj in content.ButcherMessage) + case GameState.GameRunning: + foreach (var obj in content.ObjMessage) { - if (!humanOrButcher && obj.PlayerId == playerID) + switch (obj.MessageOfObjCase) { - butcher = obj; + case MessageOfObj.MessageOfObjOneofCase.StudentMessage: + if (humanOrButcher && obj.StudentMessage.PlayerId == playerID) + { + human = obj.StudentMessage; + } + listOfHuman.Add(obj.StudentMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.TrickerMessage: + if (!humanOrButcher && obj.TrickerMessage.PlayerId == playerID) + { + butcher = obj.TrickerMessage; + } + listOfButcher.Add(obj.TrickerMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.PropMessage: + listOfProp.Add(obj.PropMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage: + listOfBombedBullet.Add(obj.BombedBulletMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.BulletMessage: + listOfBullet.Add(obj.BulletMessage); + break; } - listOfButcher.Add(obj); - } - foreach (var obj in content.PropMessage) - { - listOfProp.Add(obj); } GetMap(content.MapMessage); + listOfAll.Add(content.AllMessage); break; - case GameState.GameRunning: - foreach (var obj in content.HumanMessage) - { - if (humanOrButcher && obj.PlayerId == playerID) - { - human = obj; - } - listOfHuman.Add(obj); - } - foreach (var obj in content.ButcherMessage) + + case GameState.GameEnd: + foreach (var obj in content.ObjMessage) { - if (!humanOrButcher && obj.PlayerId == playerID) + switch (obj.MessageOfObjCase) { - butcher = obj; + case MessageOfObj.MessageOfObjOneofCase.StudentMessage: + listOfHuman.Add(obj.StudentMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.TrickerMessage: + listOfButcher.Add(obj.TrickerMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.PropMessage: + listOfProp.Add(obj.PropMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage: + listOfBombedBullet.Add(obj.BombedBulletMessage); + break; + case MessageOfObj.MessageOfObjOneofCase.BulletMessage: + listOfBullet.Add(obj.BulletMessage); + break; } - listOfButcher.Add(obj); - } - foreach (var obj in content.PropMessage) - { - listOfProp.Add(obj); - } - if (!mapFlag) - GetMap(content.MapMessage); - break; - case GameState.GameEnd: - foreach (var obj in content.HumanMessage) - { - listOfHuman.Add(obj); - } - foreach (var obj in content.ButcherMessage) - { - listOfButcher.Add(obj); - } - foreach (var obj in content.PropMessage) - { - listOfProp.Add(obj); } + listOfAll.Add(content.AllMessage); break; } } - } - if (responseStream == null) - { - throw new Exception("Unconnected"); + if (responseStream == null) + { + throw new Exception("Unconnected"); + } } } catch (Exception ex) { - ErrorDisplayer error = new("Error: "+ex.ToString()); + ErrorDisplayer error = new("Error: " + ex.ToString()); error.Show(); } } - private bool CanSee(MessageOfHuman msg) + //待修改 + private bool CanSee(MessageOfStudent msg) { - if (msg.State == HumanState.Dead) + if (msg.State == StudentState.Quit) return false; //if (playerID >= 2022 || teamID >= 2022) // return true; @@ -408,7 +423,7 @@ namespace Client } if (msg.Place == PlaceType.Grass || msg.Place == PlaceType.Gate || msg.Place == PlaceType.HiddenGate) return false; - if (msg.Place == PlaceType.Land || msg.Place == PlaceType.Machine) + if (msg.Place == PlaceType.Land || msg.Place == PlaceType.Classroom) return true; if (humanOrButcher && human != null) { @@ -423,7 +438,7 @@ namespace Client return true; } - private bool CanSee(MessageOfButcher msg) + private bool CanSee(MessageOfTricker msg) { // if (playerID >= 2022 || teamID >= 2022) // return true; @@ -434,7 +449,7 @@ namespace Client } if (msg.Place == PlaceType.Grass || msg.Place == PlaceType.Gate || msg.Place == PlaceType.HiddenGate) return false; - if (msg.Place == PlaceType.Land || msg.Place == PlaceType.Machine) + if (msg.Place == PlaceType.Land || msg.Place == PlaceType.Classroom) return true; if (humanOrButcher && human != null) { @@ -466,7 +481,24 @@ namespace Client return true; } - private void Refresh(object? sender, EventArgs e) + private bool CanSee(MessageOfBullet msg) + { + if (msg.Place == PlaceType.Land) + return true; + if (humanOrButcher && human != null) + { + if (msg.Place != human.Place) + return false; + } + else if (!humanOrButcher && butcher != null) + { + if (msg.Place != butcher.Place) + return false; + } + return true; + } + + private void Refresh(object? sender, EventArgs e) // 已按照3.5版proto更新信息，circumstance栏未更新 log未更新 { // Bonus(); if (WindowState == WindowState.Maximized) @@ -483,6 +515,7 @@ namespace Client if (StatusBarsOfCircumstance != null) StatusBarsOfCircumstance.SetFontSize(12 * UpperLayerOfMap.ActualHeight / 650); // 完成窗口信息更新 + if (!isClientStocked) { unit = Math.Sqrt(UpperLayerOfMap.ActualHeight * UpperLayerOfMap.ActualWidth) / 50; @@ -509,6 +542,10 @@ namespace Client //{ lock (drawPicLock) // 加锁是必要的，画图操作和接收信息操作不能同时进行 { + foreach (var data in listOfAll) + { + StatusBarsOfCircumstance.SetValue(data); + } if (!hasDrawed && mapFlag) DrawMap(); foreach (var data in listOfHuman) @@ -530,12 +567,13 @@ namespace Client } foreach (var data in listOfButcher) { + StatusBarsOfHunter.SetValue(data); if (CanSee(data)) { Ellipse icon = new() { - Width = 10, - Height = 10, + Width = unitWidth, + Height = unitHeight, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top, Margin = new Thickness(data.Y * unitWidth / 1000.0 - unitWidth / 2, data.X * unitHeight / 1000.0 - unitHeight / 2, 0, 0), @@ -568,7 +606,75 @@ namespace Client } } } - + foreach (var data in listOfBullet) + { + if (CanSee(data)) + { + Ellipse icon = new() + { + Width = 10, + Height = 10, + HorizontalAlignment = HorizontalAlignment.Left, + VerticalAlignment = VerticalAlignment.Top, + Margin = new Thickness(data.Y * unitWidth / 1000.0 - unitWidth / 2, data.X * unitHeight / 1000.0 - unitHeight / 2, 0, 0), + Fill = Brushes.Red + }; + UpperLayerOfMap.Children.Add(icon); + } + } + foreach (var data in listOfBombedBullet) + { + switch (data.Type) + { + case BulletType.FastBullet: + { + Ellipse icon = new(); + double bombRange = data.BombRange / 1000; + icon.Width = bombRange * unitWidth; + icon.Height = bombRange * unitHeight; + icon.HorizontalAlignment = HorizontalAlignment.Left; + icon.VerticalAlignment = VerticalAlignment.Top; + icon.Margin = new Thickness(data.Y * unitWidth / 1000.0 - bombRange * unitWidth / 2, data.X * unitHeight / 1000.0 - bombRange * unitHeight / 2, 0, 0); + icon.Fill = Brushes.Red; + UpperLayerOfMap.Children.Add(icon); + break; + } + case BulletType.AtomBomb: + { + Ellipse icon = new Ellipse(); + double bombRange = data.BombRange / 1000; + icon.Width = bombRange * unitWidth; + icon.Height = bombRange * unitHeight; + icon.HorizontalAlignment = HorizontalAlignment.Left; + icon.VerticalAlignment = VerticalAlignment.Top; + icon.Margin = new Thickness(data.Y * unitWidth / 1000.0 - bombRange * unitWidth / 2, data.X * unitHeight / 1000.0 - bombRange * unitHeight / 2, 0, 0); + icon.Fill = Brushes.Red; + UpperLayerOfMap.Children.Add(icon); + break; + } + case BulletType.OrdinaryBullet: + { + Ellipse icon = new Ellipse(); + double bombRange = data.BombRange / 1000; + icon.Width = bombRange * unitWidth; + icon.Height = bombRange * unitHeight; + icon.HorizontalAlignment = HorizontalAlignment.Left; + icon.VerticalAlignment = VerticalAlignment.Top; + icon.Margin = new Thickness(data.Y * unitWidth / 1000.0 - bombRange * unitWidth / 2, data.X * unitHeight / 1000.0 - bombRange * unitHeight / 2, 0, 0); + icon.Fill = Brushes.Red; + UpperLayerOfMap.Children.Add(icon); + break; + } + case BulletType.LineBullet: + { + double bombRange = data.BombRange / 1000; + DrawLaser(new Point(data.Y * unitWidth / 1000.0, data.X * unitHeight / 1000.0), -data.FacingDirection + Math.PI / 2, bombRange * unitHeight, 0.5 * unitWidth); + break; + } + default: + break; + } + } //} ZoomMap(); } @@ -584,7 +690,7 @@ namespace Client counter++; } - // 键盘控制 + // 键盘控制，未完善 private void KeyBoardControl(object sender, KeyEventArgs e) { if (!isPlaybackMode) @@ -640,21 +746,21 @@ namespace Client client.Attack(msgJ); break; case Key.F: - PickMsg msgF = new() + PropMsg msgF = new() { PlayerId = playerID, }; client.PickProp(msgF); break; case Key.E: - IDMsg msgE = new() + PropMsg msgE = new() { PlayerId = playerID, }; client.UseProp(msgE); break; case Key.Q: - IDMsg msgQ = new() + SkillMsg msgQ = new() { PlayerId = playerID, }; @@ -825,11 +931,14 @@ namespace Client private readonly Rectangle[,] mapPatches = new Rectangle[50, 50]; private List listOfProp; - private List listOfHuman; - private List listOfButcher; + private List listOfHuman; + private List listOfButcher; + private List listOfBullet; + private List listOfBombedBullet; + private List listOfAll; private object drawPicLock = new object(); - private MessageOfHuman? human = null; - private MessageOfButcher? butcher = null; + private MessageOfStudent? human = null; + private MessageOfTricker? butcher = null; private bool humanOrButcher;//true for human private bool bonusflag; diff --git a/logic/Client/StatusBarOfCircumstance.xaml b/logic/Client/StatusBarOfCircumstance.xaml index aee4eb4..849396a 100644 --- a/logic/Client/StatusBarOfCircumstance.xaml +++ b/logic/Client/StatusBarOfCircumstance.xaml @@ -8,21 +8,21 @@ d:DesignHeight="174" d:DesignWidth="180"> - - - - + + + + - - - - - + + + + + \ No newline at end of file diff --git a/logic/Client/StatusBarOfCircumstance.xaml.cs b/logic/Client/StatusBarOfCircumstance.xaml.cs index 573b916..57b7303 100644 --- a/logic/Client/StatusBarOfCircumstance.xaml.cs +++ b/logic/Client/StatusBarOfCircumstance.xaml.cs @@ -11,6 +11,7 @@ using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; +using Protobuf; namespace Client { @@ -27,12 +28,43 @@ namespace Client Grid.SetColumnSpan(this, 2); Grid.SetRow(this, Row); Grid.SetRowSpan(this, 2); - initialized = false; } public void SetFontSize(double fontsize) { - serial.FontSize = scores.FontSize = star.FontSize = status.FontSize = prop.FontSize = fontsize; + time.FontSize = scoresofstudents.FontSize = scoresoftrickers.FontSize = status.FontSize = prop.FontSize = fontsize; + } + + public void SetValue(MessageOfAll obj) + { + time.Text = "Time⏳: " + Convert.ToString(obj.GameTime); + status.Text = "📱: " + Convert.ToString(obj.SubjectLeft) + "\n🚪: "; + if(obj.GateOpened) + { + status.Text += "Open\n🆘: "; + } + else + { + status.Text += "Close\n🆘: "; + } + if(obj.HiddenGateRefreshed) + { + if(obj.HiddenGateOpened) + { + status.Text += "Open\n🏃: "; + } + else + { + status.Text += "Refreshed\n🏃: "; + } + } + else + { + status.Text += "Unrefreshed\n🏃: "; + } + status.Text += Convert.ToString(obj.StudentGraduated)+ "\n⚰️: "; + status.Text += Convert.ToString(obj.StudentQuited); + scoresofstudents.Text = "Scores of Survivors: " + Convert.ToString(obj.StudentScore); + scoresoftrickers.Text = "Scores of Hunters: " + Convert.ToString(obj.TrickerScore); } - private bool initialized; } } diff --git a/logic/Client/StatusBarOfHunter.xaml.cs b/logic/Client/StatusBarOfHunter.xaml.cs index c9d4bf6..de4f228 100644 --- a/logic/Client/StatusBarOfHunter.xaml.cs +++ b/logic/Client/StatusBarOfHunter.xaml.cs @@ -39,34 +39,34 @@ namespace Client serial.FontSize = scores.FontSize = star.FontSize = status.FontSize = prop.FontSize = fontsize; } - private void SetStaticValue(MessageOfButcher obj) + private void SetStaticValue(MessageOfTricker obj) { - switch (obj.ButcherType) // 参数未设定 + switch (obj.TrickerType) // 参数未设定 { - case ButcherType._1: + case TrickerType._1: coolTime = 10000; - serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:ButcherType1"; + serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:TrickerType1"; break; - case ButcherType._2: + case TrickerType._2: coolTime = 20000; - serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:ButcherType2"; + serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:TrickerType2"; break; - case ButcherType._3: + case TrickerType._3: coolTime = 30000; - serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:ButcherType3"; + serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:TrickerType3"; break; - case ButcherType._4: + case TrickerType._4: coolTime = 40000; - serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:ButcherType4"; + serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:TrickerType4"; break; - case ButcherType.NullButcherType: + case TrickerType.NullTrickerType: coolTime = 10000; - serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:NullButcherType"; + serial.Text = "👥" + Convert.ToString(1) + "👻" + Convert.ToString(obj.PlayerId) + "\nSkill:NullTrickerType"; break; } initialized = true; } - private void SetDynamicValue(MessageOfButcher obj) + private void SetDynamicValue(MessageOfTricker obj) { skillprogress.Value = 100 - obj.TimeUntilSkillAvailable / coolTime * 100; if (!obj.Movable) // 认为movable为真时可动 @@ -79,26 +79,29 @@ namespace Client // star.Text = "⭐：";不知道要放什么 status.Text = "🏹：" + Convert.ToString(1) + "\n🏃：" + Convert.ToString(obj.Speed) + "\n🤺：" + Convert.ToString(2) + "\n🗡：" + Convert.ToString(obj.Damage); scores.Text = "Scores:" + Convert.ToString(0); - switch (obj.Prop) + foreach(var icon in obj.Prop) { - case PropType.Ptype1: - prop.Text = "🔧"; - break; - case PropType.Ptype2: - prop.Text = "🛡"; - break; - case PropType.Ptype3: - prop.Text = "♥"; - break; - case PropType.Ptype4: - prop.Text = "⛸"; - break; - default: - prop.Text = " "; - break; + switch (icon) + { + case PropType.Ptype1: + prop.Text = "🔧"; + break; + case PropType.Ptype2: + prop.Text = "🛡"; + break; + case PropType.Ptype3: + prop.Text = "♥"; + break; + case PropType.Ptype4: + prop.Text = "⛸"; + break; + default: + prop.Text = " "; + break; + } } } - public void SetValue(MessageOfButcher obj) + public void SetValue(MessageOfTricker obj) { if (!initialized) SetStaticValue(obj); diff --git a/logic/Client/StatusBarOfSurvivor.xaml.cs b/logic/Client/StatusBarOfSurvivor.xaml.cs index cc997ef..85f1b90 100644 --- a/logic/Client/StatusBarOfSurvivor.xaml.cs +++ b/logic/Client/StatusBarOfSurvivor.xaml.cs @@ -33,74 +33,77 @@ namespace Client serial.FontSize = scores.FontSize = star.FontSize = status.FontSize = prop.FontSize = fontsize; } - private void SetStaticValue(MessageOfHuman obj) + private void SetStaticValue(MessageOfStudent obj) { - switch (obj.HumanType) // 参数未设定 + switch (obj.StudentType) // 参数未设定 { - case HumanType._1: + case StudentType._1: coolTime = 10000; - serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:HumanType1"; + serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:StudentType1"; break; - case HumanType._2: + case StudentType._2: coolTime = 20000; - serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:HumanType2"; + serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:StudentType2"; break; - case HumanType._3: + case StudentType._3: coolTime = 30000; - serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:HumanType3"; + serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:StudentType3"; break; - case HumanType._4: + case StudentType._4: coolTime = 40000; - serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:HumanType4"; + serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:StudentType4"; break; - case HumanType.NullHumanType: + case StudentType.NullStudentType: coolTime = 10000; - serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:NullHumanType"; + serial.Text = "👥" + Convert.ToString(2) + "🧓" + Convert.ToString(obj.PlayerId) + "\nSkill:NullStudentType"; break; } initialized = true; } - private void SetDynamicValue(MessageOfHuman obj) + private void SetDynamicValue(MessageOfStudent obj) { skillprogress.Value = 100 - obj.TimeUntilSkillAvailable / coolTime * 100; - if (obj.State == HumanState.Dead) + if (obj.State == StudentState.Quit) { skillprogress.Value = 0; skillprogress.Background = Brushes.Gray; } else skillprogress.Background = Brushes.White; - Func life = + Func life = (obj) => { - if (obj.State == HumanState.Dead || obj.State == HumanState.OnChair || obj.State == HumanState.Dying) + if (obj.State == StudentState.Quit || obj.State == StudentState.Addicted) return 0; else - return obj.Life; + return obj.Determination; }; // star.Text = "⭐：";准备放剩余被挂次数 - status.Text = "🔧：" + Convert.ToString(1) + "\n🏃：" + Convert.ToString(obj.Speed) + "\n♥：" + Convert.ToString(life(obj)) + "\n🛡：" + Convert.ToString(0); - scores.Text = "Scores:" + Convert.ToString(0); - switch (obj.Prop) + status.Text = "🔧：" + Convert.ToString(0) + "\n🏃：" + Convert.ToString(obj.Speed) + "\n♥：" + Convert.ToString(life(obj)) + "\n🛡：" + Convert.ToString(0); + scores.Text = "Scores:" +obj.Score; + foreach (var icon in obj.Prop) { - case PropType.Ptype1: - prop.Text = "🔧"; - break; - case PropType.Ptype2: - prop.Text = "🛡"; - break; - case PropType.Ptype3: - prop.Text = "♥"; - break; - case PropType.Ptype4: - prop.Text = "⛸"; - break; - default: - prop.Text = " "; - break; - } + switch (icon) + { + case PropType.Ptype1: + prop.Text = "🔧"; + break; + case PropType.Ptype2: + prop.Text = "🛡"; + break; + case PropType.Ptype3: + prop.Text = "♥"; + break; + case PropType.Ptype4: + prop.Text = "⛸"; + break; + default: + prop.Text = " "; + break; + } + } } - public void SetValue(MessageOfHuman obj) + public void SetValue(MessageOfStudent obj) { if (!initialized) SetStaticValue(obj); diff --git a/logic/GameClass/GameObj/Character/Character.SkillManager.cs b/logic/GameClass/GameObj/Character/Character.SkillManager.cs index 587b090..4fb1848 100644 --- a/logic/GameClass/GameObj/Character/Character.SkillManager.cs +++ b/logic/GameClass/GameObj/Character/Character.SkillManager.cs @@ -9,7 +9,7 @@ namespace GameClass.GameObj { private readonly CharacterType characterType; public CharacterType CharacterType => characterType; - private readonly IOccupation occupation; + private readonly IOccupation? occupation; public IOccupation Occupation => occupation; private Dictionary timeUntilActiveSkillAvailable = new(); diff --git a/logic/Server/CopyInfo.cs b/logic/Server/CopyInfo.cs index 9a5b038..383f749 100644 --- a/logic/Server/CopyInfo.cs +++ b/logic/Server/CopyInfo.cs @@ -183,7 +183,7 @@ namespace Server return msg; } - private static MessageOfTricker Butcher(Character player) + private static MessageOfTricker? Butcher(Character player) { MessageOfTricker msg = new MessageOfTricker(); if (!player.IsGhost()) return null;