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

1

Browse Source
This commit is contained in:
aozhiwei 2024-01-18 15:33:45 +08:00
parent 9edcf5fffb
commit 050ec7acc9
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/gameserver/player.cc
View File

@ -1397,25 +1397,28 @@ void Player::_CMCancelRevive(f8::MsgHdr* hdr, const cs::CMCancelRevive& msg)
void Player::_CMRequestBulletDmg(f8::MsgHdr* hdr, const cs::CMRequestBulletDmg& msg)
{
auto itr = room->report_bullet_hash.find(msg.bullet_uniid());
if (itr == room->report_bullet_hash.end()) {
#ifdef MYDEBUG
a8::XPrintf("CMRequestBulletDmg bullet_uniid:%d shield_hit:%d strengthen_wall_uniid:%d target_uniid:%d found:%d pos:%f,%f,%f\n",
a8::XPrintf("CMRequestBulletDmg bullet_uniid:%d shield_hit:%d strengthen_wall_uniid:%d target_uniid:%d found:%d pos:%f,%f,%f equip_id:%d\n",
{
msg.bullet_uniid(),
msg.shield_hit(),
msg.strengthen_wall_uniid(),
msg.target_uniid(),
itr == room->report_bullet_hash.end() ? 0 :1,
msg.pos().x(),
msg.pos().y(),
msg.pos().z()
itr == room->report_bullet_hash.end() ? 0 :1,
msg.pos().x(),
msg.pos().y(),
msg.pos().z(),
0
});
#endif
if (itr == room->report_bullet_hash.end()) {
return;
}
int equip_id = 0;
Entity* bullet_entity = room->GetEntityByUniId(msg.bullet_uniid());
if (bullet_entity && bullet_entity->GetEntityType() == ET_Bullet) {
equip_id = ((Bullet*)bullet_entity)->gun_meta->id();
((Bullet*)bullet_entity)->ProcRequestBulletDmg
(
msg.shield_hit(),
@ -1424,6 +1427,20 @@ void Player::_CMRequestBulletDmg(f8::MsgHdr* hdr, const cs::CMRequestBulletDmg&
glm::vec3(msg.pos().x(), msg.pos().y(), msg.pos().z())
);
}
#ifdef MYDEBUG
a8::XPrintf("CMRequestBulletDmg bullet_uniid:%d shield_hit:%d strengthen_wall_uniid:%d target_uniid:%d found:%d pos:%f,%f,%f equip_id:%d\n",
{
msg.bullet_uniid(),
msg.shield_hit(),
msg.strengthen_wall_uniid(),
msg.target_uniid(),
itr == room->report_bullet_hash.end() ? 0 :1,
msg.pos().x(),
msg.pos().y(),
msg.pos().z(),
equip_id
});
#endif
room->report_bullet_hash.erase(msg.bullet_uniid());
}