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

1

Browse Source
This commit is contained in:
aozhiwei 2022-08-29 20:35:00 +08:00
commit e087441e0a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -1062,7 +1062,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
downed = false; downed = false;
SetHP(0.0f); SetHP(0.0f);
KillMgr::Instance()->OnHumanDead(this, &info); KillMgr::Instance()->OnHumanDead(this, &info);
room->frame_event.AddDead(GetWeakPtrRef(), MetaMgr::Instance()->revive_time); room->frame_event.AddDead(GetWeakPtrRef(), 1000 * 60);
} else { } else {
GetTrigger()->Die(); GetTrigger()->Die();
dead = true; dead = true;
@ -1083,7 +1083,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
return; return;
} }
#ifdef DEBUG #ifdef DEBUG
#if 1 #if 0
if (IsPlayer()) { if (IsPlayer()) {
return; return;
} }

2
server/gameserver/player.cc
View File

@ -44,6 +44,7 @@ void Player::Initialize()
SetInfiniteBulletMode(); SetInfiniteBulletMode();
} }
#ifdef DEBUG #ifdef DEBUG
#if 0
room->xtimer.AddDeadLineTimerAndAttach room->xtimer.AddDeadLineTimerAndAttach
(SERVER_FRAME_RATE * 10, (SERVER_FRAME_RATE * 10,
a8::XParams() a8::XParams()
@ -54,6 +55,7 @@ void Player::Initialize()
hum->SetHP(hum->GetHP() - 100); hum->SetHP(hum->GetHP() - 100);
}, },
&xtimer_attacher.timer_list_); &xtimer_attacher.timer_list_);
#endif
#endif #endif
} }

2
server/gameserver/room.cc
View File

@ -935,7 +935,7 @@ Human* Room::GetWatchWarTarget(Human* hum)
bool Room::BattleStarted() bool Room::BattleStarted()
{ {
return battle_start_frameno_ != 0; return battle_start_frameno_ != 0 || IsPveRoom();
} }
int Room::GetAliveTeamNum() int Room::GetAliveTeamNum()