This commit is contained in:
aozhiwei 2020-07-30 16:41:27 +08:00
parent 775ccc166c
commit 5209acac55
3 changed files with 15 additions and 1 deletions

View File

@ -195,6 +195,11 @@ public:
METAMGR_READ(zbmode_gas_inactive_time, 25); METAMGR_READ(zbmode_gas_inactive_time, 25);
METAMGR_READ(zbmode_game_duration, 300); METAMGR_READ(zbmode_game_duration, 300);
METAMGR_READ(zbmode_player_num, 15); 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_ammo, 3);
METAMGR_READ(newbie_first_robot_appeartime, 8); METAMGR_READ(newbie_first_robot_appeartime, 8);

View File

@ -56,6 +56,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
int zbmode_gas_inactive_time = 15; int zbmode_gas_inactive_time = 15;
int zbmode_game_duration = 60 * 2; int zbmode_game_duration = 60 * 2;
int zbmode_player_num = 15; int zbmode_player_num = 15;
int zbmode_init_zombie_num = 2;
int jump_time = 10; int jump_time = 10;
float K = 100.0f; float K = 100.0f;
float kill_param = 0.0f; float kill_param = 0.0f;

View File

@ -2682,11 +2682,13 @@ void Room::AddPlayerPostProc(Player* hum)
RandRemoveAndroid(); RandRemoveAndroid();
} }
if (GetRoomMode() == kZombieMode) { if (GetRoomMode() == kZombieMode) {
#ifdef DEBUG
#if 0 #if 0
hum->ChangeToRace(kZombieRace, 3); hum->ChangeToRace(kZombieRace, 3);
#else #else
hum->ChangeToRace(kHumanRace, 1); hum->ChangeToRace(kHumanRace, 1);
#endif #endif
#endif
} }
#ifdef DEBUG #ifdef DEBUG
xtimer.AddRepeatTimerAndAttach xtimer.AddRepeatTimerAndAttach
@ -2899,7 +2901,13 @@ void Room::ZombieModeStart()
human_list.push_back(pair.second); human_list.push_back(pair.second);
} }
std::random_shuffle(human_list.begin(), human_list.end()); 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]; Human* hum = human_list[i];
hum->ChangeToRace(kZombieRace, 1); hum->ChangeToRace(kZombieRace, 1);
} }