server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-05-23 17:10:04 +08:00
parent c7212c4d20
commit 20a73e64b4
5 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/constant.h
View File

@ -382,14 +382,17 @@ enum HpOpt_e
enum RichTextElementType
{
kTextElement = 1,
kImageElement = 2
kImageElement = 2,
kHeroHeadElement = 3
};
enum KillTextFieldIdx
{
kFieldIdxMasterName = 1000,
kFieldIdxKillerName,
kFieldIdxKillerHeroId,
kFieldIdxDeadName,
kFieldIdxDeadHeroId,
kFieldIdxWeaponName,
kFieldIdxWeaponTextIcon,
};

10
server/gameserver/killmgr.cc
View File

@ -21,11 +21,21 @@ bool RollMsgHintInfo::Replace(int idx, std::string& text)
text = killer_name;
}
break;
case kFieldIdxKillerHeroId:
{
text = killer_name;
}
break;
case kFieldIdxDeadName:
{
text = dead_name;
}
break;
case kFieldIdxDeadHeroId:
{
text = dead_name;
}
break;
case kFieldIdxWeaponTextIcon:
{
text = weapon_text_icon;

4
server/gameserver/mt/Text.cc
View File

@ -20,8 +20,12 @@ static void ParseElemets(const std::string& textid,
elements.push_back(std::make_tuple(kFieldIdxMasterName, ""));
} else if (var_name == "${killer.name}") {
elements.push_back(std::make_tuple(kFieldIdxKillerName, ""));
} else if (var_name == "${killer.heroid}") {
elements.push_back(std::make_tuple(kFieldIdxKillerHeroId, ""));
} else if (var_name == "${dead.name}") {
elements.push_back(std::make_tuple(kFieldIdxDeadName, ""));
} else if (var_name == "${dead.heroid}") {
elements.push_back(std::make_tuple(kFieldIdxDeadHeroId, ""));
} else if (var_name == "${weapon.name}") {
elements.push_back(std::make_tuple(kFieldIdxWeaponName, ""));
} else if (var_name == "${weapon.text_icon}") {

7
server/gameserver/pbutils.cc
View File

@ -204,6 +204,13 @@ void KillMgr::PreprocessRollMsg(std::shared_ptr<cs::SMRollMsg> pb_msg,
e->mutable_union_obj_2()->set_id(a8::XValue(el_val));
}
break;
case kHeroHeadElement:
{
auto e = pb_msg->add_elements();
e->set_element_type(el_type);
e->mutable_union_obj_2()->set_id(a8::XValue(el_val));
}
break;
default:
{
std::string text;

8
server/tools/protobuild/cs_proto.proto
View File

@ -982,12 +982,18 @@ message MFImageElement
optional int32 id = 1; //装备id
}
message MFHeroHeadElement
{
optional int32 id = 1; //英雄id
}
message MFRichTextElement
{
//1:TextElement 2:ImageElement
//1:TextElement 2:ImageElement 3:HeroHeadElement
optional int32 element_type = 1; //富文本类型
optional MFTextElement union_obj_1 = 2; //文本元素
optional MFImageElement union_obj_2 = 3; //图片元素
optional MFImageElement union_obj_3 = 4; //英雄头像元素
}
message MFMatchTeamMember