From 0c7ea381ec87749dff341adec7bd3d590e8eade5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 6 May 2020 15:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=86=E9=87=8E=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/metamgr.cc | 1 + server/gameserver/metamgr.h | 1 + server/gameserver/room.cc | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index bd9195f..9d0ad01 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -145,6 +145,7 @@ public: MetaMgr::Instance()->niube_win_times = MetaMgr::Instance()->GetSysParamAsInt("niube_win_times", 1); MetaMgr::Instance()->newbie_fill_interval = MetaMgr::Instance()->GetSysParamAsInt("newbie_fill_interval", 5000); MetaMgr::Instance()->other_fill_interval = MetaMgr::Instance()->GetSysParamAsInt("other_fill_interval", 2000); + MetaMgr::Instance()->map_cell_width = MetaMgr::Instance()->GetSysParamAsInt("map_cell_width", 64 * 8); if (MetaMgr::Instance()->K < 0.01f) { abort(); } diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index ce576b4..9e759d0 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -67,6 +67,7 @@ class MetaMgr : public a8::Singleton float android_attack_range = 0; float android_pursuit_range = 0; float android_patrol_range = 0; + int map_cell_width = 64 * 8; private: MetaDataLoader* loader_ = nullptr; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 9380a96..b078566 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -24,7 +24,6 @@ #include "gamelog.h" #include "typeconvert.h" -const int MAP_CELL_WIDTH = 64 * 8; const int MAP_GRID_WIDTH = 64; const int ROOM_MAX_PLAYER_NUM = 40; @@ -52,7 +51,7 @@ void Room::Init() xtimer_attacher.xtimer = &xtimer; grid_service.Init(map_meta->i->map_width(), map_meta->i->map_height(), - MAP_CELL_WIDTH); + MetaMgr::Instance()->map_cell_width); map_service.Init(map_meta->i->map_width() / MAP_GRID_WIDTH, map_meta->i->map_height() / MAP_GRID_WIDTH, MAP_GRID_WIDTH);