From 4d17cb8f237fb07db516f789dbb2233ba425e4e0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 18 Nov 2020 13:32:52 +0800
Subject: [PATCH] add CMGuildGainExp

---
 server/imserver/guild.cc               |  5 +++++
 server/imserver/guild.h                |  1 +
 server/imserver/handlermgr.cc          |  1 +
 server/imserver/player.cc              |  5 +++++
 server/imserver/player.h               |  1 +
 server/tools/protobuild/cs_msgid.proto |  2 ++
 server/tools/protobuild/cs_proto.proto | 11 +++++++++++
 7 files changed, 26 insertions(+)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index 5d39c57..8584e40 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -400,6 +400,11 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
          );
 }
 
+void Guild::_CMGuildGainExp(f8::MsgHdr& hdr, const cs::CMGuildGainExp& msg)
+{
+    ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
+}
+
 void Guild::_CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg)
 {
     ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 57f4730..82c5d24 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -28,6 +28,7 @@ public:
     void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
     void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg);
     void _CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite& msg);
+    void _CMGuildGainExp(f8::MsgHdr& hdr, const cs::CMGuildGainExp& msg);
 
     long long GuildId() { return guild_id_; }
     int GuildLv() { return guild_lv_; }
diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 5bc3db6..f3013f1 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -142,6 +142,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildLog);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberSetJob);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildAgreeInvite);
+    RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildGainExp);
 }
 
 void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index faa4799..0c85759 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -1128,6 +1128,11 @@ void Player::_CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite&
     ForwardGuildCMMsg(hdr, msg.guild_id());
 }
 
+void Player::_CMGuildGainExp(f8::MsgHdr& hdr, const cs::CMGuildGainExp& 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 980dcf5..aa4f88b 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -121,6 +121,7 @@ class Player
     void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
     void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg);
     void _CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite& msg);
+    void _CMGuildGainExp(f8::MsgHdr& hdr, const cs::CMGuildGainExp& 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 76a8433..a1dc965 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -45,6 +45,7 @@ enum CMMessageId_e
     _CMGuildMemberSetJob = 244;
     _CMGuildRefuse = 245;
     _CMGuildAgreeInvite = 246;
+    _CMGuildGainExp = 247;
     _CMGuildMsgEnd = 270;
 
     _CMTeamCreate = 301;
@@ -98,6 +99,7 @@ enum SMMessageId_e
     _SMGuildMemberSetJob = 244;
     _SMGuildRefuse = 245;
     _SMGuildAgreeInvite = 246;
+    _SMGuildGainExp = 247;
     _SMGuildMsgEnd = 270;
 
     _SMTeamCreate = 301;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index b33cefa..b2a5cff 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -623,6 +623,17 @@ message SMGuildAgreeInvite
     optional string errmsg = 2; //错误信息
 }
 
+//新增公会经验
+message CMGuildGainExp
+{
+    optional int32 exp = 1; //检验值
+}
+message SMGuildGainExp
+{
+    optional int32 errcode = 1; //错误码
+    optional string errmsg = 2; //错误信息
+}
+
 //发送聊天消息
 message CMSendChatMsg
 {