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

1

Browse Source
This commit is contained in:
aozhiwei 2021-09-28 05:13:27 +00:00
parent 93e32a6aef
commit 3c182c791d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/player.cc
View File

@ -1191,6 +1191,12 @@ void Player::PushJoinRoomMsg()
notifymsg.set_map_id(room->GetMapMeta()->i->map_id());
notifymsg.set_map_width(room->GetMapMeta()->i->map_width());
notifymsg.set_map_height(room->GetMapMeta()->i->map_height());
//notifymsg.set_room_mode((int)room->GetRoomMode());
notifymsg.set_server_info(JsonDataMgr::Instance()->server_info);
//notifymsg.set_team_mode(team_mode());
notifymsg.set_player_id(GetUniId());
notifymsg.set_started(false);
notifymsg.set_room_uuid(a8::XValue(room->GetRoomUuid()).GetString());
GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg);
}
}

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

@ -1128,9 +1128,9 @@ message SMWatchWar
message SMJoinedNotify
{
optional int32 team_mode = 1; //队伍模式 0:单人 1:多人
optional int32 player_id = 2; //玩家id(自己)
optional bool started = 3; //游戏是否已开始
optional string room_uuid = 4; //房间唯一id
optional int32 player_id = 2; //玩家id(自己) 已经废弃移动到SMMapInfo
optional bool started = 3; //游戏是否已开始 已经废弃移动到SMMapInfo
optional string room_uuid = 4; //房间唯一id 已经废弃移动到SMMapInfo
optional int32 map_type = 5; //目前没用到
optional bool elo_start = 6; //目前没用到
@ -1138,7 +1138,7 @@ message SMJoinedNotify
optional int32 error_code = 7; //错误 1:服务器维护中 2：服务器繁忙请稍后再进入
optional int32 room_mode = 8; //0:吃鸡模式 1:僵尸模式
optional string server_info = 9; //服务器信息（重连时使用）
optional string server_info = 9; //服务器信息（重连时使用） 已经废弃移动到SMMapInfo
}
//地图信息
@ -1148,6 +1148,10 @@ message SMMapInfo
optional float map_width = 2; //地图宽度
optional float map_height = 3; //地图高度
repeated MFMapObject objects = 6; //地图对象
optional int32 player_id = 7; //玩家id(自己)
optional bool started = 8; //游戏是否已开始
optional string room_uuid = 9; //房间唯一id
optional string server_info = 10; //服务器信息（重连时使用）
}
//玩家信息