EESAST
/
THUAI6
Not watched
1
0
Fork 0
Code
Releases 3 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

fix: 🐛 fix some bugs due to the copy errors 

fix some bugs due to copy error
tags/0.1.0
Shawqeem 2 years ago
parent
41c2a7fe79
commit
21ba17a5b9
8 changed files with 261 additions and 100 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      logic/Client/CommandLineArgs.cs
  2. +131
    -50
      logic/Client/MainWindow.xaml.cs
  3. +8
    -0
      logic/Client/Properties/launchSettings.json
  4. +56
    -20
      logic/Client/StatusBarOfHunter.xaml.cs
  5. +56
    -20
      logic/Client/StatusBarOfSurvivor.xaml.cs
  6. +0
    -8
      logic/Server/CopyInfo.cs
  7. +1
    -1
      logic/Server/Properties/launchSettings.json
  8. +8
    -0
      logic/cmd/gameServer.cmd

+ 1
- 1
logic/Client/CommandLineArgs.cs View File

@@ -18,7 +18,7 @@ namespace Client
public string Ip { get; set; } = "127.0.0.1"; public string Ip { get; set; } = "127.0.0.1";


[Option('p', "port", Required = false, HelpText = "Client listening port")] [Option('p', "port", Required = false, HelpText = "Client listening port")]
public string Port { get; set; } = "7777";
public string Port { get; set; } = "8888";


[Option('t', "teamID", Required = false, HelpText = "Client teamID")] [Option('t', "teamID", Required = false, HelpText = "Client teamID")]
public string TeamID { get; set; } = "0"; public string TeamID { get; set; } = "0";


+ 131
- 50
logic/Client/MainWindow.xaml.cs View File

