From 8ad57613b666970723ee59f8b0908075fe10b99e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 30 Jul 2019 12:12:30 +0800 Subject: [PATCH] 1 --- server/gameserver/bullet.cc | 4 ++-- server/tools/protobuild/cs_proto.proto | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 9b0d68e..312398b 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -211,8 +211,8 @@ void Bullet::ProcMissible(const a8::XParams& param) MetaData::Equip* bullet_meta = MetaMgr::Instance()->GetEquip(param.param1); if (sender && bullet_meta && !sender->room->IsGameOver()) { a8::Vec2 src_pos(a8::Low32(param.param3.GetInt64()), a8::High32(param.param3.GetInt64())); - int target_id = a8::High32(param.param1.GetInt64()); - int skill_id = a8::Low32(param.param1.GetInt64()); + int target_id = a8::Low32(param.param2.GetInt64()); + int skill_id = a8::High32(param.param2.GetInt64()); Human* target = sender->room->GetHumanByUniId(target_id); if (target && !target->dead) { if (bullet_meta->i->equip_subtype() == kBulletType_Trace) { diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index a64a0a2..30e3f19 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -625,6 +625,7 @@ message CMJoin optional MFDriver driver = 22; //驾驶员 optional MFSkin tankskin = 23; //坦克皮肤 repeated int32 buff_list = 24; //周边系统带进来的战斗数据（护盾，立刻复活等） + repeated int32 test_params = 25; //测试参数 [0]：机器人坦克等级 repeated MFRoomMember room_member = 100; //房间成员(不包括自己) }