From 04b5183006f0862720c48ac7356544fae285adf7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 3 Jul 2019 14:49:04 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc     |  4 ----
 server/gameserver/playermgr.cc | 13 +++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 505a455..71d8dfe 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -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());
 }
 
diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc
index f6932b9..c106094 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -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;