From c7175b302181ebf27c68d34962c3bac0f93b67f4 Mon Sep 17 00:00:00 2001 From: Shawqeem <1004837646@qq.com> Date: Thu, 4 May 2023 17:27:06 +0800 Subject: [PATCH] refactor: :poop: Temporarily removed the 'place' property to accommodate the needs of the new version. Temporarily removed the 'place' property to accommodate the needs of the new version. --- logic/Client/MainWindow.xaml.cs | 140 ++++++++++++++++---------------- logic/cmd/PlaybackServer.cmd | 2 +- logic/cmd/video.cmd | 4 + 3 files changed, 75 insertions(+), 71 deletions(-) create mode 100644 logic/cmd/video.cmd diff --git a/logic/Client/MainWindow.xaml.cs b/logic/Client/MainWindow.xaml.cs index d8dd6b5..bdb1b4b 100644 --- a/logic/Client/MainWindow.xaml.cs +++ b/logic/Client/MainWindow.xaml.cs @@ -572,96 +572,96 @@ namespace Client private bool CanSee(MessageOfStudent msg) { - if (msg.PlayerState == PlayerState.Quit || msg.PlayerState == PlayerState.Graduated) - return false; - if (isSpectatorMode || isPlaybackMode) - return true; - if (humanOrButcher && human != null) - { - if (msg.Place == human.Place) - return true; - if (msg.PlayerId == playerID + Preparation.Utility.GameData.numOfPeople)//robot and its owner - return true; - } - else if (!humanOrButcher && butcher != null) - { - if (msg.Place == butcher.Place) - return true; - } - if (msg.Place == Protobuf.PlaceType.Grass) - return false; + //if (msg.PlayerState == PlayerState.Quit || msg.PlayerState == PlayerState.Graduated) + // return false; + //if (isSpectatorMode || isPlaybackMode) + // return true; + //if (humanOrButcher && human != null) + //{ + // if (msg.Place == human.Place) + // return true; + // if (msg.PlayerId == playerID + Preparation.Utility.GameData.numOfPeople)//robot and its owner + // return true; + //} + //else if (!humanOrButcher && butcher != null) + //{ + // if (msg.Place == butcher.Place) + // return true; + //} + //if (msg.Place == Protobuf.PlaceType.Grass) + // return false; return true; } private bool CanSee(MessageOfTricker msg) { - if (isSpectatorMode || isPlaybackMode) - return true; - if (!humanOrButcher && butcher != null) - { - if (butcher.Guid == msg.Guid) // 自己能看见自己 - return true; - } - if (humanOrButcher && human != null) - { - if (msg.TrickerType == Protobuf.TrickerType.Assassin) - { - foreach (var buff in msg.Buff) - { - if (buff == Protobuf.TrickerBuffType.TrickerInvisible) - return false; - } - } - if (msg.Place == human.Place) - return true; - } - if (msg.Place == Protobuf.PlaceType.Grass) - return false; + //if (isSpectatorMode || isPlaybackMode) + // return true; + //if (!humanOrButcher && butcher != null) + //{ + // if (butcher.Guid == msg.Guid) // 自己能看见自己 + // return true; + //} + //if (humanOrButcher && human != null) + //{ + // if (msg.TrickerType == Protobuf.TrickerType.Assassin) + // { + // foreach (var buff in msg.Buff) + // { + // if (buff == Protobuf.TrickerBuffType.TrickerInvisible) + // return false; + // } + // } + // if (msg.Place == human.Place) + // return true; + //} + //if (msg.Place == Protobuf.PlaceType.Grass) + // return false; return true; } private bool CanSee(MessageOfProp msg) { - if (isSpectatorMode || isPlaybackMode) - return true; - if (humanOrButcher && human != null) - { - if (msg.Place == human.Place) - return true; - } - else if (!humanOrButcher && butcher != null) - { - if (msg.Place == butcher.Place) - return true; - } - if (msg.Place == Protobuf.PlaceType.Grass) - return false; + //if (isSpectatorMode || isPlaybackMode) + // return true; + //if (humanOrButcher && human != null) + //{ + // if (msg.Place == human.Place) + // return true; + //} + //else if (!humanOrButcher && butcher != null) + //{ + // if (msg.Place == butcher.Place) + // return true; + //} + //if (msg.Place == Protobuf.PlaceType.Grass) + // return false; return true; } private bool CanSee(MessageOfBullet msg) { - if (isSpectatorMode || isPlaybackMode) - return true; - if (humanOrButcher && human != null) - { - if (msg.Place == human.Place) - return true; - } - else if (!humanOrButcher && butcher != null) - { - if (msg.Place == butcher.Place) - return true; - } - if (msg.Place == Protobuf.PlaceType.Grass) - return false; + //if (isSpectatorMode || isPlaybackMode) + // return true; + //if (humanOrButcher && human != null) + //{ + // if (msg.Place == human.Place) + // return true; + //} + //else if (!humanOrButcher && butcher != null) + //{ + // if (msg.Place == butcher.Place) + // return true; + //} + //if (msg.Place == Protobuf.PlaceType.Grass) + // return false; return true; } private bool CanSee(MessageOfBombedBullet msg) { - if (isSpectatorMode || isPlaybackMode) - return true; + //if (isSpectatorMode || isPlaybackMode) + // return true; //if (humanOrButcher && human != null) //{ // if (msg.Place == human.Place) diff --git a/logic/cmd/PlaybackServer.cmd b/logic/cmd/PlaybackServer.cmd index 916c9ea..e1e3fae 100644 --- a/logic/cmd/PlaybackServer.cmd +++ b/logic/cmd/PlaybackServer.cmd @@ -1,2 +1,2 @@ @echo off -start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --port 8888 --fileName .\ladder1.thuaipb --playback --playbackSpeed 4.0 +start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --port 8888 --fileName .\cannot.thuaipb --playback --playbackSpeed 2.0 diff --git a/logic/cmd/video.cmd b/logic/cmd/video.cmd new file mode 100644 index 0000000..0518998 --- /dev/null +++ b/logic/cmd/video.cmd @@ -0,0 +1,4 @@ +@echo off + + +start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --ip thuai6.eesast.com --port 8889 --characterID 2030 \ No newline at end of file