diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 946b7d81..eebfafe4 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -509,10 +509,20 @@ void Creature::RecalcBuffAttr() if (need_refresh_hp) { SetHP(GetMaxHP()); GetTrigger()->HpChg(); +#if 1 + { + //666 + MarkSyncActivePlayer(__FILE__, __LINE__, __func__); + } +#endif + } +#if 0 + //666 if (IsHuman()) { MarkSyncActivePlayer(__FILE__, __LINE__, __func__); } +#endif } void Creature::OnBuffRemove(Buff& buff) diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index 9003a6cd..48ce3264 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -69,7 +69,9 @@ void Skill::FillMFSkill(cs::MFSkill* skill_pb) skill_pb->set_curr_times(GetCurrTimes()); skill_pb->set_max_times(GetMaxTimes()); if (minor_type_) { - int minor_left_time = std::max(0, minor_cd_time_ - (int)(owner->room->GetFrameNo() - minor_frameno_)); + int minor_left_time = std::max + (0, + minor_cd_time_ - (int)((owner->room->GetFrameNo() - minor_frameno_) * FRAME_RATE_MS)); skill_pb->set_minor_type(minor_type_); skill_pb->set_minor_left_time(minor_left_time); skill_pb->set_minor_cd_time(minor_cd_time_);