From 775ac436f74ca44b7311913288c596ced2ab9e36 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 7 Jul 2020 11:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B5=81=E9=87=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/frameevent.cc | 4 ++++ server/tools/protobuild/cs_proto.proto | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/gameserver/frameevent.cc b/server/gameserver/frameevent.cc index ae0d2fa..ddbf574 100644 --- a/server/gameserver/frameevent.cc +++ b/server/gameserver/frameevent.cc @@ -51,8 +51,10 @@ void FrameEvent::AddShot(Human* sender) } else { sender->curr_weapon->ToPB(p.mutable_weapon()); } + #if 0 p.set_offhand(true); p.set_bullskin(10001); + #endif } { int shot_idx = shots_.size() - 1; @@ -80,7 +82,9 @@ void FrameEvent::AddBullet(Human* sender, a8::Vec2 born_pos, a8::Vec2 dir, float } TypeConvert::ToPb(born_pos, p.mutable_pos()); TypeConvert::ToPb(dir, p.mutable_dir()); + #if 0 p.set_bulletskin(10001); + #endif if (sender->tank_weapon.meta) { p.set_gun_id(sender->tank_weapon.meta->i->id()); p.set_gun_lv(sender->tank_weapon.weapon_lv); diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 28aefab..ea56229 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -522,7 +522,7 @@ message MFBullet optional MFVec2 pos = 3; //位置 optional MFVec2 dir = 4; //方向 optional int32 gun_lv = 5; //枪等级 - optional int32 bulletskin = 6; //子弹皮肤 + optional int32 bulletskin = 6; //子弹皮肤 未用到 optional bool crit = 7; optional int32 reflect_count = 8; optional int32 reflect_objid = 9; @@ -535,8 +535,8 @@ message MFShot { optional int32 player_id = 1; //玩家id optional MFWeapon weapon = 2; //武器id - optional bool offhand = 3; - optional int32 bullskin = 4; + optional bool offhand = 3; //没用的 + optional int32 bullskin = 4; //没用到 } //爆炸