diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 109f7d4..803ed5e 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -222,6 +222,9 @@ void Human::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data
         p->set_max_energy_shield(max_energy_shield);
     }
     #endif
+    if (guild_id != 0) {
+        p->set_guild_id(guild_id);
+    }
     p->set_vip(vip);
     p->set_sdmg(sdmg);
     p->set_kill_count(stats.kills);
@@ -306,6 +309,9 @@ void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb)
     }
 
     stats_pb->set_account_id(account_id);
+    if (guild_id != 0) {
+        stats_pb->set_guild_id(guild_id);
+    }
 
     for (auto& pair : stats.items) {
         auto p = stats_pb->add_items();
@@ -378,6 +384,9 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data, bool is_game_over)
             team_data->set_user_value1(user_value1);
             team_data->set_user_value2(user_value2);
             team_data->set_user_value3(user_value3);
+            if (guild_id != 0) {
+                team_data->set_guild_id(guild_id);
+            }
         }
     }
 }
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index d2cbed4..2799aac 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -62,6 +62,7 @@ class Human : public MoveableEntity
     long long user_value1 = 0;
     long long user_value2 = 0;
     long long user_value3 = 0;
+    long long guild_id = 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 5218bda..7ea63c6 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -72,6 +72,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum,
     hum->user_value1 = msg.user_value1();
     hum->user_value2 = msg.user_value2();
     hum->user_value3 = msg.user_value3();
+    hum->guild_id = msg.guild_id();
     #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 3728d5c..2944ecd 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -187,6 +187,7 @@ message MFPlayerFull
     optional int32 obj_uniid = 1; //唯一id
     optional MFVec2 pos = 2; //位置
     optional MFVec2 dir = 3; //朝向
+    optional int64 guild_id = 4; //公会id
 
     optional float max_health = 5; //血量
     optional float health = 6; //血量
@@ -527,6 +528,7 @@ message MFTeamData
     optional int64 user_value1 = 31; //对应好友系统的user_value1
     optional int64 user_value2 = 32; //对应好友系统的user_value2
     optional int64 user_value3 = 33; //对应好友系统的user_value3
+    optional int64 guild_id = 34; //公会id
 }
 
 //子弹
@@ -612,6 +614,7 @@ message MFPlayerStats
     optional string killer_account_id = 42; //杀手accountid(机器人为空)
 
     optional string account_id = 21; //账号id
+    optional int64 guild_id = 22; //公会id
 }
 
 //空投
@@ -732,6 +735,7 @@ message CMJoin
     optional int64 user_value1 = 31; //对应好友系统的user_value1
     optional int64 user_value2 = 32; //对应好友系统的user_value2
     optional int64 user_value3 = 33; //对应好友系统的user_value3
+    optional int64 guild_id = 34; //公会id
     optional bool force_entry_newbie_room = 50; //是否强制进新手房
     repeated MFTeamMember team_members = 51; //包括自己
     optional int32 room_mode = 52; //0:吃鸡模式 1:僵尸模式