From 6156cbd2437d5861cfe309c775aeee86a5a4e3a8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 25 Aug 2021 11:40:06 +0800 Subject: [PATCH] metamgr add watchable --- server/gameserver/human.cc | 1 + server/gameserver/metamgr.cc | 5 +++++ server/gameserver/metamgr.h | 1 + server/gameserver/room.cc | 3 +++ 4 files changed, 10 insertions(+) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index c19d137..b408e83 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -636,6 +636,7 @@ void Human::FillSMGameOver(cs::SMGameOver& msg) stats.rank = rank; } + msg.set_watchable(MetaMgr::Instance()->watchable); msg.set_team_id(team_id); msg.set_team_rank(stats.rank); msg.set_team_allcnt(1); diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index e488058..4ecebca 100644 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -258,6 +258,11 @@ public: METAMGR_READ(incubator_canset_distance, 520); METAMGR_READ(prebattle_can_use_skill, 1); + #ifdef DEBUG + METAMGR_READ(watchable, 1); + #else + METAMGR_READ(watchable, 0); + #endif METAMGR_READ(refresh_view_time, 4); { diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 28d5bb0..1676bcd 100644 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -181,6 +181,7 @@ class MetaMgr : public a8::Singleton int prebattle_box_id_zb = 0; int prebattle_can_use_skill = 0; + int watchable = 0; private: MetaDataLoader* loader_ = nullptr; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 81f5551..2a513c6 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -914,6 +914,9 @@ void Room::AdjustPosInnerMap(a8::Vec2& pos, float radius) Human* Room::GetWatchWarTarget(Human* hum) { + if (!MetaMgr::Instance()->watchable) { + return nullptr; + } if (hum->GetTeam()) { Human* member = hum->GetTeam()->GetOneAliveMember(hum); if (member) {