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 2024-05-30 17:52:38 +08:00
parent 7af860d462
commit 63649f40e6
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/gameserver/pbutils.cc
View File

@ -1113,32 +1113,9 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
msg.set_star_num(mt::Param::GetStarNum(stats->rank));
}
#endif
if (room->GetCustomBattle()) {
msg.mutable_settlement_new()->set_custom_battle(1);
} else {
msg.mutable_settlement_new()->set_custom_battle(0);
}
{
auto data = a8::MutableXObject::CreateObject();
data->SetVal("room_uuid", a8::XValue(room->GetRoomUuid()).GetString());
data->SetVal("room_mode", room->GetReportRoomMode());
data->SetVal("team_id", GetTeam()->GetTeamId());
data->SetVal("map_id", room->GetMapMeta()->map_id());
data->SetVal("battle_uuid", GetTeam()->GetBattleUuid());
std::string custom_data = a8::openssl::md5
(data->ToJsonStr() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)") + "|" +
data->ToJsonStr();
msg.mutable_settlement_new()->set_box_payload(custom_data);
}
if (room->IsAlreadyRoomReportBattle()) {
auto p = msg.mutable_settlement_new();
GetTeam()->FillMFSettlementNew(msg.mutable_settlement_new());
return;
} else {
auto p = msg.mutable_settlement_new();
GetTeam()->FillMFSettlementNew(msg.mutable_settlement_new());
return;
}
auto p = new cs::MFSettlementNew();
GetTeam()->FillMFSettlementNew(p);
*msg.mutable_settlement_new() = *p;
}
void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
@ -2317,6 +2294,23 @@ void GGListener::_SS_WSP_SocketDisconnect(f8::MsgHdr* hdr, const ss::SS_WSP_Sock
void Team::FillMFSettlementNew(cs::MFSettlementNew* p)
{
if (room->GetCustomBattle()) {
p->set_custom_battle(1);
} else {
p->set_custom_battle(0);
}
{
auto data = a8::MutableXObject::CreateObject();
data->SetVal("room_uuid", a8::XValue(room->GetRoomUuid()).GetString());
data->SetVal("room_mode", room->GetReportRoomMode());
data->SetVal("team_id", GetTeamId());
data->SetVal("map_id", room->GetMapMeta()->map_id());
data->SetVal("battle_uuid", GetBattleUuid());
std::string custom_data = a8::openssl::md5
(data->ToJsonStr() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)") + "|" +
data->ToJsonStr();
p->set_box_payload(custom_data);
}
if (room->IsAlreadyRoomReportBattle()) {
p->set_settlement_status(1);
p->set_version(20230321);