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-03-22 13:37:17 +08:00
parent b230c3f1d8
commit 926c4cae7b
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/roommgr.cc
View File

@ -24,12 +24,6 @@
const int ROOM_NUM_UP_LIMIT = 1000; const int ROOM_NUM_UP_LIMIT = 1000;
const int HUM_NUM_DOWN_LIMIT = 2500; const int HUM_NUM_DOWN_LIMIT = 2500;
struct JoinRequest
{
f8::MsgHdr hdr;
cs::CMJoin msg;
};
static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times) static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times)
{ {
#if 1 #if 1
@ -656,6 +650,7 @@ void RoomMgr::TeamRoomTimeOut(const std::string& team_uuid)
} }
} }
#if 0
void RoomMgr::OnJoinResponse(JoinRequest* req) void RoomMgr::OnJoinResponse(JoinRequest* req)
{ {
f8::MsgHdr& hdr = req->hdr; f8::MsgHdr& hdr = req->hdr;
@ -708,3 +703,10 @@ void RoomMgr::OnJoinResponse(JoinRequest* req)
} }
OnJoinRoomOk(msg, hum); OnJoinRoomOk(msg, hum);
} }
#endif
void RoomMgr::SendGetBattleData(std::vector<std::shared_ptr<cs::CMJoin>>& join_msgs,
std::function<void(std::vector<std::tuple<int, std::string>>)> cb)
{
}

5
server/gameserver/roommgr.h
View File

@ -14,7 +14,6 @@ namespace MetaData
struct MapTplThing; struct MapTplThing;
} }
struct JoinRequest;
class GridService; class GridService;
class MapService; class MapService;
class MapInstance; class MapInstance;
@ -72,6 +71,8 @@ class RoomMgr : public a8::Singleton<RoomMgr>
void AddOverRoom(long long room_uuid); void AddOverRoom(long long room_uuid);
bool IsGM(const std::string& account_id); bool IsGM(const std::string& account_id);
void JoinTeam(MatchTeam* team); void JoinTeam(MatchTeam* team);
void SendGetBattleData(std::vector<std::shared_ptr<cs::CMJoin>>& join_msgs,
std::function<void(std::vector<std::tuple<int, std::string>>)> cb);
private: private:
void InstallReportStateTimer(); void InstallReportStateTimer();
@ -99,7 +100,6 @@ class RoomMgr : public a8::Singleton<RoomMgr>
std::string GenTeamHashData(const std::string& team_uuid, std::map<std::string, long long>* team_hash); std::string GenTeamHashData(const std::string& team_uuid, std::map<std::string, long long>* team_hash);
void OnJoinRoomOk(const cs::CMJoin& msg, Player* hum); void OnJoinRoomOk(const cs::CMJoin& msg, Player* hum);
void TeamRoomTimeOut(const std::string& team_uuid); void TeamRoomTimeOut(const std::string& team_uuid);
void OnJoinResponse(JoinRequest* req);
private: private:
int current_room_idx_ = 0; int current_room_idx_ = 0;
@ -111,5 +111,4 @@ class RoomMgr : public a8::Singleton<RoomMgr>
a8::TimerAttacher reportstate_timer_attacher_; a8::TimerAttacher reportstate_timer_attacher_;
std::map<std::string, int> gm_hash_; std::map<std::string, int> gm_hash_;
std::map<std::string, std::map<std::string, long long>> team_room_hash_; std::map<std::string, std::map<std::string, long long>> team_room_hash_;
std::map<std::string, JoinRequest*> join_request_hash_;
}; };