@@ -119,11 +119,10 @@ namespace Client
} }
else else
{ {
if (options.PlaybackFile == DefaultArgumentOptions.FileName)
{
//if (options.PlaybackFile == DefaultArgumentOptions.FileName)
//{
try try
{ {
OnReceive();
string[] comInfo = new string[5]; string[] comInfo = new string[5];
comInfo[0] = options.Ip; comInfo[0] = options.Ip;
comInfo[1] = options.Port; comInfo[1] = options.Port;
@@ -131,16 +130,17 @@ namespace Client
comInfo[3] = options.PlayerType; comInfo[3] = options.PlayerType;
comInfo[4] = options.Occupation; comInfo[4] = options.Occupation;
ConnectToServer(comInfo); ConnectToServer(comInfo);
OnReceive();
} }
catch catch
{ {
OnReceive(); OnReceive();
} }
}
else
{
Playback(options.PlaybackFile, options.PlaybackSpeed);
}
//}
//else
//{
// Playback(options.PlaybackFile, options.PlaybackSpeed);
//}
} }
} }
private void Playback(string fileName, double pbSpeed = 2.0) private void Playback(string fileName, double pbSpeed = 2.0)
@@ -317,7 +317,7 @@ namespace Client
case 9: case 9:
mapPatches[i, j].Fill = Brushes.LightSkyBlue; mapPatches[i, j].Fill = Brushes.LightSkyBlue;
mapPatches[i, j].Stroke = Brushes.LightSkyBlue; mapPatches[i, j].Stroke = Brushes.LightSkyBlue;
break;//door
break;//gate
case 10: case 10:
foreach (var obj in listOfAll) foreach (var obj in listOfAll)
{ {
@@ -733,17 +733,26 @@ namespace Client
switch (data.Type) switch (data.Type)
{ {
case PropType.Key3: case PropType.Key3:
DrawProp(data, "🔧");
DrawProp(data, "🔑");
break; break;
case PropType.Key5: case PropType.Key5:
DrawProp(data, "🛡");
DrawProp(data, "🔑");
break; break;
case PropType.Key6: case PropType.Key6:
DrawProp(data, "♥");
DrawProp(data, "🔑");
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
DrawProp(data, "⛸"); DrawProp(data, "⛸");
break; break;
case PropType.AddHpOrAp:
DrawProp(data, "♥");
break;
case PropType.AddLifeOrAp:
DrawProp(data, "🏅");
break;
case PropType.ShieldOrSpear:
DrawProp(data, "🛡");
break;
default: default:
DrawProp(data, ""); DrawProp(data, "");
break; break;
@@ -922,19 +931,11 @@ namespace Client
{ {
switch (e.Key) switch (e.Key)
{ {
case Key.D0:
PropMsg msgP0 = new()
{
PlayerId = playerID,
PropType = PropType.Key3,
};
client.PickProp(msgP0);
break;
case Key.D1: case Key.D1:
PropMsg msgP1 = new() PropMsg msgP1 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Key5,
PropType = PropType.AddSpeed,
}; };
client.PickProp(msgP1); client.PickProp(msgP1);
break; break;
@@ -942,7 +943,7 @@ namespace Client
PropMsg msgP2 = new() PropMsg msgP2 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Key6,
PropType = PropType.AddLifeOrAp,
}; };
client.PickProp(msgP2); client.PickProp(msgP2);
break; break;
@@ -950,10 +951,42 @@ namespace Client
PropMsg msgP3 = new() PropMsg msgP3 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Ptype4,
PropType = PropType.AddHpOrAp,
}; };
client.PickProp(msgP3); client.PickProp(msgP3);
break; break;
case Key.D4:
PropMsg msgP4 = new()
{
PlayerId = playerID,
PropType = PropType.ShieldOrSpear,
};
client.PickProp(msgP4);
break;
case Key.D5:
PropMsg msgP5 = new()
{
PlayerId = playerID,
PropType = PropType.Key3,
};
client.PickProp(msgP5);
break;
case Key.D6:
PropMsg msgP6 = new()
{
PlayerId = playerID,
PropType = PropType.Key5,
};
client.PickProp(msgP6);
break;
case Key.D7:
PropMsg msgP7 = new()
{
PlayerId = playerID,
PropType = PropType.Key6,
};
client.PickProp(msgP7);
break;
default: default:
break; break;
} }
@@ -962,19 +995,11 @@ namespace Client
{ {
switch (e.Key) switch (e.Key)
{ {
case Key.D0:
PropMsg msgP0 = new()
{
PlayerId = playerID,
PropType = PropType.Key3,
};
client.UseProp(msgP0);
break;
case Key.D1: case Key.D1:
PropMsg msgP1 = new() PropMsg msgP1 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Key5,
PropType = PropType.AddSpeed,
}; };
client.UseProp(msgP1); client.UseProp(msgP1);
break; break;
@@ -982,7 +1007,7 @@ namespace Client
PropMsg msgP2 = new() PropMsg msgP2 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Key6,
PropType = PropType.AddLifeOrAp,
}; };
client.UseProp(msgP2); client.UseProp(msgP2);
break; break;
@@ -990,10 +1015,42 @@ namespace Client
PropMsg msgP3 = new() PropMsg msgP3 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Ptype4,
PropType = PropType.AddHpOrAp,
}; };
client.UseProp(msgP3); client.UseProp(msgP3);
break; break;
case Key.D4:
PropMsg msgP4 = new()
{
PlayerId = playerID,
PropType = PropType.ShieldOrSpear,
};
client.UseProp(msgP4);
break;
case Key.D5:
PropMsg msgP5 = new()
{
PlayerId = playerID,
PropType = PropType.Key3,
};
client.UseProp(msgP5);
break;
case Key.D6:
PropMsg msgP6 = new()
{
PlayerId = playerID,
PropType = PropType.Key5,
};
client.UseProp(msgP6);
break;
case Key.D7:
PropMsg msgP7 = new()
{
PlayerId = playerID,
PropType = PropType.Key6,
};
client.UseProp(msgP7);
break;
default: default:
break; break;
} }
@@ -1002,19 +1059,11 @@ namespace Client
{ {
switch (e.Key) switch (e.Key)
{ {
case Key.D0:
PropMsg msgP0 = new()
{
PlayerId = playerID,
PropType = PropType.Key3,
};
client.ThrowProp(msgP0);
break;
case Key.D1: case Key.D1:
PropMsg msgP1 = new() PropMsg msgP1 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Key5,
PropType = PropType.AddSpeed,
}; };
client.ThrowProp(msgP1); client.ThrowProp(msgP1);
break; break;
@@ -1022,7 +1071,7 @@ namespace Client
PropMsg msgP2 = new() PropMsg msgP2 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Key6,
PropType = PropType.AddLifeOrAp,
}; };
client.ThrowProp(msgP2); client.ThrowProp(msgP2);
break; break;
@@ -1030,10 +1079,42 @@ namespace Client
PropMsg msgP3 = new() PropMsg msgP3 = new()
{ {
PlayerId = playerID, PlayerId = playerID,
PropType = PropType.Ptype4,
PropType = PropType.AddHpOrAp,
}; };
client.ThrowProp(msgP3); client.ThrowProp(msgP3);
break; break;
case Key.D4:
PropMsg msgP4 = new()
{
PlayerId = playerID,
PropType = PropType.ShieldOrSpear,
};
client.ThrowProp(msgP4);
break;
case Key.D5:
PropMsg msgP5 = new()
{
PlayerId = playerID,
PropType = PropType.Key3,
};
client.ThrowProp(msgP5);
break;
case Key.D6:
PropMsg msgP6 = new()
{
PlayerId = playerID,
PropType = PropType.Key5,
};
client.ThrowProp(msgP6);
break;
case Key.D7:
PropMsg msgP7 = new()
{
PlayerId = playerID,
PropType = PropType.Key6,
};
client.ThrowProp(msgP7);
break;
default: default:
break; break;
} }
@@ -1130,14 +1211,14 @@ namespace Client
client.StartLearning(msgK); client.StartLearning(msgK);
break; break;
case Key.R: case Key.R:
IDMsg msgR = new()
{
TreatAndRescueMsg msgR = new()
{
PlayerId = playerID, PlayerId = playerID,
};
};
client.StartRescueMate(msgR); client.StartRescueMate(msgR);
break; break;
case Key.T: case Key.T:
IDMsg msgT = new()
TreatAndRescueMsg msgT = new()
{ {
PlayerId = playerID, PlayerId = playerID,
}; };


