server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

metamgr add watchable

Browse Source
This commit is contained in:
aozhiwei 2021-08-25 11:40:06 +08:00
parent 57caecdeb9
commit 6156cbd243
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/human.cc
View File

@ -636,6 +636,7 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
stats.rank = rank; stats.rank = rank;
} }
msg.set_watchable(MetaMgr::Instance()->watchable);
msg.set_team_id(team_id); msg.set_team_id(team_id);
msg.set_team_rank(stats.rank); msg.set_team_rank(stats.rank);
msg.set_team_allcnt(1); msg.set_team_allcnt(1);

5
server/gameserver/metamgr.cc
View File

@ -258,6 +258,11 @@ public:
METAMGR_READ(incubator_canset_distance, 520); METAMGR_READ(incubator_canset_distance, 520);
METAMGR_READ(prebattle_can_use_skill, 1); 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); METAMGR_READ(refresh_view_time, 4);
{ {

1
server/gameserver/metamgr.h
View File

@ -181,6 +181,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
int prebattle_box_id_zb = 0; int prebattle_box_id_zb = 0;
int prebattle_can_use_skill = 0; int prebattle_can_use_skill = 0;
int watchable = 0;
private: private:
MetaDataLoader* loader_ = nullptr; MetaDataLoader* loader_ = nullptr;

3
server/gameserver/room.cc
View File

@ -914,6 +914,9 @@ void Room::AdjustPosInnerMap(a8::Vec2& pos, float radius)
Human* Room::GetWatchWarTarget(Human* hum) Human* Room::GetWatchWarTarget(Human* hum)
{ {
if (!MetaMgr::Instance()->watchable) {
return nullptr;
}
if (hum->GetTeam()) { if (hum->GetTeam()) {
Human* member = hum->GetTeam()->GetOneAliveMember(hum); Human* member = hum->GetTeam()->GetOneAliveMember(hum);
if (member) { if (member) {