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

1

Browse Source
This commit is contained in:
aozhiwei 2021-03-18 16:01:59 +08:00
parent 9a663e7e19
commit 3da0b2a3b9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -1312,7 +1312,7 @@ bool Human::HasNoDownedTeammate()
return false; return false;
} }
bool Human::CanUseSkill() bool Human::CanUseSkill(int skill_id)
{ {
if (downed) { if (downed) {
return false; return false;
@ -1346,7 +1346,7 @@ void Human::DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos)
) { ) {
CancelAction(); CancelAction();
} }
if (CanUseSkill()) { if (CanUseSkill(skill_id)) {
ResetSkill(); ResetSkill();
playing_skill = true; playing_skill = true;
last_use_skill_frameno_ = room->GetFrameNo(); last_use_skill_frameno_ = room->GetFrameNo();

2
server/gameserver/human.h
View File

@ -193,7 +193,7 @@ class Human : public Creature
void RemoveOutObjects(Entity* entity); void RemoveOutObjects(Entity* entity);
bool HasLiveTeammate(); bool HasLiveTeammate();
bool HasNoDownedTeammate(); bool HasNoDownedTeammate();
bool CanUseSkill(); bool CanUseSkill(int skill_id);
void DoJump(); void DoJump();
void DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos); void DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos);
virtual int SelectSkillId(); virtual int SelectSkillId();

2
server/gameserver/zombiemode.ai.cc
View File

@ -190,7 +190,7 @@ void ZombieModeAI::UpdateAttack()
} }
float distance = myself->GetPos().Distance(node_->target->GetPos()); float distance = myself->GetPos().Distance(node_->target->GetPos());
if (distance > GetAttackRange()) { if (distance > GetAttackRange()) {
if (myself->CanUseSkill() && if (myself->CanUseSkill(myself->SelectSkillId()) &&
myself->CurrentSkillMeta()->i->skill_id() != TURN_OVER_SKILL_ID && myself->CurrentSkillMeta()->i->skill_id() != TURN_OVER_SKILL_ID &&
distance < myself->CurrentSkillMeta()->i->skill_distance()) { distance < myself->CurrentSkillMeta()->i->skill_distance()) {
DoSkill(); DoSkill();