+ 8
- 0
logic/Client/Properties/launchSettings.json View File

@@ -0,0 +1,8 @@
{
"profiles": {
"Client": {
"commandName": "Project",
"commandLineArgs": "--cl --playbackFile=D:\\2_autumn\\thuai6\\playback.thuaipb --characterID=4 --type=2 --occupation=1"
}
}
}

+ 56
- 20
logic/Client/StatusBarOfHunter.xaml.cs View File

@@ -154,19 +154,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop0.Text = "🔧";
prop0.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop0.Text = "🛡";
prop0.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop0.Text = "♥";
prop0.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop0.Text = "⛸"; prop0.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop0.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop0.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop0.Text = "🛡";
break;
default: default:
prop0.Text = " ";
prop0.Text = "";
break; break;
} }
cnt++; cnt++;
@@ -175,19 +184,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop1.Text = "🔧";
prop1.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop1.Text = "🛡";
prop1.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop1.Text = "♥";
prop1.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop1.Text = "⛸"; prop1.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop1.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop1.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop1.Text = "🛡";
break;
default: default:
prop1.Text = " ";
prop1.Text = "";
break; break;
} }
cnt++; cnt++;
@@ -196,19 +214,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop2.Text = "🔧";
prop2.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop2.Text = "🛡";
prop2.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop2.Text = "♥";
prop2.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop2.Text = "⛸"; prop2.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop2.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop2.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop2.Text = "🛡";
break;
default: default:
prop2.Text = " ";
prop2.Text = "";
break; break;
} }
cnt++; cnt++;
@@ -217,19 +244,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop3.Text = "🔧";
prop3.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop3.Text = "🛡";
prop3.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop3.Text = "♥";
prop3.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop3.Text = "⛸"; prop3.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop3.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop3.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop3.Text = "🛡";
break;
default: default:
prop3.Text = " ";
prop3.Text = "";
break; break;
} }
cnt++; cnt++;


