server/game2002
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove jlf

Browse Source
This commit is contained in:
aozhiwei 2019-07-20 11:18:35 +08:00
parent d9836f86a3
commit a82c66f3c5
2 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/gameserver/human.cc
View File

@ -121,11 +121,7 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_downed(downed); p->set_downed(downed);
#endif #endif
p->set_disconnected(disconnected); p->set_disconnected(disconnected);
if (skin_jlf.skin_id != 0) { skin.ToPB(p->mutable_skin());
skin_jlf.ToPB(p->mutable_skin());
} else {
skin.ToPB(p->mutable_skin());
}
p->set_backpack(backpack); p->set_backpack(backpack);
p->set_helmet(helmet); p->set_helmet(helmet);
p->set_chest(chest); p->set_chest(chest);
@ -139,37 +135,6 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
#endif #endif
} }
void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb)
{
#if 0
stats_pb->set_player_id(entity_uniid);
stats_pb->set_player_avatar_url(avatar_url);
if (!dead) {
stats_pb->set_time_alive(room->frame_no * 1000.0f / SERVER_FRAME_RATE);
} else {
stats_pb->set_time_alive(dead_frameno * 1000.0f / SERVER_FRAME_RATE);
}
stats_pb->set_kills(stats.kills);
stats_pb->set_damage_amount(stats.damage_amount_out);
stats_pb->set_heal_amount(stats.heal_amount);
stats_pb->set_history_time_alive(stats.history_time_alive);
stats_pb->set_history_kills(stats.history_kills);
stats_pb->set_history_damage_amount(stats.history_damage_amount);
stats_pb->set_history_heal_amount(stats.history_heal_amount);
stats_pb->set_gold(stats.gold);
stats_pb->set_score(stats.score);
stats_pb->set_dead(dead);
stats_pb->set_killer_id(stats.killer_id);
stats_pb->set_killer_name(stats.killer_name);
stats_pb->set_account_id(account_id);
#endif
}
void Human::GetAabbBox(AabbCollider& aabb_box) void Human::GetAabbBox(AabbCollider& aabb_box)
{ {
if (!meta) { if (!meta) {
@ -1174,25 +1139,16 @@ void Human::SetSkinInfo(int skin_id)
const Skin& Human::GetSkin() const Skin& Human::GetSkin()
{ {
if (skin_jlf.skin_id != 0) {
return skin_jlf;
}
return skin; return skin;
} }
int Human::SkinId() int Human::SkinId()
{ {
if (skin_jlf.skin_id != 0) {
return skin_jlf.skin_id;
}
return skin.skin_id; return skin.skin_id;
} }
int Human::SkinLv() int Human::SkinLv()
{ {
if (skin_jlf.skin_id != 0) {
return skin_jlf.skin_lv;
}
return skin.skin_lv; return skin.skin_lv;
} }

3
server/gameserver/human.h
View File

@ -43,7 +43,6 @@ class Human : public Entity
MetaData::Equip* chest_meta = nullptr; MetaData::Equip* chest_meta = nullptr;
MetaData::Tank* skin_meta = nullptr; MetaData::Tank* skin_meta = nullptr;
MetaData::Skill* skill_meta = nullptr; MetaData::Skill* skill_meta = nullptr;
MetaData::Tank* skin_jlf_meta = nullptr;
MetaData::Driver* driver_meta = nullptr; MetaData::Driver* driver_meta = nullptr;
HumanAbility ability; HumanAbility ability;
int born_point = 0; int born_point = 0;
@ -63,7 +62,6 @@ class Human : public Entity
int action_duration = 0; int action_duration = 0;
int action_item_id = 0; int action_item_id = 0;
int action_target_id = 0; int action_target_id = 0;
Skin skin_jlf;
Skin tankskin; Skin tankskin;
Driver driver; Driver driver;
int backpack = 0; int backpack = 0;
@ -121,7 +119,6 @@ class Human : public Entity
virtual float GetSpeed4(); virtual float GetSpeed4();
virtual void FillMFObjectPart(cs::MFObjectPart* part_data) override; virtual void FillMFObjectPart(cs::MFObjectPart* part_data) override;
virtual void FillMFObjectFull(cs::MFObjectFull* full_data) override; virtual void FillMFObjectFull(cs::MFObjectFull* full_data) override;
virtual void FillMFPlayerStats(cs::MFPlayerStats* stats);
virtual void GetAabbBox(AabbCollider& aabb_box); virtual void GetAabbBox(AabbCollider& aabb_box);
void FillMFTeamData(cs::MFTeamData* team_data); void FillMFTeamData(cs::MFTeamData* team_data);
void Shot(); void Shot();