diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 546824d9..5f45e5a5 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -2534,8 +2534,8 @@ void Creature::OnLand() //着陆 RemoveBuffByEffectId(kBET_Jump); RemoveBuffByEffectId(kBET_ThroughWall); -#if 0 - if (IsAndroid() && team_uuid.empty()) { +#if 1 + if (IsAndroid() && AsHuman()->team_uuid.empty()) { MustBeAddBuff(this, kBeRecycleBuffId); } #endif diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index 4f913669..114e88df 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -77,6 +77,7 @@ void Incubator::AllocAndroid(Human* target, int num, std::vector* androi int rand_len = rand() % mt::Param::s().incubator_rand_length; Human* hum = hold_humans_.at(0); glm::vec3 center = target->GetPos().ToGlmVec3() + dir * (float)(mt::Param::s().incubator_base_length + rand_len); + room->map_instance->Scale(center); glm::vec3 point; if (room->map_instance->FindRandomPointAroundCircle (