From 067f582f286d4e8ef26677a3dd377d983852f4b4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 8 May 2019 11:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8C=E5=AD=90=E5=BC=B9=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/bullet.cc | 2 +- server/gameserver/player.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 132d00b..cc84889 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -151,7 +151,7 @@ void Bullet::ProcBomb() for (auto& grid : grid_list) { for (Human* hum: grid->human_list) { #if 1 - if (hum != player) { + { #else if (hum != player && (hum->team_id == 0 || player->team_id != hum->team_id)) { diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index cba84be..378e31a 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -154,12 +154,12 @@ void Player::UpdateShot() ++series_shot_frames; if (last_shot_frameno_ == 0 || ( - (room->frame_no - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE)) > + (room->frame_no - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE)) >= curr_weapon->meta->i->fire_rate() ) { Shot(); } - if (series_shot_frames > 4) { + if (series_shot_frames > 8) { shot_hold = false; series_shot_frames = 0; }