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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-19 10:38:07 +08:00
parent be84d4aa81
commit 7d6a3d15e8
7 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/hero.cc
View File

@ -54,5 +54,4 @@ void Hero::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_helmet(helmet);
p->set_chest(chest);
weapon.ToPB(p->mutable_weapon());
p->set_energy_shield(energy_shield);
}

1
server/gameserver/hero.h
View File

@ -20,7 +20,6 @@ class Hero : public Entity
int helmet = 0;
int chest = 0;
Weapon weapon;
int energy_shield = 0;
Hero();
virtual ~Hero() override;

8
server/gameserver/human.cc
View File

@ -130,8 +130,8 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_helmet(helmet);
p->set_chest(chest);
curr_weapon->ToPB(p->mutable_weapon());
#if 0
p->set_energy_shield(energy_shield);
#if 1
{
p->set_max_energy_shield(max_energy_shield);
}
@ -509,9 +509,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id)
{
if (energy_shield > 0.001f) {
energy_shield = std::max(0.0f, energy_shield - dec_hp);
} else {
{
float old_health = GetHP();
ability.hp = std::max(0.0f, GetHP() - dec_hp);
if (GetHP() - old_health > 0.001f) {
@ -752,8 +750,8 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
for (auto& num : inventory_) {
player_data->add_inventory(num);
}
#if 0
player_data->set_energy_shield(energy_shield);
#if 1
{
player_data->set_max_energy_shield(max_energy_shield);
}

4
server/gameserver/human.h
View File

@ -58,8 +58,6 @@ class Human : public Entity
std::string avatar_url;
bool dead = false;
bool disconnected = false;
int anim_type = 0;
int anim_seq = 0;
ActionType_e action_type = AT_None;
long long action_frameno = 0;
int action_duration = 0;
@ -70,8 +68,6 @@ class Human : public Entity
int backpack = 0;
int helmet = 0;
int chest = 0;
int energy_shield = 0;
int max_energy_shield = 0;
int vip = 0;
int sdmg = 0;
int lethal_weapon = 0;

1
server/gameserver/player.cc
View File

@ -30,7 +30,6 @@ Player::~Player()
void Player::Initialize()
{
Human::Initialize();
max_energy_shield = energy_shield;
skin_meta = MetaMgr::Instance()->GetTank(SkinId());
if (skin_meta) {
skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());

1
server/gameserver/playermgr.cc
View File

@ -50,7 +50,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
hum->auto_fill = msg.auto_fill();
hum->use_touch = msg.use_touch();
hum->avatar_url = msg.avatar_url();
hum->energy_shield = msg.energy_shield();
hum->create_tick = a8::XGetTickCount();
hum->account_registertime = f8::ExtractRegisterTimeFromSessionId(msg.session_id());
for (auto& weapon : msg.weapons()) {

1
server/gameserver/room.cc
View File

@ -505,7 +505,6 @@ Hero* Room::CreateHero(Human* hum)
hero->helmet = hum->helmet;
hero->chest = hum->chest;
hero->weapon = *hum->curr_weapon;
hero->energy_shield = hum->energy_shield;
hero->Initialize();
#if 1
uniid_hash_[hero->entity_uniid] = hero;