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

1

Browse Source
This commit is contained in:
aozhiwei 2021-09-06 11:36:26 +08:00
parent 4d3f3c43ee
commit ef03b4c83a
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/human.cc
View File

@ -248,7 +248,8 @@ void Human::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data
if (revive_timer) {
countdown = std::ceil(room->xtimer.GetRemainTime(revive_timer) / SERVER_FRAME_RATE);
} else {
a8::UdpLog::Instance()->Warning("Human::FillMFObjectfull revive_timer == nullptr "
a8::UdpLog::Instance()->Warning
("Human::FillMFObjectfull revive_timer == nullptr "
"dead_frameno:%d dead_times:%d alive_count:%d "
"room.frameno:%d",
{
@ -2410,8 +2411,10 @@ void Human::Revive()
hum->downed = false;
hum->OnDie();
};
int wait_revive_time = MetaMgr::Instance()->GetSysParamAsInt("revive_time", 25) + kReviveTimeAdd;
revive_timer = room->xtimer.AddDeadLineTimerAndAttach(SERVER_FRAME_RATE * wait_revive_time,
int wait_revive_time = MetaMgr::Instance()->GetSysParamAsInt("revive_time", 25) +
kReviveTimeAdd;
revive_timer = room->xtimer.AddDeadLineTimerAndAttach
(SERVER_FRAME_RATE * wait_revive_time,
a8::XParams()
.SetSender(this),
callback,
@ -2565,7 +2568,8 @@ void Human::NotifyObservers(cs::SMUpdate* msg, cs::MFActivePlayerData* active_pl
e->FillMFObjectFull(room, observer, full_obj);
#ifdef DEBUG
ObjectSyncFlags* new_sync_flags = observer->GetObjectSyncFlags(e->GetUniId());
observer->SendDebugMsg(a8::Format(
observer->SendDebugMsg
(a8::Format(
"resync full frameno:%d uniid:%d net_flags:%d f2:%d "
"old_flags:%d,%d new_flags:%d,%d",
{