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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-30 12:12:30 +08:00
parent a210caad3a
commit 8ad57613b6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/bullet.cc
View File

@ -211,8 +211,8 @@ void Bullet::ProcMissible(const a8::XParams& param)
MetaData::Equip* bullet_meta = MetaMgr::Instance()->GetEquip(param.param1); MetaData::Equip* bullet_meta = MetaMgr::Instance()->GetEquip(param.param1);
if (sender && bullet_meta && !sender->room->IsGameOver()) { if (sender && bullet_meta && !sender->room->IsGameOver()) {
a8::Vec2 src_pos(a8::Low32(param.param3.GetInt64()), a8::High32(param.param3.GetInt64())); a8::Vec2 src_pos(a8::Low32(param.param3.GetInt64()), a8::High32(param.param3.GetInt64()));
int target_id = a8::High32(param.param1.GetInt64()); int target_id = a8::Low32(param.param2.GetInt64());
int skill_id = a8::Low32(param.param1.GetInt64()); int skill_id = a8::High32(param.param2.GetInt64());
Human* target = sender->room->GetHumanByUniId(target_id); Human* target = sender->room->GetHumanByUniId(target_id);
if (target && !target->dead) { if (target && !target->dead) {
if (bullet_meta->i->equip_subtype() == kBulletType_Trace) { if (bullet_meta->i->equip_subtype() == kBulletType_Trace) {

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

@ -625,6 +625,7 @@ message CMJoin
optional MFDriver driver = 22; //驾驶员 optional MFDriver driver = 22; //驾驶员
optional MFSkin tankskin = 23; //坦克皮肤 optional MFSkin tankskin = 23; //坦克皮肤
repeated int32 buff_list = 24; //周边系统带进来的战斗数据（护盾，立刻复活等） repeated int32 buff_list = 24; //周边系统带进来的战斗数据（护盾，立刻复活等）
repeated int32 test_params = 25; //测试参数 [0]：机器人坦克等级
repeated MFRoomMember room_member = 100; //房间成员(不包括自己) repeated MFRoomMember room_member = 100; //房间成员(不包括自己)
} }