From 5209acac5552ab7f4b1b81119791f5ac4e78eca4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 30 Jul 2020 16:41:27 +0800 Subject: [PATCH] 1 --- server/gameserver/metamgr.cc | 5 +++++ server/gameserver/metamgr.h | 1 + server/gameserver/room.cc | 10 +++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 3508847..72fc810 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -195,6 +195,11 @@ public: METAMGR_READ(zbmode_gas_inactive_time, 25); METAMGR_READ(zbmode_game_duration, 300); METAMGR_READ(zbmode_player_num, 15); + METAMGR_READ(zbmode_init_zombie_num, 2); + if (MetaMgr::Instance()->zbmode_init_zombie_num >= + MetaMgr::Instance()->zbmode_player_num) { + abort(); + } { METAMGR_READ(newbie_first_robot_ammo, 3); METAMGR_READ(newbie_first_robot_appeartime, 8); diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 0accc4e..08707af 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -56,6 +56,7 @@ class MetaMgr : public a8::Singleton int zbmode_gas_inactive_time = 15; int zbmode_game_duration = 60 * 2; int zbmode_player_num = 15; + int zbmode_init_zombie_num = 2; int jump_time = 10; float K = 100.0f; float kill_param = 0.0f; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index def5561..051fd0b 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2682,11 +2682,13 @@ void Room::AddPlayerPostProc(Player* hum) RandRemoveAndroid(); } if (GetRoomMode() == kZombieMode) { +#ifdef DEBUG #if 0 hum->ChangeToRace(kZombieRace, 3); #else hum->ChangeToRace(kHumanRace, 1); #endif +#endif } #ifdef DEBUG xtimer.AddRepeatTimerAndAttach @@ -2899,7 +2901,13 @@ void Room::ZombieModeStart() human_list.push_back(pair.second); } std::random_shuffle(human_list.begin(), human_list.end()); - for (size_t i = 0; i < 2; ++i) { +#ifdef DEBUG +#else + { + + } +#endif + for (int i = 0; i < MetaMgr::Instance()->zbmode_init_zombie_num; ++i) { Human* hum = human_list[i]; hum->ChangeToRace(kZombieRace, 1); }