diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 13000ac..75f5771 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -148,15 +148,15 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data) } FillBodyState(p->mutable_states()); if (dead) { + p->set_killer_name(stats.killer_name); + p->set_killer_id(stats.killer_id); if (real_dead){ p->set_can_revive(false); - p->set_killer_name(stats.killer_name); } else { p->set_can_revive(true); int countdown = std::ceil(room->xtimer.GetRemainTime(revive_timer) / SERVER_FRAME_RATE); countdown = std::max(0, countdown - kReviveTimeAdd); p->set_revive_countdown(countdown); - p->set_killer_name(stats.killer_name); } } } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index d6faee2..b16d411 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -201,6 +201,7 @@ message MFPlayerFull optional bool can_revive = 30; //是否可复活 optional int32 revive_countdown = 31; //复活倒计时 optional string killer_name = 32; //杀手名称 + optional int32 killer_id = 33; //杀手id(自杀时为自己) 特殊id: -1:倒在安全区 } //阻挡物-部分