From 405f603def77caae56d23d4965427665b43f2edd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 22 Apr 2019 15:22:45 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 1 - server/gameserver/human.h | 1 + server/gameserver/player.cc | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 7e6a444..a407ebc 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -80,7 +80,6 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data) p->set_energy_shield(energy_shield); #if 1 { - int max_energy_shield = MetaMgr::Instance()->GetSysParamAsInt("max_energy_shield"); p->set_max_energy_shield(max_energy_shield); } #endif diff --git a/server/gameserver/human.h b/server/gameserver/human.h index c6b9df4..0622e70 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -51,6 +51,7 @@ class Human : public Entity int helmet = 0; int chest = 0; int energy_shield = 0; + int max_energy_shield = 0; int vip = 0; int sdmg = 0; bool poisoning = false; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 28ae5ba..96d65a8 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -29,6 +29,7 @@ void Player::Initialize() { Human::Initialize(); health = meta->i->health(); + max_energy_shield = energy_shield; RecalcSelfCollider(); } @@ -1009,7 +1010,6 @@ void Player::FillMFActivePlayerData(cs::MFActivePlayerData* player_data) player_data->set_energy_shield(energy_shield); #if 1 { - int max_energy_shield = MetaMgr::Instance()->GetSysParamAsInt("max_energy_shield"); player_data->set_max_energy_shield(max_energy_shield); } #endif