From 568e49ff38bb1c0f2a1d76ce54e32d97721fbaa0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 16 Sep 2019 11:04:23 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 0e2a7ee..0a9f928 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -69,7 +69,6 @@ void Room::Init() }, &xtimer_attacher.timer_list_); } - InitAirDrop(); ShuaAndroid(); } @@ -908,6 +907,7 @@ void Room::UpdateGas() #endif ShuaPlane(); NotifyWxVoip(); + InitAirDrop(); RoomMgr::Instance()->ActiveRoom(room_uuid); int auto_jump_interval = MetaMgr::Instance()->GetSysParamAsInt("auto_jump_interval"); auto_jump_timer_ = xtimer.AddRepeatTimerAndAttach(SERVER_FRAME_RATE * auto_jump_interval, @@ -1244,10 +1244,10 @@ void Room::AirDrop(int appear_time, int box_id) } AabbCollider air_drop_aabb_box; { - air_drop_aabb_box._min.x = box_pos.x - thing_meta->i->width()/2.0f; - air_drop_aabb_box._min.y = box_pos.y - thing_meta->i->height()/2.0f; - air_drop_aabb_box._max.x = box_pos.x + thing_meta->i->width()/2.0f; - air_drop_aabb_box._max.y = box_pos.y + thing_meta->i->height()/2.0f; + air_drop_aabb_box._min.x = 0 - thing_meta->i->width()/2.0f; + air_drop_aabb_box._min.y = 0 - thing_meta->i->height()/2.0f; + air_drop_aabb_box._max.x = 0 + thing_meta->i->width()/2.0f; + air_drop_aabb_box._max.y = 0 + thing_meta->i->height()/2.0f; } Entity* target = FindFirstCollisonEntity(box_pos, air_drop_aabb_box); if (target) {