server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-06-03 10:45:46 +08:00
parent d231975dbb
commit 781dc2f18d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/pbutils.cc
View File

@ -1406,7 +1406,6 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
long long duration = room->GetGasInactiveTime() * SERVER_FRAME_RATE - long long duration = room->GetGasInactiveTime() * SERVER_FRAME_RATE -
(room->GetFrameNo() - room->GetGasData().gas_start_frameno); (room->GetFrameNo() - room->GetGasData().gas_start_frameno);
gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000); gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
gas_data->set_total_duration(room->GetGasInactiveTime());
} else if (room->GetGasData().GetGasMode() == GasJump) { } else if (room->GetGasData().GetGasMode() == GasJump) {
gas_data->set_duration(0); gas_data->set_duration(0);
} else if (room->GetGasData().GetGasMode() == GasMoving) { } else if (room->GetGasData().GetGasMode() == GasMoving) {
@ -1430,6 +1429,11 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
gas_data->set_duration(0); gas_data->set_duration(0);
} }
} }
{
long long passed_frame_num = room->GetFrameNo() - room->GetGasData().gas_start_frameno;
float time = std::max(0.0f, gas_data->duration() - passed_frame_num / SERVER_FRAME_RATE) + 1;
gas_data->set_total_duration(time);
}
// 333 // 333
{ {
glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y); glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y);