diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index fff1727..cdb02bf 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -9,24 +9,11 @@ enum CMMessageId_e _CMSendChatMsg = 151; _CMSendCustomMsg = 152; - _CMUpdateTempCustomData = 153; _CMReadMsgAndOpenChatNotify = 157; _CMCloseChatNotify = 158; _CMSetCurrPrivateChatTarget = 159; _CMGuildMsgBegin = 230; - _CMGuildCreate = 231; - _CMGuildJoin = 232; - _CMGuildKick = 234; - _CMGuildQuit = 235; - _CMGuildDismiss = 236; - _CMGuildChange = 237; - _CMGuildInfo = 238; - _CMGuildMemberList = 241; - _CMGuildApplyList = 242; - _CMGuildMemberSetJob = 244; - _CMGuildRefuse = 245; - _CMGuildGainExp = 247; _CMGuildMsgEnd = 270; } @@ -38,18 +25,6 @@ enum SMMessageId_e _SMLogin = 103; _SMGuildMsgBegin = 230; - _SMGuildCreate = 231; - _SMGuildJoin = 232; - _SMGuildKick = 234; - _SMGuildQuit = 235; - _SMGuildDismiss = 236; - _SMGuildChange = 237; - _SMGuildInfo = 238; - _SMGuildMemberList = 241; - _SMGuildApplyList = 242; - _SMGuildMemberSetJob = 244; - _SMGuildRefuse = 245; - _SMGuildGainExp = 247; _SMGuildMsgEnd = 270; _SMUserStatusNotify = 501; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 8f05438..edb5232 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -182,188 +182,6 @@ message SMLogin optional MFAccountInfo account_info = 3; //账号信息 } -//获取公会信息 -message CMGuildInfo -{ - optional int64 guild_id = 1; //公会id -} -//获取公会信息返回 -message SMGuildInfo -{ - optional int32 errcode = 1; //1:公会不存在 - optional string errmsg = 2; //错误消息 - optional MFGuildBasic info = 3; //公会信息 -} - -//建公会 -message CMGuildCreate -{ - optional string guild_name = 1; //公会名字 - optional int32 guild_badge = 2; //公会徽标 - optional string guild_declaration = 3; //公会徽标 - optional int32 join_unlimited = 4; //不限制加入 - optional int32 join_cond1 = 5; //加入条件1 - optional int32 join_cond2 = 6; //加入条件2 -} -//建公会返回 -message SMGuildCreate -{ - optional int32 errcode = 1; //1:公会已存在 2: 你已经有公会 - optional string errmsg = 2; //错误消息 - optional int64 guild_id = 3; //公会id -} - -//加公会 -message CMGuildJoin -{ - optional int64 guild_id = 1; //公会id -} -//加群返回 -message SMGuildJoin -{ - optional int32 errcode = 1; //1:公会id不存在 2:公会已满 - optional string errmsg = 2; //错误消息 -} - -//同意加公会 -message CMGuildAgree -{ - optional MFGuildApply apply = 1; //申请信息 - optional int32 batchid = 2; //批次号(批量的时候id相同建议用时间戳) -} -message SMGuildAgree -{ - optional int32 errcode = 1; - optional string errmsg = 2; -} - -//拒绝加公会申请 -message CMGuildRefuse -{ - optional MFGuildApply apply = 1; //申请信息 - optional int32 batchid = 2; //批次号(批量的时候id相同建议用时间戳) -} -message SMGuildRefuse -{ - optional int32 errcode = 1; - optional string errmsg = 2; -} - -//踢人 -message CMGuildKick -{ - optional string account_id = 1; -} - -//踢人回复 -message SMGuildKick -{ - optional int32 errcode = 1; //1:群id错误 - optional string errmsg = 2; //错误消息 -} - -//退公会 -message CMGuildQuit -{ -} -message SMGuildQuit -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误消息 -} - -//解散公会 -message CMGuildDismiss -{ -} -message SMGuildDismiss -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 -} - -//修改公会信息(增量更新不需要修改的字段不传) -message CMGuildChange -{ - optional string guild_name = 1; //公会名字 - optional int32 guild_badge = 2; //公会徽标 - optional string guild_declaration = 3; //公会徽标 - optional int32 join_unlimited = 4; //不限制加入 - optional int32 join_cond1 = 5; //加入条件1 - optional int32 join_cond2 = 6; //加入条件2 -} -message SMGuildChange -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 - optional MFGuildBasic info = 3; //公会信息 -} - -//公会成员 -message CMGuildMemberList -{ - optional MFPaging paging = 1; //分页信息 - optional string member_name = 2; //成员名字 -} -message SMGuildMemberList -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 - optional MFPaging paging = 3; //分页信息 - repeated MFUserInfo member_list = 4; //公会成员列表 - optional int32 guild_lv = 5; //公会等级 -} - -//获取公会申请列表 -message CMGuildApplyList -{ - optional MFPaging paging = 1; //分页信息 -} -//获取公会申请列表回复 -message SMGuildApplyList -{ - optional int32 errcode = 1; // - optional string errmsg = 2; //错误消息 - optional MFPaging paging = 3; //分页信息回传 - repeated MFGuildApply apply_list = 4; //申请加公会友列表 - optional int32 guild_lv = 5; //公会等级 -} - -//设置公会成员职位 -message CMGuildMemberSetJob -{ - optional string member_id = 1; //成员id - optional int32 job = 2; //职位 -} -message SMGuildMemberSetJob -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 -} - -//同意邀请 -message CMGuildAgreeInvite -{ - optional int64 guild_id = 1; //公会id - optional string user_sign = 2; //邀请方签名 -} -message SMGuildAgreeInvite -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 -} - -//新增公会经验 -message CMGuildGainExp -{ - optional int32 exp = 1; //检验值 -} -message SMGuildGainExp -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 -} - //发送聊天消息 message CMSendChatMsg { @@ -403,26 +221,6 @@ message CMSendCustomMsg optional int64 param3 = 5; //透传参数3 } -//更新临时自定义数据 -message CMUpdateTempCustomData -{ - /* - 更新方式 - 0: 覆盖 - 1: 用新数据和服务器数据做或运算 - 2: 用新数据和服务器数据做与运算 - - !!!注意 - MFUserRaltimeData走的是增量更新如果不需要处理的字段不传就行 - 服务器对未传的自动不做任何处理 - */ - optional int32 update_type = 1; //更新方式 - optional MFUserTempCustomData temp_custom_data = 2; //临时自定义数据 - - optional int32 delay_time = 100; //延迟更新(单位毫秒) - optional int32 delay_flag = 101; //延迟更新标志(只能为1-16),相同的flag定时器覆盖 -} - //用户上/下线通知 message SMUserStatusNotify {