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

修复 结算问题

Browse Source
This commit is contained in:
aozhiwei 2020-03-31 16:56:13 +08:00
parent 56655f41fb
commit 0697a62beb
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/human.cc
View File

@ -2957,3 +2957,15 @@ void Human::AutoChgWeapon()
curr_weapon = &weapons[0]; curr_weapon = &weapons[0];
} }
} }
void Human::CancelRevive()
{
if (dead && revive_timer && !real_dead) {
dead = true;
real_dead = true;
downed = false;
FreeDownedTimer();
OnDie();
FreeReviveTimer();
}
}

1
server/gameserver/human.h
View File

@ -250,6 +250,7 @@ protected:
Buff* GetBuffById(int buff_id); Buff* GetBuffById(int buff_id);
void ProcSkillPhase(MetaData::SkillPhase* phase); void ProcSkillPhase(MetaData::SkillPhase* phase);
void AutoChgWeapon(); void AutoChgWeapon();
void CancelRevive();
private: private:
void ClearFrameData(); void ClearFrameData();

10
server/gameserver/player.cc
View File

@ -1103,6 +1103,7 @@ void Player::_CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg)
void Player::_CMGameOver(f8::MsgHdr& hdr, const cs::CMGameOver& msg) void Player::_CMGameOver(f8::MsgHdr& hdr, const cs::CMGameOver& msg)
{ {
CancelRevive();
SendGameOver(); SendGameOver();
} }
@ -1161,12 +1162,5 @@ void Player::_CMRevive(f8::MsgHdr& hdr, const cs::CMRevive& msg)
void Player::_CMCancelRevive(f8::MsgHdr& hdr, const cs::CMCancelRevive& msg) void Player::_CMCancelRevive(f8::MsgHdr& hdr, const cs::CMCancelRevive& msg)
{ {
if (dead && revive_timer && !real_dead) { CancelRevive();
dead = true;
real_dead = true;
downed = false;
FreeDownedTimer();
OnDie();
FreeReviveTimer();
}
} }