Browse Source

Merge pull request #288 from Shawqeem/dev

add lock sign to the hidden gate
tags/0.1.0
shangfengh GitHub 2 years ago
parent
commit
f2c6e0d905
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 4 deletions
  1. +9
    -1
      logic/Client/MainWindow.xaml.cs
  2. +1
    -1
      logic/Client/Properties/launchSettings.json
  3. +1
    -1
      logic/cmd/gameServer.cmd
  4. BIN
      resource/client.png
  5. BIN
      resource/client2.png
  6. +1
    -1
      使用文档.md

+ 9
- 1
logic/Client/MainWindow.xaml.cs View File

@@ -102,8 +102,13 @@ namespace Client
private void ReactToCommandline() private void ReactToCommandline()
{ {
string[] args = Environment.GetCommandLineArgs(); string[] args = Environment.GetCommandLineArgs();
if (args.Length == 2)
{
Playback(args[1]);
return;
}
_ = Parser.Default.ParseArguments<ArgumentOptions>(args).WithParsed(o => _ = Parser.Default.ParseArguments<ArgumentOptions>(args).WithParsed(o =>
{ options = o; });
{ options = o; });
if (options != null && Convert.ToInt64(options.PlayerID) > 2023) if (options != null && Convert.ToInt64(options.PlayerID) > 2023)
{ {
isSpectatorMode = true; isSpectatorMode = true;
@@ -566,6 +571,8 @@ namespace Client
{ {
if (msg.Place == human.Place) if (msg.Place == human.Place)
return true; return true;
if (human.StudentType == StudentType.TechOtaku && msg.PlayerId == playerID + Preparation.Utility.GameData.numOfPeople)
return true;
} }
else if (!humanOrButcher && butcher != null) else if (!humanOrButcher && butcher != null)
{ {
@@ -1025,6 +1032,7 @@ namespace Client
BorderBrush = Brushes.Transparent, BorderBrush = Brushes.Transparent,
IsReadOnly = true IsReadOnly = true
}; };
UpperLayerOfMap.Children.Add(icon);
} }
} }
//} //}


+ 1
- 1
logic/Client/Properties/launchSettings.json View File

@@ -2,7 +2,7 @@
"profiles": { "profiles": {
"Client": { "Client": {
"commandName": "Project", "commandName": "Project",
"commandLineArgs": "--playbackFile .\\video.thuaipb"
"commandLineArgs": "--port 8888 --characterID 3 --type 1 --occupation 5"
} }
} }
} }

+ 1
- 1
logic/cmd/gameServer.cmd View File

@@ -1,6 +1,6 @@
@echo off @echo off


start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --ip 0.0.0.0 --port 8888 --studentCount 4 --trickerCount 1 --gameTimeInSecond 60 --fileName video
start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --ip 0.0.0.0 --port 8888 --studentCount 4 --trickerCount 1 --gameTimeInSecond 600 --fileName video


ping -n 2 127.0.0.1 > NUL ping -n 2 127.0.0.1 > NUL




BIN
resource/client.png View File

Before After
Width: 1615  |  Height: 1096  |  Size: 138 kB Width: 10848  |  Height: 6780  |  Size: 8.8 MB

BIN
resource/client2.png View File

Before After
Width: 1650  |  Height: 1107  |  Size: 149 kB

+ 1
- 1
使用文档.md View File

@@ -132,7 +132,7 @@ Server脚本中参数格式一般如下:


### 界面介绍 ### 界面介绍


* 固定方块:红色方块代表墙,绿色方块代表草,灰色方块代表窗户,黄色带锁标志的方块代表门
* 固定方块:红色方块代表墙,绿色方块代表草,灰色方块代表窗户,黄色带锁标志的方块代表门,浅橙红色代表隐藏校门


* 动态方块:蓝色方块代表大门,橙色方块代表箱子,粉色方块代表教室,上面的数字均代表进度 * 动态方块:蓝色方块代表大门,橙色方块代表箱子,粉色方块代表教室,上面的数字均代表进度




Loading…
Cancel
Save