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

1

Browse Source
This commit is contained in:
aozhiwei 2020-07-22 17:28:57 +08:00
parent dd18e41cb6
commit b37c8df72e
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/metamgr.cc
View File

@ -191,6 +191,9 @@ public:
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);
METAMGR_READ(zbmode_gas_inactive_time, 25);
METAMGR_READ(zbmode_game_duration, 300);
METAMGR_READ(zbmode_player_num, 15);
{
METAMGR_READ(newbie_first_robot_ammo, 3);
METAMGR_READ(newbie_first_robot_appeartime, 8);

32
server/gameserver/room.cc
View File

@ -1796,16 +1796,20 @@ ObstacleData* Room::GetPermanentObstacleData(int obstacle_uniid)
long long Room::GetGasInactiveTime()
{
if (room_type_ == RT_NewBrid) {
if (creator_game_times_ <= 0) {
return MetaMgr::Instance()->newbie_gas_inactive_time;
} else {
return MetaMgr::Instance()->common_gas_inactive_time;
}
} else if (room_type_ == RT_MidBrid) {
return MetaMgr::Instance()->midbrid_gas_inactive_time;
if (room_mode_ == kZombieMode) {
return MetaMgr::Instance()->zbmode_gas_inactive_time;
} else {
return MetaMgr::Instance()->gas_inactive_time;
if (room_type_ == RT_NewBrid) {
if (creator_game_times_ <= 0) {
return MetaMgr::Instance()->newbie_gas_inactive_time;
} else {
return MetaMgr::Instance()->common_gas_inactive_time;
}
} else if (room_type_ == RT_MidBrid) {
return MetaMgr::Instance()->midbrid_gas_inactive_time;
} else {
return MetaMgr::Instance()->gas_inactive_time;
}
}
}
@ -2903,10 +2907,14 @@ bool Room::IsMiniRoom()
size_t Room::GetRoomMaxPlayerNum()
{
if (IsMiniRoom()) {
return MINI_ROOM_MAX_PLAYER_NUM;
if (room_mode_ == kZombieMode) {
return MetaMgr::Instance()->zbmode_player_num;
} else {
return NORMAL_ROOM_MAX_PLAYER_NUM;
if (IsMiniRoom()) {
return MINI_ROOM_MAX_PLAYER_NUM;
} else {
return NORMAL_ROOM_MAX_PLAYER_NUM;
}
}
}