1
This commit is contained in:
parent
6dd65e9535
commit
59f34e3827
@ -2333,6 +2333,9 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
|
||||
params->SetVal("weapon_stats_ceg_uplimit" + i_str, p.ceg_uplimit());
|
||||
}
|
||||
}
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void Human::DeadDrop()
|
||||
|
@ -1341,7 +1341,6 @@ void Player::PushJoinRoomMsg()
|
||||
notifymsg.set_player_id(GetUniId());
|
||||
notifymsg.set_started(false);
|
||||
notifymsg.set_room_uuid(a8::XValue(room->GetRoomUuid()).GetString());
|
||||
notifymsg.set_team_mode(GetTeamMode());
|
||||
notifymsg.set_match_mode(GetBattleContext()->GetMatchMode());
|
||||
GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg);
|
||||
#ifdef DEBUG
|
||||
|
@ -966,6 +966,15 @@ int Room::GetAliveTeamNum()
|
||||
return num;
|
||||
}
|
||||
|
||||
void Room::TraverseTeams(std::function<bool (Team*)> cb)
|
||||
{
|
||||
for (auto& pair : team_hash_) {
|
||||
if (!cb(pair.second)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int Room::GetTeamNum()
|
||||
{
|
||||
return team_hash_.size();
|
||||
|
@ -196,6 +196,7 @@ public:
|
||||
int GetTeamNum();
|
||||
int GetAliveTeamNum();
|
||||
Team* GetAliveTeam();
|
||||
void TraverseTeams(std::function<bool (Team*)> cb);
|
||||
bool CanJoin(const std::string& accountid,
|
||||
RoomType_e self_roomm_type,
|
||||
RoomMode_e self_room_mode,
|
||||
|
@ -1222,7 +1222,6 @@ message SMMapInfo
|
||||
optional string room_uuid = 9; //房间唯一id
|
||||
optional string server_info = 10; //服务器信息(重连时使用)
|
||||
optional int32 room_mode = 11; //0:吃鸡模式 1:歼灭模式 2:生存模式
|
||||
optional int32 team_mode = 12; //队伍模式 0:单人 1:多人
|
||||
optional int32 match_mode = 13; //比赛模式 0: pvp 1:排位赛(只有吃鸡模式下该字段才有意义)
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user