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

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-20 07:33:41 +00:00
parent a6a5f6c5bc
commit 42ab7714f8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/roomobstacle.cc
View File

@ -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_
);

1
server/tools/protobuild/metatable.proto
View File

@ -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; //库存槽位