From ac9204557c05289b1d8eb63377ecca2507591fa2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 31 Jul 2020 19:25:40 +0800 Subject: [PATCH] 1 --- server/gameserver/constant.h | 1 + server/gameserver/human.cc | 9 +++++++-- server/gameserver/room.cc | 4 +++- server/gameserver/zombiemode.ai.cc | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index ef4699f..e2ce0cc 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -138,6 +138,7 @@ enum BuffEffectType_e kBET_CliEffect1 = 19, //僵尸被动光环减速(客户端表现用) kBET_CliEffect2 = 20, //僵尸被动光环毒物(客户端表现用) kBET_CliEffect3 = 21, //僵尸被动光环地震(客户端表现用) + kBET_CliEffect4 = 22, //被拖拽(客户端表现用) kBET_End }; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index b7b0b1a..e6ddf90 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1919,7 +1919,12 @@ void Human::_UpdateSpecMove() } RemoveBuffByEffectId(kBET_JumpTo); } - if (GetBuffByEffectId(kBET_BePull)) { + buff = GetBuffByEffectId(kBET_BePull); + if (buff) { + MetaData::Buff* new_buff = MetaMgr::Instance()->GetBuff(1039); + if (new_buff) { + AddBuff(this, new_buff, 1); + } RemoveBuffByEffectId(kBET_BePull); } } @@ -3080,7 +3085,7 @@ void Human::ProcBuffEffect(Human* caster, Buff* buff) { room->xtimer.AddDeadLineTimerAndAttach ( - SERVER_FRAME_RATE * buff->meta->param1 / 1000.0f, + SERVER_FRAME_RATE * buff->meta->param1, a8::XParams() .SetSender(this) .SetParam1(caster) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 2eacae3..18f9342 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2664,11 +2664,13 @@ void Room::AddPlayerPostProc(Player* hum) } } if (GetRoomMode() == kZombieMode) { +#ifdef DEBUG #if 0 - hum->ChangeToRace(kZombieRace, 3); + hum->ChangeToRace(kZombieRace, 2); #else hum->ChangeToRace(kHumanRace, 1); #endif +#endif } #ifdef DEBUG xtimer.AddRepeatTimerAndAttach diff --git a/server/gameserver/zombiemode.ai.cc b/server/gameserver/zombiemode.ai.cc index 759d663..4959e46 100644 --- a/server/gameserver/zombiemode.ai.cc +++ b/server/gameserver/zombiemode.ai.cc @@ -411,7 +411,7 @@ Human* ZombieModeAI::GetTarget() target = nullptr; } #endif - #if 0 + #if 1 if (target->IsPlayer()) { target = nullptr; }