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-01-01 16:08:45 +08:00
parent 414c0aa7e1
commit 718bc1b137
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/gameserver/roomobstacle.cc
View File

@ -159,12 +159,8 @@ void RoomObstacle::SpecExplosion(int delay_time)
bomb_born_offset = bomb_born_offset * a8::RandEx(1, std::max(2, meta->explosion_float())); bomb_born_offset = bomb_born_offset * a8::RandEx(1, std::max(2, meta->explosion_float()));
#endif #endif
} }
// 999
#if 1
Position bomb_pos = GetPos(); Position bomb_pos = GetPos();
#else bomb_pos.AddGlmVec3(bomb_born_offset.ToGlmVec3());
a8::Vec2 bomb_pos = GetPos() + bomb_born_offset;
#endif
if (room->grid_service->CanAdd(bomb_pos.x, bomb_pos.y)) { if (room->grid_service->CanAdd(bomb_pos.x, bomb_pos.y)) {
std::shared_ptr<Explosion> explosion = EntityFactory::Instance()->MakeExplosion(); std::shared_ptr<Explosion> explosion = EntityFactory::Instance()->MakeExplosion();
explosion->exclude_uniid = GetUniId(); explosion->exclude_uniid = GetUniId();
@ -271,24 +267,22 @@ void RoomObstacle::Active()
break; break;
case kObstacleShield: case kObstacleShield:
{ {
#if 0
if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) { if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) {
// 888
#if 0
SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP)); SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP));
#endif
} }
CalcTempPassObjects(); CalcTempPassObjects();
#endif
} }
break; break;
case kObstacleStrengthenWall: case kObstacleStrengthenWall:
{ {
#if 0
if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) { if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) {
// 888
#if 0
SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP)); SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP));
#endif
} }
ActiveStrengthenWall(); ActiveStrengthenWall();
#endif
} }
break; break;
case kObstacleMedicalStation: case kObstacleMedicalStation: