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

修复地雷伤害问题

Browse Source
This commit is contained in:
aozhiwei 2019-05-08 15:43:55 +08:00
parent f61e029f61
commit 2e7e015c6a
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/bullet.cc
View File

@ -131,14 +131,14 @@ void Bullet::OnHit(std::set<Entity*>& objects)
obstacle->dead = obstacle->health <= 0.01f; obstacle->dead = obstacle->health <= 0.01f;
obstacle->dead_frameno = room->frame_no; obstacle->dead_frameno = room->frame_no;
if (obstacle->dead) { if (obstacle->dead) {
if (obstacle->meta->i->damage_dia() > 0.01f &&
obstacle->meta->i->damage() > 0.01f) {
obstacle->Explosion(this);
}
obstacle->ClearColliders(); obstacle->ClearColliders();
room->ScatterDrop(obstacle->pos, obstacle->meta->i->drop()); room->ScatterDrop(obstacle->pos, obstacle->meta->i->drop());
} }
obstacle->BroadcastFullState(); obstacle->BroadcastFullState();
if (obstacle->meta->i->damage_dia() > 0.01f &&
obstacle->meta->i->damage() > 0.01f) {
obstacle->Explosion(this);
}
} }
} }
break; break;

43
server/gameserver/obstacle.cc
View File

@ -125,31 +125,35 @@ ColliderComponent* Obstacle::GetBoxBound()
void Obstacle::Explosion(Bullet* bullet) void Obstacle::Explosion(Bullet* bullet)
{ {
float old_rad = self_collider_->rad;
if (self_collider_) {
self_collider_->rad = meta->i->damage_dia();
}
if (meta->i->damage_dia() > 0.01f && if (meta->i->damage_dia() > 0.01f &&
meta->i->damage() > 0.01f) { meta->i->damage() > 0.01f) {
std::set<Entity*> objects; std::set<Entity*> objects;
std::set<GridCell*> grid_list;
room->grid_service.GetAllCellsByXy(pos.x, pos.y, grid_list);
for (auto& grid : grid_list) { for (auto& grid : grid_list) {
for (Human* hum: grid->human_list) { for (Human* hum: grid->human_list) {
{ if (TestCollision(hum)) {
if (TestCollision(hum)) { objects.insert(hum);
objects.insert(hum);
}
} }
for (Entity* entity : grid->entity_list) { }
switch (entity->entity_type) { for (Entity* entity : grid->entity_list) {
case ET_Obstacle: switch (entity->entity_type) {
case ET_Building: case ET_Obstacle:
{ case ET_Building:
if (TestCollision(entity)) { {
objects.insert(entity); if (entity != this && TestCollision(entity)) {
} objects.insert(entity);
} }
break;
default:
{
}
break;
} }
break;
default:
{
}
break;
} }
}//end for }//end for
} }
@ -196,5 +200,8 @@ void Obstacle::Explosion(Bullet* bullet)
} }
} }
} }
if (self_collider_) {
self_collider_->rad = old_rad;
}
} }