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-06 15:53:54 +08:00
parent cbe3b59f8e
commit ed35f526b3
3 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/gameserver/constant.h
View File

@ -315,17 +315,6 @@ enum AIMode_e
kHumanAiMode = 1, kHumanAiMode = 1,
}; };
enum ColliderTag_e
{
kHalfWallTag = 1,
kColliderSpecTag_Begin = 2,
kColliderTag_Grass = 2, //草丛
kColliderTag_Water = 3, //水
kColliderTag_Ice = 4, //冰
kColliderTag_MountainTop = 5, //山顶
kColliderSpecTag_End = 5,
};
enum PostBuffAction_e enum PostBuffAction_e
{ {
kRemoveBuffByIdAction = 1, kRemoveBuffByIdAction = 1,
@ -537,14 +526,6 @@ const int MAX_AI_LEVEL = 8;
const int HUNLUAN_BUFFID = 6001; const int HUNLUAN_BUFFID = 6001;
const long long SPEC_MAP_OBJECT_FLAGS =
A8_DEFINE_RANGE_BIT
(
long long,
kColliderSpecTag_Begin,
kColliderSpecTag_End
);
const int ANDROID_AI_ID_START = 10001; const int ANDROID_AI_ID_START = 10001;
const int MAX_SKILL_LV = 15; const int MAX_SKILL_LV = 15;

29
server/gameserver/creature.cc
View File

@ -1415,10 +1415,12 @@ void Creature::CheckSpecObject()
{ {
long long old_cell_flags = cell_flags_; long long old_cell_flags = cell_flags_;
cell_flags_ = 0; cell_flags_ = 0;
int ext_flags = 0;
{ {
int poly_idx = 0; int poly_idx = 0;
dtPoly* poly = room->map_instance->GetPoly(GetPos().ToGlmVec3(), poly_idx); dtPoly* poly = room->map_instance->GetPoly(GetPos().ToGlmVec3(), poly_idx);
if (poly) { if (poly) {
ext_flags = room->GetPolyExtFlag(poly_idx);
#if 0 #if 0
if ((poly->flags & SAMPLE_POLYFLAGS_SWIM) == SAMPLE_POLYFLAGS_SWIM) { if ((poly->flags & SAMPLE_POLYFLAGS_SWIM) == SAMPLE_POLYFLAGS_SWIM) {
a8::SetBitFlag(cell_flags_, kColliderTag_Water); a8::SetBitFlag(cell_flags_, kColliderTag_Water);
@ -1427,14 +1429,7 @@ void Creature::CheckSpecObject()
} }
} }
if (old_cell_flags != cell_flags_) { if (old_cell_flags != cell_flags_) {
if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Grass)) { #if 0
if (a8::HasBitFlag(cell_flags_, kColliderTag_Grass)) {
TryAddBuff(this, kInGrassBuffId);
} else {
RemoveBuffById(kInGrassBuffId);
}
}
if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Water)) { if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Water)) {
if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) { if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) {
TryAddBuff(this, kInWater1BuffId); TryAddBuff(this, kInWater1BuffId);
@ -1442,23 +1437,7 @@ void Creature::CheckSpecObject()
RemoveBuffByEffectId(kBET_InWater); RemoveBuffByEffectId(kBET_InWater);
} }
} }
#endif
if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Ice)) {
if (a8::HasBitFlag(cell_flags_, kColliderTag_Ice)) {
TryAddBuff(this, kInIceBuffId);
} else {
RemoveBuffById(kInIceBuffId);
}
}
if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_MountainTop)) {
if (a8::HasBitFlag(cell_flags_, kColliderTag_MountainTop)) {
TryAddBuff(this, kInMountainTopBuffId);
} else {
RemoveBuffById(kInMountainTopBuffId);
}
}
} }
} }

2
server/gameserver/human.cc
View File

@ -473,9 +473,11 @@ float Human::GetSpeed()
speed = (speed + GetAbility()->GetAttrAbs(kHAT_Speed)) * speed = (speed + GetAbility()->GetAttrAbs(kHAT_Speed)) *
(1 + GetAbility()->GetAttrRate(kHAT_Speed)); (1 + GetAbility()->GetAttrRate(kHAT_Speed));
#endif #endif
#if 0
if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) { if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) {
speed *= mt::Param::s().water_move_coefficient; speed *= mt::Param::s().water_move_coefficient;
} }
#endif
return std::max(speed, 1.0f); return std::max(speed, 1.0f);
} }