From b526e5dd3d932c8fc541be246b801c08b6e3d018 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 May 2023 15:48:31 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 1 + server/tools/protobuild/cs_proto.proto | 1 + 2 files changed, 2 insertions(+) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 6191047b..38978de2 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -1397,6 +1397,7 @@ void Human::FillMFGasData(cs::MFGasData* gas_data) long long duration = room->GetGasInactiveTime() * SERVER_FRAME_RATE - (room->GetFrameNo() - room->GetGasData().gas_start_frameno); 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) { gas_data->set_duration(0); } else if (room->GetGasData().GetGasMode() == GasMoving) { diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 6e78e60d..6792c30f 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -650,6 +650,7 @@ message MFGasData */ optional int32 mode = 1; //0:inactive 1:waiting 2:moving 3:jump optional float duration = 2; //持续时间(秒) + optional float total_duration = 7; //总时间(秒)，只在inactive时有效 optional MFVec3 pos_old = 3; //前一个圆心 optional MFVec3 pos_new = 4; //新圆心 optional float rad_old = 5; //前一个圆半径