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

复活添加变身buff

Browse Source
This commit is contained in:
aozhiwei 2020-05-22 13:48:10 +08:00
parent 3af2905498
commit 2038ae2ae2
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
server/gameserver/player.cc
View File

@ -1162,6 +1162,7 @@ void Player::_CMRevive(f8::MsgHdr& hdr, const cs::CMRevive& msg)
} }
} }
#endif #endif
InternalAdOk();
} }
} }
@ -1221,13 +1222,34 @@ void Player::_CMAdEnd(f8::MsgHdr& hdr, const cs::CMAdEnd& msg)
if (GetBuffByEffectId(kBET_LordMode)) { if (GetBuffByEffectId(kBET_LordMode)) {
return; return;
} }
InternalAdOk();
}
void Player::InternalAdCancel()
{
if (GetBuffByEffectId(kBET_AdPlaying)) { if (GetBuffByEffectId(kBET_AdPlaying)) {
RemoveBuffByEffectId(kBET_AdPlaying);
if (ad_timer_) {
room->xtimer.DeleteTimer(ad_timer_);
ad_timer_ = nullptr;
}
}
if (GetBuffByEffectId(kBET_LordMode)) {
return;
}
}
void Player::InternalAdOk()
{
if (a8::HasBitFlag(status, HS_AlreadyLordMode)) {
return;
}
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(ADPLAY_BUFFID); MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(ADPLAY_BUFFID);
if (buff_meta) { if (buff_meta) {
MetaData::Buff* lord_buff_meta = nullptr; MetaData::Buff* lord_buff_meta = nullptr;
if (msg.param() == 1) { if (rand() % 2 < 1) {
lord_buff_meta = MetaMgr::Instance()->GetBuff(buff_meta->param1); lord_buff_meta = MetaMgr::Instance()->GetBuff(buff_meta->param1);
} else if (msg.param() == 2) { } else {
lord_buff_meta = MetaMgr::Instance()->GetBuff(buff_meta->param2); lord_buff_meta = MetaMgr::Instance()->GetBuff(buff_meta->param2);
} }
if (lord_buff_meta) { if (lord_buff_meta) {
@ -1249,19 +1271,4 @@ void Player::_CMAdEnd(f8::MsgHdr& hdr, const cs::CMAdEnd& msg)
room->xtimer.DeleteTimer(ad_timer_); room->xtimer.DeleteTimer(ad_timer_);
ad_timer_ = nullptr; ad_timer_ = nullptr;
} }
}
}
void Player::InternalAdCancel()
{
if (GetBuffByEffectId(kBET_AdPlaying)) {
RemoveBuffByEffectId(kBET_AdPlaying);
if (ad_timer_) {
room->xtimer.DeleteTimer(ad_timer_);
ad_timer_ = nullptr;
}
}
if (GetBuffByEffectId(kBET_LordMode)) {
return;
}
} }

1
server/gameserver/player.h
View File

@ -101,4 +101,5 @@ class Player : public Human
private: private:
void InternalAdCancel(); void InternalAdCancel();
void InternalAdOk();
}; };