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-03 14:49:04 +08:00
parent 243b130a49
commit 04b5183006
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -107,8 +107,6 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_dead(dead);
p->set_downed(downed);
p->set_disconnected(disconnected);
p->set_anim_type(anim_type);
p->set_anim_seq(anim_seq);
if (skin_jlf.skin_id != 0) {
skin_jlf.ToPB(p->mutable_skin());
} else {
@ -124,8 +122,6 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_max_energy_shield(max_energy_shield);
}
#endif
p->set_vip(vip);
p->set_sdmg(sdmg);
FillBodyState(p->mutable_states());
}

13
server/gameserver/playermgr.cc
View File

@ -4,6 +4,7 @@
#include "player.h"
#include "cs_proto.pb.h"
#include "room.h"
#include "metamgr.h"
#include "framework/cpp/utils.h"
@ -64,6 +65,18 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
hum->skin_configs[skin.skin_id()] = skin.skin_lv();
}
}
if (msg.weapon().weapon_id() != 0) {
MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(msg.weapon().weapon_id());
if (weapon_meta) {
hum->weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
hum->weapons[GUN_SLOT1].weapon_id = msg.weapon().weapon_id();
hum->weapons[GUN_SLOT1].weapon_lv = msg.weapon().weapon_lv();
hum->weapons[GUN_SLOT1].ammo = 0;
hum->weapons[GUN_SLOT1].meta = weapon_meta;
hum->weapons[GUN_SLOT1].Recalc();
hum->curr_weapon = &hum->weapons[GUN_SLOT1];
}
}
hum->SetSkinInfo(msg.baseskin());
socket_hash_[socket] = hum;
return hum;