server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-09-16 11:04:23 +08:00
parent 821caf74df
commit 568e49ff38
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/gameserver/room.cc
View File

@ -69,7 +69,6 @@ void Room::Init()
}, },
&xtimer_attacher.timer_list_); &xtimer_attacher.timer_list_);
} }
InitAirDrop();
ShuaAndroid(); ShuaAndroid();
} }
@ -908,6 +907,7 @@ void Room::UpdateGas()
#endif #endif
ShuaPlane(); ShuaPlane();
NotifyWxVoip(); NotifyWxVoip();
InitAirDrop();
RoomMgr::Instance()->ActiveRoom(room_uuid); RoomMgr::Instance()->ActiveRoom(room_uuid);
int auto_jump_interval = MetaMgr::Instance()->GetSysParamAsInt("auto_jump_interval"); int auto_jump_interval = MetaMgr::Instance()->GetSysParamAsInt("auto_jump_interval");
auto_jump_timer_ = xtimer.AddRepeatTimerAndAttach(SERVER_FRAME_RATE * 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; 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.x = 0 - 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._min.y = 0 - 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.x = 0 + 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._max.y = 0 + thing_meta->i->height()/2.0f;
} }
Entity* target = FindFirstCollisonEntity(box_pos, air_drop_aabb_box); Entity* target = FindFirstCollisonEntity(box_pos, air_drop_aabb_box);
if (target) { if (target) {