diff --git a/server/gameserver/killmgr.cc b/server/gameserver/killmgr.cc index e8ff812..eb29048 100644 --- a/server/gameserver/killmgr.cc +++ b/server/gameserver/killmgr.cc @@ -165,11 +165,11 @@ void KillMgr::PreprocessRollMsg(std::shared_ptr pb_msg, if (hint_info.Replace(el_type, text)) { if (el_type == kFieldIdxWeaponTextIcon) { auto e = pb_msg->add_elements(); - e->set_element_type(el_type); + e->set_element_type(kImageElement); e->mutable_union_obj_2()->set_id(a8::XValue(text)); } else { auto e = pb_msg->add_elements(); - e->set_element_type(el_type); + e->set_element_type(kTextElement); e->mutable_union_obj_1()->set_text(text); } } diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 0fbd3db..9ce4479 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -158,7 +158,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 text_icon = 55; optional string special_damage_type = 56; optional float max_oil = 57; optional float average_oil = 58;