Skip to content

fix: 🐛 fix the bug that the mapMessage cannot be received correct… #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Timothy-Liuxf merged 2 commits into from
May 15, 2023
Merged

fix: 🐛 fix the bug that the mapMessage cannot be received correct… #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e253333
fix: :bug: fix the bug that the mapMessage cannot be received correct…
Shawqeem May 15, 2023
f2181cb
style
Timothy-Liuxf May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions logic/Client/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,11 @@ private async void OnReceive() // 已按照3.5版proto更新信息，但是左
listOfHiddenGate.Clear();
listOfGate.Clear();
MessageToClient content = responseStream.ResponseStream.Current;
MessageOfMap mapMessage = new MessageOfMap();
bool mapMessageExist = false;
switch (content.GameState)
{
case GameState.GameStart:
MessageOfMap mapMessage = new MessageOfMap();
foreach (var obj in content.ObjMessage)
{
switch (obj.MessageOfObjCase)
Expand Down Expand Up @@ -530,11 +531,12 @@ private async void OnReceive() // 已按照3.5版proto更新信息，但是左
break;
}
}
listOfAll.Add(content.AllMessage);
countList.Clear();
countList.Add(listOfClassroom.Count);
countList.Add(listOfDoor.Count);
countList.Add(listOfChest.Count);
countList.Add(listOfGate.Count);
listOfAll.Add(content.AllMessage);
GetMap(mapMessage);
break;
case GameState.GameRunning:
Expand Down Expand Up @@ -581,11 +583,22 @@ private async void OnReceive() // 已按照3.5版proto更新信息，但是左
listOfHiddenGate.Add(obj.HiddenGateMessage);
break;
case MessageOfObj.MessageOfObjOneofCase.MapMessage:
GetMap(obj.MapMessage);
mapMessage = obj.MapMessage;
mapMessageExist = true;//只有中间加入游戏的旁观者着一种可能，使得在这里收到地图
break;
}
}
listOfAll.Add(content.AllMessage);
if (mapMessageExist)
{
countList.Clear();
countList.Add(listOfClassroom.Count);
countList.Add(listOfDoor.Count);
countList.Add(listOfChest.Count);
countList.Add(listOfGate.Count);
GetMap(mapMessage);
mapMessageExist = false;
}
break;
case GameState.GameEnd:
MessageBox.Show("Game Over!");
Expand Down
7 changes: 0 additions & 7 deletions logic/cmd/gameServerAndClient.cmd
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions logic/cmd/spectatorForDebug.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off


start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --port 8888 --characterID 2030
0 logic/cmd/playback.cmd → logic/cmd/spectatorForLadder.cmd
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions logic/cmd/video.cmd
View file
Open in desktop

This file was deleted.