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

1

Browse Source
This commit is contained in:
aozhiwei 2019-06-18 20:23:33 +08:00
parent 98381f5aad
commit b7dca21c59
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/room.cc
View File

@ -342,6 +342,7 @@ void Room::FillSMJoinedNotify(Player* self_hum, cs::SMJoinedNotify& msg)
msg.set_team_mode(msg.team_mode()); msg.set_team_mode(msg.team_mode());
msg.set_player_id(self_hum->entity_uniid); msg.set_player_id(self_hum->entity_uniid);
msg.set_started(false); msg.set_started(false);
#if 0
for (auto& pair : uniid_hash_) { for (auto& pair : uniid_hash_) {
if (pair.second->entity_type == ET_Player) { if (pair.second->entity_type == ET_Player) {
Human* hum = (Human*)pair.second; Human* hum = (Human*)pair.second;
@ -351,6 +352,7 @@ void Room::FillSMJoinedNotify(Player* self_hum, cs::SMJoinedNotify& msg)
info->set_name(hum->name); info->set_name(hum->name);
} }
} }
#endif
} }
void Room::ScatterDrop(Vector2D center, int drop_id) void Room::ScatterDrop(Vector2D center, int drop_id)

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

@ -684,7 +684,7 @@ message SMJoinedNotify
optional int32 team_mode = 1; //队伍模式 0:单人 1:多人 optional int32 team_mode = 1; //队伍模式 0:单人 1:多人
optional int32 player_id = 2; //玩家id(自己) optional int32 player_id = 2; //玩家id(自己)
optional bool started = 3; //游戏是否已开始 optional bool started = 3; //游戏是否已开始
repeated MFPlayerInfo player_infos = 4; //玩家信息 //repeated MFPlayerInfo player_infos = 4; //玩家信息
optional int32 map_type = 5; //目前没用到 optional int32 map_type = 5; //目前没用到
optional bool elo_start = 6; //目前没用到 optional bool elo_start = 6; //目前没用到