diff --git a/server/gameserver/mt/SkillNumber.cc b/server/gameserver/mt/SkillNumber.cc index 1f293c17..365cb308 100644 --- a/server/gameserver/mt/SkillNumber.cc +++ b/server/gameserver/mt/SkillNumber.cc @@ -111,7 +111,8 @@ namespace mt abort(); } #ifdef DEBUG - if (App::Instance()->instance_id == 6) { + if (App::Instance()->instance_id == 6 || + App::Instance()->instance_id == 2) { _float_cd = 6; } #endif diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 0a590d70..d8e1c158 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2184,11 +2184,7 @@ void Room::NotifyGameStart() long long Room::GetGasInactiveTime() { #ifdef DEBUG - if (App::Instance()->instance_id == 2) { - return 30; - } else { - return 12; - } + return 12; #endif if (IsPveRoom()) { return 10; diff --git a/server/gameserver/shot.cc b/server/gameserver/shot.cc index 1826f267..29aed8d3 100644 --- a/server/gameserver/shot.cc +++ b/server/gameserver/shot.cc @@ -163,6 +163,15 @@ static void InternalCreateBullet(BulletInfo& bullet_info) if (c->downed) { return; } +#ifdef DEBUG + if (bullet_info.weapon_meta->id() == 60111) { + a8::XPrintf("create bullet %d %d\n", + { + bullet_info.bullet_idx, + bullet_info.delay_time + }); + } +#endif if (bullet_info.delay_time <= 0) { if (c->GetCurrWeapon()->meta->bullet_consume_type() == kBulletConsumeMulti) { if (c->GetCurrWeapon()->ammo <= 0) {