From 04c55edcd0bc10c2a356fcaa965a0d9718e388d5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 19 Apr 2023 20:31:53 +0800 Subject: [PATCH] 1 --- server/gameserver/roommgr.cc | 4 +--- server/tools/protobuild/cs_proto.proto | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 551e214c..3a870afd 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -591,9 +591,7 @@ Room* RoomMgr::CreateRoom(const cs::CMJoin& msg, init_info.creator_channel = creator_channel; init_info.pve_instance_id = msg.pve_instance_id(); init_info.pve_human_num = std::max(1, msg.team_members_size()); - #ifdef NEWBIE_ROOM - init_info.is_newbie_room = true; - #endif + init_info.is_newbie_room = msg.force_enter_newbie_room() ? true : false; if (GetRoomByUuid(init_info.room_uuid)) { A8_ABORT(); } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 0c2f8d70..004ff735 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -1215,6 +1215,7 @@ message CMJoin optional string hero_uniid = 71; //英雄唯一id optional int32 pve_instance_id = 72; //pve副本id optional int32 team_slot_num = 73; //队伍槽位数1-4 + optional int32 force_enter_newbie_room = 74; //强制进新手房 } //断线重连