From b916e16fde4666222c3a9d6900ebb35508780b95 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 1 Jun 2021 11:43:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc              | 7 ++++---
 server/tools/protobuild/metatable.proto | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 877e6cf..e61e611 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -3734,17 +3734,18 @@ void Human::SendRollMsgEx(KillInfo& info,
                     break;
                 }
             } else if (*p == '$' && *(p+1)) {
-                char* p1 = strstr((char*)p, "${weapon_id}");
+                char* p1 = strstr((char*)p, "${weapon_text_icon}");
                 if (p1) {
                     if (!result.empty()) {
                         auto element = pb_msg->add_elements();
                         element->set_element_type(1);
                         element->mutable_union_obj_1()->set_text(result);
                     }
-                    {
+                    MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(info.weapon_id);
+                    if (equip_meta) {
                         auto element = pb_msg->add_elements();
                         element->set_element_type(2);
-                        element->mutable_union_obj_2()->set_id(info.weapon_id);
+                        element->mutable_union_obj_2()->set_id(equip_meta->i->text_icon());
                     }
                     result = "";
                 } else {
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index c913f5c..8ac6547 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -121,6 +121,7 @@ message Equip
     optional string power_gun = 52;
     optional string power_buff = 53;
     optional int32 through_teammate = 54;
+    optional int32 text_icon = 55;
 
     optional string inventory_slot = 31; //库存槽位
     optional int32 _inventory_slot = 32; //库存槽位