1
This commit is contained in:
parent
2d0c9ba3c1
commit
b916e16fde
@ -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 {
|
||||
|
@ -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; //库存槽位
|
||||
|
Loading…
x
Reference in New Issue
Block a user