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

rename tank_meta -> tank_meta_

Browse Source
This commit is contained in:
aozhiwei 2019-07-20 13:55:26 +08:00
parent 917a4932e5
commit 0ad92842db
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/gameserver/android.cc
View File

@ -26,9 +26,9 @@ void Android::Initialize()
{ {
Human::Initialize(); Human::Initialize();
SetTankInfo(MetaMgr::Instance()->RandTank()); SetTankInfo(MetaMgr::Instance()->RandTank());
tank_meta = MetaMgr::Instance()->GetTank(TankId()); tank_meta_ = MetaMgr::Instance()->GetTank(TankId());
if (tank_meta) { if (tank_meta_) {
skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id()); skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id());
} }
GiveEquip(); GiveEquip();
MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId()); MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId());
@ -49,8 +49,8 @@ void Android::Update(int delta_time)
void Android::GiveEquip() void Android::GiveEquip()
{ {
if (tank_meta) { if (tank_meta_) {
MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta->i->bullet_id()); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta_->i->bullet_id());
if (weapon_meta) { if (weapon_meta) {
weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1; weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id(); weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id();

8
server/gameserver/human.cc
View File

@ -1425,21 +1425,21 @@ float* Human::GetAbilityById(int attr_id)
void Human::RecalcBaseAttr() void Human::RecalcBaseAttr()
{ {
ability = HumanAbility(); ability = HumanAbility();
if (tank_meta) { if (tank_meta_) {
for (auto& pair : tank_meta->attr_init) { for (auto& pair : tank_meta_->attr_init) {
float* p_attr = GetAbilityById(pair.first); float* p_attr = GetAbilityById(pair.first);
if (p_attr) { if (p_attr) {
*p_attr += pair.second; *p_attr += pair.second;
} }
} }
for (auto& pair : tank_meta->attr_up) { for (auto& pair : tank_meta_->attr_up) {
float* p_attr = GetAbilityById(pair.first); float* p_attr = GetAbilityById(pair.first);
if (p_attr) { if (p_attr) {
*p_attr += (TankLv() / std::get<1>(pair.second)) * std::get<0>(pair.second); *p_attr += (TankLv() / std::get<1>(pair.second)) * std::get<0>(pair.second);
} }
} }
} }
if (driver_meta && tank_meta && driver_meta->i->g_type() == tank_meta->i->type()) { if (driver_meta && tank_meta_ && driver_meta->i->g_type() == tank_meta_->i->type()) {
for (auto& pair : driver_meta->attr_up) { for (auto& pair : driver_meta->attr_up) {
float* p_attr = GetAbilityById(pair.first); float* p_attr = GetAbilityById(pair.first);
if (p_attr) { if (p_attr) {

2
server/gameserver/human.h
View File

@ -39,7 +39,6 @@ class Human : public Entity
std::string team_uuid; std::string team_uuid;
int account_registertime = 0; int account_registertime = 0;
MetaData::Player* meta = nullptr; MetaData::Player* meta = nullptr;
MetaData::Tank* tank_meta = nullptr;
MetaData::Driver* driver_meta = nullptr; MetaData::Driver* driver_meta = nullptr;
HumanAbility ability; HumanAbility ability;
int born_point = 0; int born_point = 0;
@ -236,6 +235,7 @@ protected:
Human* follow_target_ = nullptr; Human* follow_target_ = nullptr;
bool follow_synced_active_player = false; bool follow_synced_active_player = false;
MetaData::Skill* skill_meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr;
MetaData::Tank* tank_meta_ = nullptr;
private: private:
CircleCollider* self_collider_ = nullptr; CircleCollider* self_collider_ = nullptr;

8
server/gameserver/player.cc
View File

@ -30,10 +30,10 @@ Player::~Player()
void Player::Initialize() void Player::Initialize()
{ {
Human::Initialize(); Human::Initialize();
tank_meta = MetaMgr::Instance()->GetTank(TankId()); tank_meta_ = MetaMgr::Instance()->GetTank(TankId());
if (tank_meta) { if (tank_meta_) {
skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id()); skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id());
MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta->i->bullet_id()); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta_->i->bullet_id());
if (weapon_meta) { if (weapon_meta) {
weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1; weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id(); weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id();