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-06-14 17:34:09 +08:00
parent 6b19afac51
commit b8c4d10c27
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/creature.cc
View File

@ -2366,7 +2366,7 @@ void Creature::UpdateMove()
} }
} }
room->grid_service->MoveCreature(this); room->grid_service->MoveCreature(this);
if (a8::HasBitFlag(status, CS_CrazeMode) && IsNearGas()) { if (a8::HasBitFlag(status, CS_CrazeMode) && IsNearGas(100)) {
GetMutablePos() = old_pos; GetMutablePos() = old_pos;
GetMovement()->ClearPath(); GetMovement()->ClearPath();
glm::vec3 dir = GetPos().ToGlmVec3() - old_pos.ToGlmVec3(); glm::vec3 dir = GetPos().ToGlmVec3() - old_pos.ToGlmVec3();
@ -2377,7 +2377,7 @@ void Creature::UpdateMove()
GlmHelper::Normalize(dir); GlmHelper::Normalize(dir);
SetMoveDir(dir); SetMoveDir(dir);
} }
} else if (room->IsPveRoom() && IsEntityType(ET_Hero) && IsNearGas()) { } else if (room->IsPveRoom() && IsEntityType(ET_Hero) && IsNearGas(20)) {
GetMutablePos() = old_pos; GetMutablePos() = old_pos;
GetMovement()->ClearPath(); GetMovement()->ClearPath();
glm::vec3 dir = GetPos().ToGlmVec3() - old_pos.ToGlmVec3(); glm::vec3 dir = GetPos().ToGlmVec3() - old_pos.ToGlmVec3();
@ -2388,7 +2388,7 @@ void Creature::UpdateMove()
GlmHelper::Normalize(dir); GlmHelper::Normalize(dir);
SetMoveDir(dir); SetMoveDir(dir);
} }
} else if (room->IsNewBieRoom() && IsNearGas()) { } else if (room->IsNewBieRoom() && IsNearGas(20)) {
GetMutablePos() = old_pos; GetMutablePos() = old_pos;
GetMovement()->ClearPath(); GetMovement()->ClearPath();
} }
@ -2990,12 +2990,12 @@ void Creature::NetInitOk()
{ {
} }
bool Creature::IsNearGas() bool Creature::IsNearGas(float distance)
{ {
Position p; Position p;
p.FromGlmVec3(glm::vec3(room->GetGasData().pos_new.x, 0, room->GetGasData().pos_new.y)); p.FromGlmVec3(glm::vec3(room->GetGasData().pos_new.x, 0, room->GetGasData().pos_new.y));
float distance = GetPos().Distance2D2(p); float gas_distance = GetPos().Distance2D2(p);
return distance + GetRadius() * 2 + 20 > room->GetGasData().rad_new; return gas_distance + GetRadius() * 2 + distance > room->GetGasData().rad_new;
} }
float Creature::GetSpeed() float Creature::GetSpeed()

2
server/gameserver/creature.h
View File

@ -354,7 +354,7 @@ class Creature : public MoveableEntity
void ShortFindPath(); void ShortFindPath();
float GetSkillRaycastDistance(); float GetSkillRaycastDistance();
virtual void NetInitOk(); virtual void NetInitOk();
bool IsNearGas(); bool IsNearGas(float distance);
std::shared_ptr<std::set<int>> CalcReporterList(bool is_trace_bullet, std::shared_ptr<std::set<int>> CalcReporterList(bool is_trace_bullet,
const mt::Equip* weapon_meta, const mt::Equip* weapon_meta,
const mt::Equip* bullet_meta); const mt::Equip* bullet_meta);