diff --git a/server/gameserver/frameevent.cc b/server/gameserver/frameevent.cc index ffbea07..842a9c9 100644 --- a/server/gameserver/frameevent.cc +++ b/server/gameserver/frameevent.cc @@ -47,8 +47,10 @@ void FrameEvent::AddShot(Human* hum) } else { hum->curr_weapon->ToPB(p.mutable_weapon()); } + #if 0 p.set_offhand(true); p.set_bullskin(10001); + #endif } { int shot_idx = shots_.size() - 1; @@ -75,7 +77,9 @@ void FrameEvent::AddBullet(Human* hum, a8::Vec2 born_pos, a8::Vec2 dir, float fl } TypeConvert::ToPb(born_pos, p.mutable_pos()); TypeConvert::ToPb(dir, p.mutable_dir()); + #if 0 p.set_bulletskin(10001); + #endif if (hum->tank_weapon.meta) { p.set_gun_id(hum->tank_weapon.meta->i->id()); p.set_gun_lv(hum->tank_weapon.weapon_lv); diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 4aa742b..3c01244 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -433,7 +433,11 @@ void Player::Shot() AutoLoadingBullet(); } last_shot_frameno_ = room->frame_no; + #if 1 + room->frame_event.AddBulletNumChg(this); + #else need_sync_active_player = true; + #endif } void Player::ProcInteraction()