From 0dab2c307127cb72dbbbdd2fcfc3ede19304ccbb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 7 Dec 2020 15:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sex=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/human.cc             | 9 +++++++++
 server/gameserver/human.h              | 1 +
 server/gameserver/playermgr.cc         | 1 +
 server/tools/protobuild/cs_proto.proto | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index ad4a211..0604b0a 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -231,6 +231,9 @@ void Human::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data
     if (head != 0) {
         p->set_head(head);
     }
+    if (sex != 0) {
+        p->set_sex(sex);
+    }
     p->set_vip(vip);
     p->set_sdmg(sdmg);
     p->set_kill_count(stats.kills);
@@ -336,6 +339,9 @@ void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb)
     if (head != 0) {
         stats_pb->set_head(head);
     }
+    if (sex != 0) {
+        stats_pb->set_sex(sex);
+    }
 }
 
 void Human::GetAabbBox(AabbCollider& aabb_box)
@@ -407,6 +413,9 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data, bool is_game_over)
         if (head != 0) {
             team_data->set_head(head);
         }
+        if (sex != 0) {
+            team_data->set_sex(sex);
+        }
     }
 }
 
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 664ca4a..04efa62 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -65,6 +65,7 @@ class Human : public MoveableEntity
     long long guild_id = 0;
     int vip_lv = 0;
     int head = 0;
+    int sex = 0;
     long long last_cmmove_frameno = 0;
     bool downed = false;
     bool disconnected = false;
diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc
index 2bb74e2..51ed0db 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -75,6 +75,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum,
     hum->guild_id = msg.guild_id();
     hum->vip_lv = msg.vip_lv();
     hum->head = msg.head();
+    hum->sex = msg.sex();
     #if 0
     if (hum->atk_add > 0.9999f) {
         hum->atk_add = hum->atk_add / 100.0f;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 3afc572..f13a02e 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -221,6 +221,7 @@ message MFPlayerFull
 
     optional int32 vip_lv = 35 [default = 0]; //vip等级
     optional int32 head = 36 [default = 0]; //头像框
+    optional int32 sex = 37 [default = 0]; //性别
 
     //一下字段只有僵尸模式才有效
     optional int32 charid = 44; //人物id
@@ -534,6 +535,7 @@ message MFTeamData
     optional int64 guild_id = 34; //公会id
     optional int32 vip_lv = 35 [default = 0]; //等级
     optional int32 head = 36 [default = 0]; //头像框
+    optional int32 sex = 37 [default = 0]; //性别
 }
 
 //子弹
@@ -624,6 +626,7 @@ message MFPlayerStats
 
     optional int32 vip_lv = 35 [default = 0]; //等级
     optional int32 head = 36 [default = 0]; //头像框
+    optional int32 sex = 37 [default = 0]; //性别
 }
 
 //空投
@@ -747,6 +750,7 @@ message CMJoin
     optional int64 guild_id = 34; //公会id
     optional int32 vip_lv = 35 [default = 0]; //等级
     optional int32 head = 36 [default = 0]; //头像框
+    optional int32 sex = 37 [default = 0]; //性别
     optional bool force_entry_newbie_room = 50; //是否强制进新手房
     repeated MFTeamMember team_members = 51; //包括自己
     optional int32 room_mode = 52; //0:吃鸡模式 1:僵尸模式