diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index d2726b0..39d261c 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -202,9 +202,9 @@ enum BuffEffectType_e enum SkillFunc_e { Skill_FuncNone = 0, - Skill_Jump = 1, - Skill_Shot = 2, - Skill_SummonObject = 3, + Skill_Jump = 2, + Skill_Shot = 3, + Skill_SummonObject = 4, Skill_FuncEnd }; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 2f2eaa4..138ec33 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -456,7 +456,7 @@ void Human::UpdateSkill() if (skill_meta) { if (curr_skill_phase < skill_meta->phases.size()) { MetaData::SkillPhase* phase = &skill_meta->phases[curr_skill_phase]; - if (phase->time_offset > (room->frame_no - last_use_skill_frameno_) * FRAME_RATE_MS) { + if (phase->time_offset >= (int)((room->frame_no - last_use_skill_frameno_) * FRAME_RATE_MS)) { ProcSkillPhase(phase); ++curr_skill_phase; }