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 2023-12-15 14:52:48 +08:00
parent d440ff727d
commit d3d140f68c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/bullet.cc
View File

@ -1153,18 +1153,19 @@ void Bullet::ReportHookHitPos(int hit_obj_uniid, const glm::vec3& hit_pos)
return; return;
} }
if (sender.Get()) { if (sender.Get()) {
float distance = GetPos().Distance2D2(hit_pos) + 3; //float distance = GetPos().Distance2D2(hit_pos) + 3;
GetMutablePos().FromGlmVec3(hit_pos); GetMutablePos().FromGlmVec3(hit_pos);
room->grid_service->MoveBullet(this); room->grid_service->MoveBullet(this);
BulletCheckResult result; BulletCheckResult result;
Creature* hit_obj = room->GetCreatureByUniId(hit_obj_uniid); Creature* hit_obj = room->GetCreatureByUniId(hit_obj_uniid);
//GetHitCreatures(result); //GetHitCreatures(result);
result.flyed_distance = std::min(distance, gun_meta->range() + 1.0f);
if (hit_obj) { if (hit_obj) {
++result.c_hit_num; ++result.c_hit_num;
result.objects.insert(hit_obj); result.objects.insert(hit_obj);
GetMutablePos().FromGlmVec3(hit_obj->GetPos().ToGlmVec3());
result.flyed_distance = hit_obj->GetPos().Distance2D2(sender.Get()->GetPos());
} else { } else {
distance = gun_meta->range() + 1; result.flyed_distance = raycast_len_;
} }
ProcNormalBullet(result); ProcNormalBullet(result);
} }