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

1

Browse Source
This commit is contained in:
aozhiwei 2019-11-01 20:16:54 +08:00
parent f4ed36059a
commit cb049f5bcd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -148,15 +148,15 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
} }
FillBodyState(p->mutable_states()); FillBodyState(p->mutable_states());
if (dead) { if (dead) {
p->set_killer_name(stats.killer_name);
p->set_killer_id(stats.killer_id);
if (real_dead){ if (real_dead){
p->set_can_revive(false); p->set_can_revive(false);
p->set_killer_name(stats.killer_name);
} else { } else {
p->set_can_revive(true); p->set_can_revive(true);
int countdown = std::ceil(room->xtimer.GetRemainTime(revive_timer) / SERVER_FRAME_RATE); int countdown = std::ceil(room->xtimer.GetRemainTime(revive_timer) / SERVER_FRAME_RATE);
countdown = std::max(0, countdown - kReviveTimeAdd); countdown = std::max(0, countdown - kReviveTimeAdd);
p->set_revive_countdown(countdown); p->set_revive_countdown(countdown);
p->set_killer_name(stats.killer_name);
} }
} }
} }

1
server/tools/protobuild/cs_proto.proto
View File

@ -201,6 +201,7 @@ message MFPlayerFull
optional bool can_revive = 30; //是否可复活 optional bool can_revive = 30; //是否可复活
optional int32 revive_countdown = 31; //复活倒计时 optional int32 revive_countdown = 31; //复活倒计时
optional string killer_name = 32; //杀手名称 optional string killer_name = 32; //杀手名称
optional int32 killer_id = 33; //杀手id(自杀时为自己) 特殊id: -1:倒在安全区
} }
//阻挡物-部分 //阻挡物-部分