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 2022-11-18 13:37:59 +08:00
parent 6dd65e9535
commit 59f34e3827
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -2333,6 +2333,9 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
params->SetVal("weapon_stats_ceg_uplimit" + i_str, p.ceg_uplimit()); params->SetVal("weapon_stats_ceg_uplimit" + i_str, p.ceg_uplimit());
} }
} }
{
}
} }
void Human::DeadDrop() void Human::DeadDrop()

1
server/gameserver/player.cc
View File

@ -1341,7 +1341,6 @@ void Player::PushJoinRoomMsg()
notifymsg.set_player_id(GetUniId()); notifymsg.set_player_id(GetUniId());
notifymsg.set_started(false); notifymsg.set_started(false);
notifymsg.set_room_uuid(a8::XValue(room->GetRoomUuid()).GetString()); notifymsg.set_room_uuid(a8::XValue(room->GetRoomUuid()).GetString());
notifymsg.set_team_mode(GetTeamMode());
notifymsg.set_match_mode(GetBattleContext()->GetMatchMode()); notifymsg.set_match_mode(GetBattleContext()->GetMatchMode());
GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg); GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg);
#ifdef DEBUG #ifdef DEBUG

9
server/gameserver/room.cc
View File

@ -966,6 +966,15 @@ int Room::GetAliveTeamNum()
return num; return num;
} }
void Room::TraverseTeams(std::function<bool (Team*)> cb)
{
for (auto& pair : team_hash_) {
if (!cb(pair.second)) {
break;
}
}
}
int Room::GetTeamNum() int Room::GetTeamNum()
{ {
return team_hash_.size(); return team_hash_.size();

1
server/gameserver/room.h
View File

@ -196,6 +196,7 @@ public:
int GetTeamNum(); int GetTeamNum();
int GetAliveTeamNum(); int GetAliveTeamNum();
Team* GetAliveTeam(); Team* GetAliveTeam();
void TraverseTeams(std::function<bool (Team*)> cb);
bool CanJoin(const std::string& accountid, bool CanJoin(const std::string& accountid,
RoomType_e self_roomm_type, RoomType_e self_roomm_type,
RoomMode_e self_room_mode, RoomMode_e self_room_mode,

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

@ -1222,7 +1222,6 @@ message SMMapInfo
optional string room_uuid = 9; //房间唯一id optional string room_uuid = 9; //房间唯一id
optional string server_info = 10; //服务器信息（重连时使用） optional string server_info = 10; //服务器信息（重连时使用）
optional int32 room_mode = 11; //0:吃鸡模式 1:歼灭模式 2:生存模式 optional int32 room_mode = 11; //0:吃鸡模式 1:歼灭模式 2:生存模式
optional int32 team_mode = 12; //队伍模式 0:单人 1:多人
optional int32 match_mode = 13; //比赛模式 0: pvp 1:排位赛(只有吃鸡模式下该字段才有意义) optional int32 match_mode = 13; //比赛模式 0: pvp 1:排位赛(只有吃鸡模式下该字段才有意义)
} }