From b49c99f768cd77436bc772a03fc816be8cf62f32 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 20 Sep 2023 14:02:22 +0800 Subject: [PATCH] 1 --- server/gameserver/roommgr.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 291ffe92..0b52e35d 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -18,6 +18,7 @@ #include "httpproxy.h" #include "mapmgr.h" #include "debugcmd.h" +#include "custom_battle.h" #include "mt/Param.h" #include "mt/Text.h" @@ -920,8 +921,9 @@ void RoomMgr::SendGetCustomBattleData(std::shared_ptr join_msg, { rsp_obj->ToJsonStr() }); -#if 0 + auto custom_battle = std::make_shared(); if (rsp_obj->GetType() == a8::XOT_OBJECT) { +#if 0 int match_mode = rsp_obj->Get("match_mode"); RoomMgr::Instance()->SetMatchMode(match_mode ? 1 : 0); if (rsp_obj->HasKey("members")) { @@ -936,9 +938,9 @@ void RoomMgr::SendGetCustomBattleData(std::shared_ptr join_msg, } } } - } - cb(*result); #endif + } + cb(0, "", custom_battle); } else { f8::UdpLog::Instance()->Warning ("GetCustomBattleData error %s",