From 7fd65b85e7ce404aab576053e5a1f78a7672ed24 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 3 Jun 2020 17:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=88=86=E7=82=B8=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/bullet.cc             | 3 ++-
 server/tools/protobuild/metatable.proto | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 9415b93..b1bc575 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -151,7 +151,8 @@ void Bullet::ProcBomb()
         {
             //榴弹炮
             a8::Vec2 bomb_pos = GetPos();
-            room->frame_event.AddExplosionEx(player, 0, bomb_pos, 0);
+            room->frame_event.AddExplosionEx(player, meta->i->id(), bomb_pos,
+                                             meta->i->explosion_effect());
             OnHit(objects);
         }
         break;
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index 4978d37..c3ed78e 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -91,6 +91,7 @@ message Equip
     optional float rad2 = 37;
     optional int32 buffid = 38;
     optional int32 drop_id = 40;
+    optional int32 explosion_effect = 42;
 
     optional string inventory_slot = 31; //库存槽位
     optional int32 _inventory_slot = 32; //库存槽位