This commit is contained in:
aozhiwei 2022-12-25 12:09:24 +08:00
parent 9d0d0c0033
commit 30e7559013
3 changed files with 73 additions and 5 deletions

View File

@ -41,6 +41,26 @@ struct HeroStats
int weapon_lv = 0;
};
struct HeroStatsPb
{
std::string hero_uniid;
std::string hero_name;
int hero_id = 0;
int reward_ceg = 0;
int ceg_uplimit = 0;
int today_get_ceg = 0;
};
struct WeaponStatsPb
{
std::string weapon_uniid;
std::string weapon_name;
int weapon_id = 0;
int reward_ceg = 0;
int ceg_uplimit = 0;
int today_get_ceg = 0;
};
struct OverRewardItem
{
std::string uniid;
@ -132,11 +152,8 @@ struct PlayerStats
double hero_topx = 0;
double weapon_topx = 0;
double survival_topx = 0;
// 222
#if 0
::cs::MFHeroStats pb_hero_stats;
::google::protobuf::RepeatedPtrField<::cs::MFWeaponStats> pb_weapons_stats;
#endif
HeroStatsPb pb_hero_stats;
std::vector<WeaponStatsPb> pb_weapons_stats;
WeaponStats& MustBeWeapon(int weapon_id);
void IncWeaponKills(int weapon_id, int val);

View File

@ -46,4 +46,44 @@ namespace TypeConvert
pb_obj->mutable_weapon2()->set_gold_limit(v.weapon2.gold_limit);
}
void ToPb(const HeroStatsPb& v, cs::MFHeroStats* pb_obj)
{
pb_obj->set_hero_uniid(v.hero_uniid);
pb_obj->set_hero_name(v.hero_name);
pb_obj->set_hero_id(v.hero_id);
pb_obj->set_reward_ceg(v.reward_ceg);
pb_obj->set_ceg_uplimit(v.ceg_uplimit);
pb_obj->set_today_get_ceg(v.today_get_ceg);
}
void FromPb(HeroStatsPb& v, const cs::MFHeroStats* pb_obj)
{
v.hero_uniid = pb_obj->hero_uniid();
v.hero_name = pb_obj->hero_name();
v.hero_id = pb_obj->hero_id();
v.reward_ceg = pb_obj->reward_ceg();
v.ceg_uplimit = pb_obj->ceg_uplimit();
v.today_get_ceg = pb_obj->today_get_ceg();
}
void ToPb(const WeaponStatsPb& v, cs::MFWeaponStats* pb_obj)
{
pb_obj->set_weapon_uniid(v.weapon_uniid);
pb_obj->set_weapon_name(v.weapon_name);
pb_obj->set_weapon_id(v.weapon_id);
pb_obj->set_reward_ceg(v.reward_ceg);
pb_obj->set_ceg_uplimit(v.ceg_uplimit);
pb_obj->set_today_get_ceg(v.today_get_ceg);
}
void FromPb(WeaponStatsPb& v, const cs::MFWeaponStats* pb_obj)
{
v.weapon_uniid = pb_obj->weapon_uniid();
v.weapon_name = pb_obj->weapon_name();
v.weapon_id = pb_obj->weapon_id();
v.reward_ceg = pb_obj->reward_ceg();
v.ceg_uplimit = pb_obj->ceg_uplimit();
v.today_get_ceg = pb_obj->today_get_ceg();
}
}

View File

@ -4,10 +4,14 @@ namespace cs
{
class MFVec3;
class MFOverReward;
class MFHeroStats;
class MFWeaponStats;
}
struct OverReward;
struct HeroStatsPb;
struct WeaponStatsPb;
namespace TypeConvert
{
void ToPb(const Position v, cs::MFVec3* pb_obj);
@ -15,4 +19,11 @@ namespace TypeConvert
void FromPb(glm::vec3& v, const cs::MFVec3* pb_obj);
void ToPb(const OverReward& v, cs::MFOverReward* pb_obj);
void ToPb(const HeroStatsPb& v, cs::MFHeroStats* pb_obj);
void FromPb(HeroStatsPb& v, const cs::MFHeroStats* pb_obj);
void ToPb(const WeaponStatsPb& v, cs::MFWeaponStats* pb_obj);
void FromPb(WeaponStatsPb& v, const cs::MFWeaponStats* pb_obj);
}