diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 0a255b3..2133f1c 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -439,9 +439,14 @@ void RoomObstacle::ActiveAirDrop() { RoomObstacle* obstacle = (RoomObstacle*)param.sender.GetUserData(); obstacle->SummonAirDropBox(obstacle->meta->int_param1); + obstacle->Die(obstacle->room); + obstacle->BroadcastFullState(obstacle->room); }, - &xtimer_attacher.timer_list_ - ); + &xtimer_attacher.timer_list_, + [] (const a8::XParams& param) + { + int i = 0; + }); room->xtimer.AddDeadLineTimerAndAttach ( 0, @@ -454,8 +459,6 @@ void RoomObstacle::ActiveAirDrop() obstacle->room->frame_event.AddAirDrop(obstacle->meta->int_param2, obstacle->meta->int_param1, obstacle->GetPos()); - obstacle->Die(obstacle->room); - obstacle->BroadcastFullState(obstacle->room); }, &xtimer_attacher.timer_list_ ); diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index ad9e69e..ff7fc59 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -144,6 +144,7 @@ message Equip optional int32 reload_delay_time = 63; optional int32 cast_time = 64; optional int32 auto_switch_weapon_time = 65; + optional int32 quality = 66; optional string inventory_slot = 31; //库存槽位 optional int32 _inventory_slot = 32; //库存槽位