From d8df1702a53ca13d349c40a12d92a7861492c7c4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 19 May 2022 11:57:00 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc              | 3 +++
 server/imserver/player.h               | 1 +
 server/imserver/playermgr.cc           | 8 ++++++--
 server/imserver/playermgr.h            | 3 ++-
 server/tools/protobuild/cs_proto.proto | 2 ++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 30a992a..8718e3e 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -1528,6 +1528,9 @@ void Player::FillMFUserInfo(cs::MFUserInfo* user_info)
 {
     TypeConvert::Convert(myself.base_data, *(user_info->mutable_base_data()));
     TypeConvert::Convert(myself.temp_custom_data, *(user_info->mutable_temp_custom_data()));
+    #if 1
+    user_info->mutable_base_data()->set_zid(zid);
+    #endif
     {
         int target_channel = f8::ExtractChannelIdFromAccountId(user_info->base_data().account_id());
         App::Instance()->PreProcAvatarUrl
diff --git a/server/imserver/player.h b/server/imserver/player.h
index e34d869..0429e2c 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -24,6 +24,7 @@ class Player
     long ip_saddr = 0;
     int account_registertime = 0;
     int red_point_flags_ = 0;
+    int zid = 0;
 
     int chat_channel = -1;
     std::string private_target;
diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc
index a750e59..98fc3c9 100644
--- a/server/imserver/playermgr.cc
+++ b/server/imserver/playermgr.cc
@@ -286,6 +286,7 @@ void PlayerMgr::_CMLoginOld(f8::MsgHdr& hdr, const cs::CMLoginOld& msg)
     new_msg.set_nickname(msg.nickname());
     new_msg.set_avatar_url(msg.avatar_url());
     new_msg.set_sex(msg.sex());
+    //new_msg.set_zid(msg.zid());
     _CMLogin(hdr, new_msg);
 }
 
@@ -531,7 +532,8 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg)
                      a8::XValue(data_set->at(0).at(10)).GetInt(), //guild_job
                      a8::XValue(data_set->at(0).at(11)), //vip_lv
                      a8::XValue(data_set->at(0).at(12)), //head
-                     a8::XValue(data_set->at(0).at(13)) //contribute
+                     a8::XValue(data_set->at(0).at(13)), //contribute
+                     msg->zid() //zid
                      );
             }
             delete msg;
@@ -583,7 +585,8 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
                                int guild_job,
                                int vip_lv,
                                int head,
-                               int contribute)
+                               int contribute,
+                               int zid)
 {
     f8::MsgHdr* hdr = GetHdrByAccountId(account_id);
     if (hdr) {
@@ -605,6 +608,7 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
             hum = new Player();
             hum->socket_handle = hdr->socket_handle;
             hum->ip_saddr = hdr->ip_saddr;
+            hum->zid = zid;
             hum->gameid = f8::ExtractGameIdFromAccountId(account_id);
             hum->channel = f8::ExtractChannelIdFromAccountId(account_id);
             hum->myself.base_data.account_id = account_id;
diff --git a/server/imserver/playermgr.h b/server/imserver/playermgr.h
index 1f42bcb..0b8aee7 100644
--- a/server/imserver/playermgr.h
+++ b/server/imserver/playermgr.h
@@ -104,7 +104,8 @@ class PlayerMgr : public a8::Singleton<PlayerMgr>
                         int guild_job,
                         int vip_lv,
                         int head,
-                        int contribute);
+                        int contribute,
+                        int zid);
     void AsyncLoginOnError(const std::string& account_id,
                            int step,
                            int error_code,
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index f76135c..24a5b93 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -57,6 +57,7 @@ message MFBaseUserData
     optional int32 vip_lv = 8 [default = 0]; //性别
     optional int32 head = 9 [default = 0]; //头像框
     optional int32 contribute  = 10 [default = 0]; //贡献度
+    optional int32 zid  = 11 [default = 0]; //zid
 
     optional int64 user_value1 = 50; //用户字段1
     optional int64 user_value2 = 51; //用户字段2
@@ -187,6 +188,7 @@ message CMLogin
     optional string avatar_url = 7; //头像
     optional int32 vip_lv = 8; //性别
     optional int32 head = 9; //头像框
+    optional int32 zid = 10; //zid
 }
 
 //登录回复