From ad4edd80b1d364d2753197f522f3e5dc982dbd57 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 19 Sep 2023 16:18:16 +0800 Subject: [PATCH] 1 --- server/gameserver/custom_battle.h | 2 ++ server/gameserver/roommgr.cc | 3 +-- server/gameserver/roommgr.h | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/custom_battle.h b/server/gameserver/custom_battle.h index c46e6284..3df8b22d 100644 --- a/server/gameserver/custom_battle.h +++ b/server/gameserver/custom_battle.h @@ -12,6 +12,7 @@ class CustomBattle Room* GetRoom() { return room_; } const std::string& GetRoomId() { return room_id_; } const std::string& GetRoomUuid() { return room_uuid_; } + const std::string& GetRawData() { return raw_data_; } int GetZoneId() { return zone_id_; } int GetNodeId() { return zone_id_; } int GetStartTime() { return start_time_; } @@ -23,5 +24,6 @@ class CustomBattle int zone_id_ = 0; int node_id_ = 0; int start_time_ = 0; + std::string raw_data_; std::map> team_hash_; }; diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index a3b11be4..6f4de947 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -842,8 +842,7 @@ std::shared_ptr RoomMgr::GetHisCustomRoom(const std::string& room_ } void RoomMgr::SendGetCustomBattleData(std::shared_ptr join_msg, - std::function< - void(std::vector>&)> cb) + std::function)> cb) { } diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h index 785db14a..d26819a4 100644 --- a/server/gameserver/roommgr.h +++ b/server/gameserver/roommgr.h @@ -119,8 +119,7 @@ class RoomMgr : public a8::Singleton std::shared_ptr GetCustomRoom(const std::string& room_uuid); std::shared_ptr GetHisCustomRoom(const std::string& room_uuid); void SendGetCustomBattleData(std::shared_ptr join_msg, - std::function< - void(std::vector>&)> cb); + std::function)> cb); private: int current_room_idx_ = 0;