From 8bde103bf5d86d3ec4c2d2455ad6b8c39399f3ca Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 28 Sep 2020 10:14:34 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc               | 10 ++++++++++
 server/imserver/guild.h                |  2 ++
 server/imserver/handlermgr.cc          |  4 ++++
 server/imserver/player.cc              | 10 ++++++++++
 server/imserver/player.h               |  2 ++
 server/tools/protobuild/cs_msgid.proto |  4 ++++
 server/tools/protobuild/cs_proto.proto | 19 +++++++++++++++++++
 7 files changed, 51 insertions(+)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index 592c570..987a214 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -461,6 +461,16 @@ void Guild::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg)
     }
 }
 
+void Guild::_CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg)
+{
+
+}
+
+void Guild::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg)
+{
+
+}
+
 void Guild::FillGuildBasic(cs::MFGuildBasic* guild_basic)
 {
     guild_basic->set_guild_id(guild_id_);
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 304aa92..d6081d1 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -26,6 +26,8 @@ public:
     void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
     void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg);
     void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
+    void _CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg);
+    void _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg);
 
     long long GuildId() { return guild_id_; }
 
diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 5731ca4..c447cbc 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -115,6 +115,8 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRank);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberList);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildLog);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberPromote);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberFire);
 
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildInfo);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildJoin);
@@ -126,6 +128,8 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberList);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildApplyList);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildLog);
+    RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberPromote);
+    RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberFire);
 }
 
 void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index a0d9c17..8997fba 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -920,6 +920,16 @@ void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg)
     ForwardGuildCMMsg(hdr, GuildId());
 }
 
+void Player::_CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg)
+{
+
+}
+
+void Player::_CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg)
+{
+
+}
+
 void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg)
 {
     if (!GetFriendById(msg.context().user_info().base_data().account_id())) {
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 6824df5..82f149a 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -107,6 +107,8 @@ class Player
     void _CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg);
     void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
     void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
+    void _CMGuildMemberPromote(f8::MsgHdr& hdr, const cs::CMGuildMemberPromote& msg);
+    void _CMGuildMemberFire(f8::MsgHdr& hdr, const cs::CMGuildMemberFire& msg);
 
     void _SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg);
     void _SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg);
diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto
index ed81826..7a677a3 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -47,6 +47,8 @@ enum CMMessageId_e
     _CMGuildMemberList = 241;
     _CMGuildApplyList = 242;
     _CMGuildLog = 243;
+    _CMGuildMemberPromote = 244;
+    _CMGuildMemberFire = 245;
     _CMGuildMsgEnd = 270;
 }
 
@@ -92,6 +94,8 @@ enum SMMessageId_e
     _SMGuildMemberList = 241;
     _SMGuildApplyList = 242;
     _SMGuildLog = 243;
+    _SMGuildMemberPromote = 244;
+    _SMGuildMemberFire = 245;
     _SMGuildMsgEnd = 270;
 
     _SMUserStatusNotify = 501;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 562e747..545933a 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -516,6 +516,25 @@ message SMGuildLog
     repeated MFStringTuple logs = 4;
 }
 
+//提升公会成员地位
+message CMGuildMemberPromote
+{
+    optional string member_id = 1; //成员id
+    optional int32 job = 2; //职位
+}
+message SMGuildMemberPromote
+{
+}
+
+//解职
+message CMGuildMemberFire
+{
+    optional string member_id = 1; //成员id
+}
+message SMGuildMemberFire
+{
+}
+
 //发送聊天消息
 message CMSendChatMsg
 {