From 485f74e08c15513afbf812207139b85b69b1d142 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 25 Dec 2022 09:36:54 +0800 Subject: [PATCH] 1 --- server/gameserver/buff.cc | 5 ----- server/gameserver/car.cc | 10 --------- server/gameserver/pbutils.cc | 41 ++++++++++++++++++------------------ server/gameserver/pbutils.h | 7 ------ server/gameserver/weapon.cc | 5 ----- 5 files changed, 20 insertions(+), 48 deletions(-) diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc index 3115d71e..64eea447 100644 --- a/server/gameserver/buff.cc +++ b/server/gameserver/buff.cc @@ -67,11 +67,6 @@ int Buff::GetLastingTime() return meta->duration_time() * 1000; } -void Buff::FillMFBuff(cs::MFBuff* buff_pb) -{ - PBUtils::Buff_FillMFBuff(this, buff_pb); -} - void Buff::ProcDelayAddBuff() { InternalTimerAddBuff(); diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc index 000df6dd..74e02587 100644 --- a/server/gameserver/car.cc +++ b/server/gameserver/car.cc @@ -76,16 +76,6 @@ void Car::Initialize() SetMaxHP(std::max(GetHP(), GetMaxHP())); } -void Car::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data) -{ - PBUtils::Car_FillMFObjectPart(this, room, hum, part_data); -} - -void Car::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data) -{ - PBUtils::Car_FillMFObjectFull(this, room, hum, full_data); -} - Human* Car::GetPassengerBySeat(int seat) { for (auto hum : passengers_) { diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 98d09836..49f6aa8d 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -1,5 +1,7 @@ #include "precompile.h" +#include + #include "cs_proto.pb.h" #include "pbutils.h" @@ -16,8 +18,11 @@ #include "obstacle.h" #include "skill.h" #include "skin.h" +#include "typeconvert.h" #include "mt/Param.h" +#include "mt/Buff.h" +#include "mt/Equip.h" void PBUtils::Ability_FillMFAttrAdditionList(Ability* self, Human* hum, cs::MFActivePlayerData* player_data) { @@ -182,44 +187,39 @@ void KillMgr::BoradcastRollMsgCb(Human* dead_hum, }); } -void PBUtils::Weapon_ToPB(Weapon* self, Creature* c, cs::MFWeapon* pb_obj) +void Weapon::ToPB(Creature* c, cs::MFWeapon* pb_obj) { - pb_obj->set_weapon_uniid(a8::XValue(self->weapon_uniid).GetString()); - pb_obj->set_weapon_id(self->weapon_id); + pb_obj->set_weapon_uniid(a8::XValue(weapon_uniid).GetString()); + pb_obj->set_weapon_id(weapon_id); pb_obj->set_weapon_lv(1); - pb_obj->set_ammo(self->ammo); - pb_obj->set_volume(self->GetClipVolume(c)); + pb_obj->set_ammo(ammo); + pb_obj->set_volume(GetClipVolume(c)); } -void PBUtils::Buff_FillMFBuff(Buff* self, cs::MFBuff* buff_pb) +void Buff::FillMFBuff(cs::MFBuff* buff_pb) { - #if 0 - buff_pb->set_buff_id(self->meta->buff_id()); - buff_pb->set_left_time(self->GetLeftTime()); - buff_pb->set_lasting_time(self->GetLastingTime()); - buff_pb->set_buff_uniid(self->buff_uniid); - if (self->owner->IsHuman() && - (self->meta->buff_effect() == kBET_Driver || - self->meta->buff_effect() == kBET_Passenger)) { + buff_pb->set_buff_id(meta->buff_id()); + buff_pb->set_left_time(GetLeftTime()); + buff_pb->set_lasting_time(GetLastingTime()); + buff_pb->set_buff_uniid(buff_uniid); + if (owner->IsHuman() && + (meta->buff_effect() == kBET_Driver || + meta->buff_effect() == kBET_Passenger)) { } - #endif } -void PBUtils::Car_FillMFObjectPart(Car* self, Room* room, Human* hum, cs::MFObjectPart* part_data) +void Car::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data) { - #if 0 part_data->set_object_type(ET_Car); cs::MFCarPart* p = part_data->mutable_union_obj_11(); p->set_obj_uniid(GetUniId()); TypeConvert::ToPb(GetPos(), p->mutable_pos()); TypeConvert::ToPb(GetAttackDir(), p->mutable_dir()); - #endif } -void PBUtils::Car_FillMFObjectFull(Car* self, Room* room, Human* hum, cs::MFObjectFull* full_data) +void Car::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data) { - #if 0 full_data->set_object_type(ET_Car); cs::MFCarFull* p = full_data->mutable_union_obj_11(); p->set_obj_uniid(GetUniId()); @@ -248,7 +248,6 @@ void PBUtils::Car_FillMFObjectFull(Car* self, Room* room, Human* hum, cs::MFObje #if 0 FillBuffList(hum, p->mutable_buff_list()); #endif - #endif } void PBUtils::Hero_FillMFObjectPart(Hero* self, Room* room, Human* hum, cs::MFObjectPart* part_data) diff --git a/server/gameserver/pbutils.h b/server/gameserver/pbutils.h index 9f2e523b..a580608e 100644 --- a/server/gameserver/pbutils.h +++ b/server/gameserver/pbutils.h @@ -40,13 +40,6 @@ class PBUtils static void Ability_FillMFAttrAdditionList(Ability* self, Human* hum, cs::MFActivePlayerData* player_data); static void Ability_FillMFAttrAdditionList(Ability* self, Human* hum, cs::MFPlayerFull* full_data); - static void Weapon_ToPB(Weapon* self, Creature* c, cs::MFWeapon* pb_obj); - - static void Buff_FillMFBuff(Buff* self, cs::MFBuff* buff_pb); - - static void Car_FillMFObjectPart(Car* self, Room* room, Human* hum, cs::MFObjectPart* part_data); - static void Car_FillMFObjectFull(Car* self, Room* room, Human* hum, cs::MFObjectFull* full_data); - static void Hero_FillMFObjectPart(Hero* self, Room* room, Human* hum, cs::MFObjectPart* part_data); static void Hero_FillMFObjectFull(Hero* self, Room* room, Human* hum, cs::MFObjectFull* full_data); diff --git a/server/gameserver/weapon.cc b/server/gameserver/weapon.cc index 0d9fd538..43d683c3 100644 --- a/server/gameserver/weapon.cc +++ b/server/gameserver/weapon.cc @@ -17,11 +17,6 @@ void Weapon::Clear() skill_meta = nullptr; } -void Weapon::ToPB(Creature* c, cs::MFWeapon* pb_obj) -{ - PBUtils::Weapon_ToPB(this, c, pb_obj); -} - void Weapon::Recalc() { bullet_meta = mt::Equip::GetById(meta->use_bullet());