From 2bd65f7d38da8a8d741c9d1650720ca00eaa78dc Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 20 Apr 2020 15:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8B=E5=86=9B=E7=81=AB=E7=AE=AD=E7=AD=92?= =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/bullet.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 575c0e9..828337d 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -126,6 +126,10 @@ void Bullet::ProcBomb() for (auto& grid : grid_list) { for (Human* hum: grid->human_list) { if (!is_tank_skin || player->team_id != hum->team_id) { + //友军火箭筒伤害取消 + if (meta->i->_inventory_slot() == 4 && player->team_id == hum->team_id) { + continue; + } if (TestCollision(hum)) { objects.insert(hum); }