diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 59cd11f..0053c02 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -83,6 +83,7 @@ void Human::Shot(Vector2D& target_dir) pos.ToPB(bullet->mutable_pos()); target_dir.ToPB(bullet->mutable_dir()); bullet->set_bulletskin(10001); + bullet->set_gun_id(weapon_meta->i->id()); } { Bullet* bullet = new Bullet(); diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index 23fb135..5818577 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -100,6 +100,17 @@ namespace MetaData if (door.door_id == 0 || !door.state0 || !door.state1) { abort(); + } else { + int open_dir = 0; + #if 0 + if (door.state1->x() < door.state0.x()) { + if (door.state1.y() < door.state0.y()) { + + } else { + + } + } + #endif } } } diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h index 124c9e3..a19b97c 100755 --- a/server/gameserver/metadata.h +++ b/server/gameserver/metadata.h @@ -45,6 +45,8 @@ namespace MetaData struct Door { int door_id = 0; + Vector2D state0_dir; + Vector2D state1_dir; const metatable::DoorObjJson* state0 = nullptr; const metatable::DoorObjJson* state1 = nullptr; }; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index c40e4e0..0823c17 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -394,6 +394,7 @@ message MFBullet optional bool crit = 7; optional int32 reflect_count = 8; optional int32 reflect_objid = 9; + optional int32 gun_id = 10; //抢id } message MFShot