From d1f5070371e33328ee7566aee0d974eae9e15da2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 29 Jun 2021 09:49:14 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=83=9F=E9=9B=BE=E5=BC=B9?= =?UTF-8?q?=EF=BC=8C=E7=87=83=E7=83=A7=E5=BC=B9=E6=8C=81=E7=BB=AD=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E5=BB=B6=E9=95=BFX=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/roomobstacle.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 75531e4..1c13d12 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -195,7 +195,12 @@ void RoomObstacle::SpecExplosion() ); } } - if (explosion_times_ >= meta->i->explosion_times()) { + int total_explosion_times = meta->i->explosion_times(); + if (context_ability && context_ability->GetAttrAbs(kHAT_WeaponExplosionTime) > 0.001f) { + total_explosion_times + = context_ability->GetAttrAbs(kHAT_WeaponExplosionTime) / + obstacle->meta->i->explosion_interval(); + } + if (explosion_times_ >= total_explosion_times) { room->xtimer.DeleteTimer(room->xtimer.GetRunningTimer()); Die(room); BroadcastFullState(room);