diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index a2b1ec8..4f63b4e 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -512,10 +512,12 @@ void Creature::AddPassiveSkill(int skill_id) skill->Initialzie(); passive_skill_hash_[skill_meta->i->skill_id()] = skill; skill->AddPassiveSkillBuff(); + #if 0 if (skill_meta->i->skill_cd() > 10000) { //永久被动被动技能 skill->AddPassiveSkillBuff(); } + #endif } } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index aa8387c..1d7a30a 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -3914,7 +3914,8 @@ void Room::AirRaid(int airraid_id) } a8::Vec2 dir = a8::Vec2::UP; dir.Rotate(a8::RandAngle()); - a8::Vec2 center = gas_data_.pos_new + dir * (100 + rand() % gas_data_.new_area_meta->i->rad()); + float rnd_rad = gas_data_.new_area_meta->i->rad() > 0 ? rand() % gas_data_.new_area_meta->i->rad() : 0; + a8::Vec2 center = gas_data_.pos_new + dir * (100 + rnd_rad); { std::vector humans; GetAlivePlayers(humans, GetRoomMaxPlayerNum());