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 2023-09-22 08:19:06 +08:00
parent 79e79634e0
commit d860732a73
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/custom_member.h
View File

@ -10,6 +10,7 @@ class CustomMember
bool IsJoined() { return joined_; } bool IsJoined() { return joined_; }
int GetJoinTime() { return join_time_; } int GetJoinTime() { return join_time_; }
const std::string& GetAccountId() { return account_id_; } const std::string& GetAccountId() { return account_id_; }
const std::string& GetSessionId() { return session_id_; }
std::shared_ptr<BattleDataContext>& GetNetData() { return battle_context_; }; std::shared_ptr<BattleDataContext>& GetNetData() { return battle_context_; };
private: private:

7
server/gameserver/roommgr.cc
View File

@ -808,6 +808,11 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
{ {
msg->set_force_enter_newbie_room(false); msg->set_force_enter_newbie_room(false);
msg->set_pve_instance_id(0); msg->set_pve_instance_id(0);
#ifdef DEBUG
{
std::string custom_data = "";
}
#endif
#ifdef DEBUG #ifdef DEBUG
#else #else
if (msg->proto_version() < cs::ProtoVersion) { if (msg->proto_version() < cs::ProtoVersion) {
@ -905,6 +910,8 @@ void RoomMgr::_CMJoinCustomBattle(f8::MsgHdr& hdr, const cs::CMJoin& msg)
hum->battle_uuid = member->GetNetData()->battle_uuid; hum->battle_uuid = member->GetNetData()->battle_uuid;
hum->is_valid_battle = member->GetNetData()->is_valid_battle; hum->is_valid_battle = member->GetNetData()->is_valid_battle;
hum->payload = member->GetNetData()->payload; hum->payload = member->GetNetData()->payload;
msg.set_session_id(member->GetSessionId());
msg.set_team_uuid(team->GetTeamUuid());
PlayerMgr::Instance()-> PlayerMgr::Instance()->
CreatePlayerByCMJoin(hum, CreatePlayerByCMJoin(hum,
ip_saddr, ip_saddr,