From 3a4626c95f431a549c9244c745cc902a6fa09da6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 25 Dec 2022 09:45:21 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 5 ++--- server/gameserver/skill.cc | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 27e27d2c..e2ed9013 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -26,6 +26,7 @@ #include "mt/Equip.h" #include "mt/Hero.h" #include "mt/MapThing.h" +#include "mt/Skill.h" void PBUtils::Ability_FillMFAttrAdditionList(Ability* self, Human* hum, cs::MFActivePlayerData* player_data) { @@ -386,9 +387,8 @@ void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d } } -void PBUtils::Skill_FillMFSkill(Skill* self, cs::MFSkill* skill_pb) +void Skill::FillMFSkill(cs::MFSkill* skill_pb) { -#if 0 skill_pb->set_skill_id(meta->skill_id()); skill_pb->set_left_time(GetLeftTime()); skill_pb->set_cd_time(GetCd()); @@ -410,7 +410,6 @@ void PBUtils::Skill_FillMFSkill(Skill* self, cs::MFSkill* skill_pb) }); #endif } -#endif } void PBUtils::Skin_ToPB(Skin* self, cs::MFSkin* pb_obj) diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index 27f7d8f7..7913c53e 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -66,11 +66,6 @@ int Skill::GetLeftTime() return skill_left_time; } -void Skill::FillMFSkill(cs::MFSkill* skill_pb) -{ - PBUtils::Skill_FillMFSkill(this, skill_pb); -} - void Skill::DecTimes() { if (inc_times_timer_.expired()) {