From 6836d9eb3b2c8b4a586a16985c735ad917dc7ebf Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 14 Jul 2021 19:17:58 +0800 Subject: [PATCH 1/2] 1 --- server/gameserver/room.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()); From 9d7478854f311100c9377618c352e208d1705049 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 14 Jul 2021 19:52:30 +0800 Subject: [PATCH 2/2] 1 --- server/gameserver/creature.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index a2b1ec8..e9f5b08 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 } } @@ -1146,6 +1148,9 @@ void Creature::SetMoveDir(const a8::Vec2& move_dir) void Creature::AddSkill(int skill_id) { + #if 1 + a8::XPrintf("AddSkill skill:%d\n", {skill_id}); + #endif MetaData::Skill* skill_meta = MetaMgr::Instance()->GetSkill(skill_id); if (skill_meta && !GetSkill(skill_id)) { if (skill_meta->i->skill_type() == 1) {