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

小于5个人的时候不复活

Browse Source
This commit is contained in:
aozhiwei 2020-04-21 09:56:23 +08:00
parent 97c7d1d5e8
commit b3b3e2f6ea
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -858,7 +858,8 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
dead_frameno = room->frame_no; dead_frameno = room->frame_no;
++dead_times; ++dead_times;
int max_revive_times = MetaMgr::Instance()->GetSysParamAsInt("max_revive_times", 1); int max_revive_times = MetaMgr::Instance()->GetSysParamAsInt("max_revive_times", 1);
if (weapon_id != VW_Spectate && if (AliveCount() >= 5 &&
weapon_id != VW_Spectate &&
dead_times <= max_revive_times && dead_times <= max_revive_times &&
room->AliveCount() > 2 && room->AliveCount() > 2 &&
entity_subtype == EST_Player) { entity_subtype == EST_Player) {

5
server/gameserver/roommgr.cc
View File

@ -322,5 +322,8 @@ void RoomMgr::InstallReportStateTimer()
bool RoomMgr::IsLimitJoin() bool RoomMgr::IsLimitJoin()
{ {
return RoomNum() >= ROOM_NUM_UP_LIMIT || return RoomNum() >= ROOM_NUM_UP_LIMIT ||
(RoomNum() >= ROOM_NUM_DOWN_LIMIT && App::Instance()->perf.alive_count >= HUM_NUM_DOWN_LIMIT); (
RoomNum() >= ROOM_NUM_DOWN_LIMIT &&
App::Instance()->perf.alive_count >= HUM_NUM_DOWN_LIMIT
);
} }