+ 56
- 20
logic/Client/StatusBarOfSurvivor.xaml.cs View File

@@ -148,19 +148,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop0.Text = "🔧";
prop0.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop0.Text = "🛡";
prop0.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop0.Text = "♥";
prop0.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop0.Text = "⛸"; prop0.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop0.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop0.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop0.Text = "🛡";
break;
default: default:
prop0.Text = " ";
prop0.Text = "";
break; break;
} }
cnt++; cnt++;
@@ -169,19 +178,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop1.Text = "🔧";
prop1.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop1.Text = "🛡";
prop1.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop1.Text = "♥";
prop1.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop1.Text = "⛸"; prop1.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop1.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop1.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop1.Text = "🛡";
break;
default: default:
prop1.Text = " ";
prop1.Text = "";
break; break;
} }
cnt++; cnt++;
@@ -190,19 +208,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop2.Text = "🔧";
prop2.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop2.Text = "🛡";
prop2.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop2.Text = "♥";
prop2.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop2.Text = "⛸"; prop2.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop2.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop2.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop2.Text = "🛡";
break;
default: default:
prop2.Text = " ";
prop2.Text = "";
break; break;
} }
cnt++; cnt++;
@@ -211,19 +238,28 @@ namespace Client
switch (icon) switch (icon)
{ {
case PropType.Key3: case PropType.Key3:
prop3.Text = "🔧";
prop3.Text = "🔑";
break; break;
case PropType.Key5: case PropType.Key5:
prop3.Text = "🛡";
prop3.Text = "🔑";
break; break;
case PropType.Key6: case PropType.Key6:
prop3.Text = "♥";
prop3.Text = "🔑";
break; break;
case PropType.Ptype4:
case PropType.AddSpeed:
prop3.Text = "⛸"; prop3.Text = "⛸";
break; break;
case PropType.AddLifeOrAp:
prop3.Text = "🏅";
break;
case PropType.AddHpOrAp:
prop3.Text = "♥";
break;
case PropType.ShieldOrSpear:
prop3.Text = "🛡";
break;
default: default:
prop3.Text = " ";
prop3.Text = "";
break; break;
} }
cnt++; cnt++;


+ 0
- 8
logic/Server/CopyInfo.cs View File

@@ -48,14 +48,6 @@ namespace Server
{ {
switch (prop) switch (prop)
{ {
case Preparation.Utility.PropType.AddSpeed:
return Protobuf.PropType.AddSpeed;
case Preparation.Utility.PropType.AddLifeOrAp:
return Protobuf.PropType.AddLifeOrAp;
case Preparation.Utility.PropType.AddHpOrAp:
return Protobuf.PropType.AddHpOrAp;
case Preparation.Utility.PropType.ShieldOrSpear:
return Protobuf.PropType.ShieldOrSpear;
case Preparation.Utility.PropType.Key3: case Preparation.Utility.PropType.Key3:
return Protobuf.PropType.Key3; return Protobuf.PropType.Key3;
case Preparation.Utility.PropType.Key5: case Preparation.Utility.PropType.Key5:


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

@@ -2,7 +2,7 @@
"profiles": { "profiles": {
"Server": { "Server": {
"commandName": "Project", "commandName": "Project",
"commandLineArgs": "-p 8888\r\n-f playback\r\n-g 600\r\n-b true\r\n-c 4\r\n-t 2"
"commandLineArgs": "-p 8888 -t 2 -c 4"
} }
} }
} }

+ 8
- 0
logic/cmd/gameServer.cmd View File

@@ -0,0 +1,8 @@
@echo off

start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --port 8888 --teamCount 1 --playerCount 1 --gameTimeInSecond 600 --fileName test

ping -n 4 127.0.0.1 > NUL

::start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port=8888 --characterID=0 --type=1 --occupation=1


Write Preview
Loading…
Cancel
Save