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 2022-08-09 13:44:56 +08:00
parent 6e22165930
commit be7c2fc4c1
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/gameserver/obstacle.cc
View File

@ -101,24 +101,6 @@ void Obstacle::RecalcSelfCollider()
break;
}
}
switch (meta->i->type()) {
case kObstacleShield:
case kObstacleStrengthenWall:
{
for (auto& tuple : meta->shapes) {
auto collider = new CircleCollider();
collider->owner = this;
collider->pos = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple));
collider->rad = std::get<2>(tuple);
AddEntityCollider(collider);
}
}
break;
default:
{
}
break;
}
if (!self_collider_) {
self_collider_ = new CircleCollider();
self_collider_->owner = this;

24
server/gameserver/roomobstacle.cc
View File

@ -101,6 +101,24 @@ void RoomObstacle::RecalcSelfCollider()
break;
}
}
switch (meta->i->type()) {
case kObstacleShield:
case kObstacleStrengthenWall:
{
for (auto& tuple : meta->shapes) {
auto collider = new CircleCollider();
collider->owner = this;
collider->pos = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple));
collider->rad = std::get<2>(tuple);
AddEntityCollider(collider);
}
}
break;
default:
{
}
break;
}
if (!self_collider_) {
#ifdef DEBUG
#if 0
@ -307,11 +325,17 @@ void RoomObstacle::Active()
break;
case kObstacleShield:
{
if (master.Get() && !master.Get()->GetMoveDir().IsZero()) {
SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP));
}
CalcTempPassObjects();
}
break;
case kObstacleStrengthenWall:
{
if (master.Get() && !master.Get()->GetMoveDir().IsZero()) {
SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP));
}
ActiveStrengthenWall();
}
break;

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit ab36720b8e2b61fd70cc288d3708f88a94d1ca6b
Subproject commit ba8d372c733e91043fd9f84ab0589951899a49fa