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-10-24 16:59:39 +08:00
parent 6df8824efd
commit 2257b1bff8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/human.cc
View File

@ -23,6 +23,8 @@
#include "framework/cpp/utils.h" #include "framework/cpp/utils.h"
#include "framework/cpp/httpclientpool.h" #include "framework/cpp/httpclientpool.h"
const int kReviveTimeAdd = 3;
Human::Human():Entity() Human::Human():Entity()
{ {
default_weapon.weapon_idx = 0; default_weapon.weapon_idx = 0;
@ -150,7 +152,9 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_can_revive(false); p->set_can_revive(false);
} else { } else {
p->set_can_revive(true); p->set_can_revive(true);
p->set_revive_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);
p->set_revive_countdown(countdown);
p->set_killer_name(stats.killer_name); p->set_killer_name(stats.killer_name);
} }
} }
@ -2405,7 +2409,7 @@ void Human::Revive()
hum->real_dead = true; hum->real_dead = true;
hum->OnDie(); hum->OnDie();
}; };
int wait_revive_time = MetaMgr::Instance()->GetSysParamAsInt("revive_time", 33); int wait_revive_time = MetaMgr::Instance()->GetSysParamAsInt("revive_time", 30 + kReviveTimeAdd);
revive_timer = room->xtimer.AddDeadLineTimerAndAttach(SERVER_FRAME_RATE * wait_revive_time, revive_timer = room->xtimer.AddDeadLineTimerAndAttach(SERVER_FRAME_RATE * wait_revive_time,
a8::XParams() a8::XParams()
.SetSender(this), .SetSender(this),