From 2dc5796e54bc9a621b2d1ba20e43d15c648b4307 Mon Sep 17 00:00:00 2001 From: azw Date: Wed, 15 Feb 2023 14:05:18 +0000 Subject: [PATCH] 1 --- server/tools/protobuild/cs_msgid.proto | 19 ---- server/tools/protobuild/cs_proto.proto | 140 +------------------------ 2 files changed, 1 insertion(+), 158 deletions(-) diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 99fa355..a37ea77 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -17,16 +17,11 @@ enum CMMessageId_e _CMFriendDeleteBlack = 113; _CMFriendRefuse = 114; _CMFriendList = 115; - _CMQueryUserStatus = 116; - _CMRecommandFriend = 117; - _CMFriendIdList = 118; _CMSendChatMsg = 151; _CMSendCustomMsg = 152; _CMUpdateTempCustomData = 153; _CMUpdateUserInfo = 154; - _CMDirtyWordCheck = 155; - _CMGetUserGuild = 156; _CMReadMsgAndOpenChatNotify = 157; _CMCloseChatNotify = 158; _CMSetCurrPrivateChatTarget = 159; @@ -40,16 +35,12 @@ enum CMMessageId_e _CMGuildDismiss = 236; _CMGuildChange = 237; _CMGuildInfo = 238; - _CMGuildSearch = 239; - _CMGuildRank = 240; _CMGuildMemberList = 241; _CMGuildApplyList = 242; - _CMGuildLog = 243; _CMGuildMemberSetJob = 244; _CMGuildRefuse = 245; _CMGuildAgreeInvite = 246; _CMGuildGainExp = 247; - _CMGuildSearchMember = 248; _CMGuildMsgEnd = 270; } @@ -70,12 +61,6 @@ enum SMMessageId_e _SMFriendDeleteBlack = 113; _SMFriendRefuse = 114; _SMFriendList = 115; - _SMQueryUserStatus = 116; - _SMRecommandFriend = 117; - _SMFriendIdList = 118; - - _SMDirtyWordCheck = 155; - _SMGetUserGuild = 156; _SMGuildMsgBegin = 230; _SMGuildCreate = 231; @@ -86,16 +71,12 @@ enum SMMessageId_e _SMGuildDismiss = 236; _SMGuildChange = 237; _SMGuildInfo = 238; - _SMGuildSearch = 239; - _SMGuildRank = 240; _SMGuildMemberList = 241; _SMGuildApplyList = 242; - _SMGuildLog = 243; _SMGuildMemberSetJob = 244; _SMGuildRefuse = 245; _SMGuildAgreeInvite = 246; _SMGuildGainExp = 247; - _SMGuildSearchMember = 248; _SMGuildMsgEnd = 270; _SMUserStatusNotify = 501; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 1e6b488..3e945c0 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -164,30 +164,13 @@ message MFChatMsg } //登录好友服 -message CMLoginCommonHead -{ - optional int32 server_id = 1; //保留 -} -message CMLoginOld -{ - optional string account_id = 3; //账号id - optional string session_id = 20; //sessionid - optional string nickname = 4; //昵称 - optional string avatar_url = 5; //头像 - optional int32 sex = 6; //性别 -} message CMLogin { - optional int32 server_id = 1; //保留(定死传1) + optional int32 reserved1 = 1; //保留 optional string reserved2 = 2; //保留 optional string account_id = 3; //账号id optional string session_id = 20; //sessionid - optional string nickname = 4; //昵称 optional int32 proto_version = 5; //协议版本号Constant_e.ProtoVersion - optional int32 sex = 6; //性别 - optional string avatar_url = 7; //头像 - optional int32 vip_lv = 8; //性别 - optional int32 head = 9; //头像框 optional int32 zid = 10; //zid } @@ -217,33 +200,6 @@ message CMUpdateUserInfo optional int32 delay_flag = 101; //延迟更新标志(只能为1-16)，相同的flag定时器覆盖 } -//屏蔽字检查 -message CMDirtyWordCheck -{ - optional string text = 2; //待检查文本 -} -//屏蔽字检查回复 -message SMDirtyWordCheck -{ - optional int32 errcode = 1; //错误消息 - optional string errmsg = 2; //错误消息 -} - -//获取自己的公会信息 -message CMGetUserGuild -{ - optional string account_id = 1; //用户id，传空或不传获取自己 -} -//获取自己 -message SMGetUserGuild -{ - optional int32 errcode = 1; //1:公会不存在 - optional string errmsg = 2; //错误消息 - optional string account_id = 3; //用户id，传空或不传获取自己 - optional int64 guild_id = 4; //工会id(没有公会的话为0) - optional int32 guild_job = 5; //公会职位 1:公会长 2:副公会长 3：精英成员 其他(0)：普通会员 -} - //获取好友列表 message CMFriendList { @@ -354,19 +310,6 @@ message SMFriendDeleteBlack optional string errmsg = 2; //错误消息 } -//获取好友/黑名单id列表 -message CMFriendIdList -{ -} -//获取好友/黑名单id列表回复 -message SMFriendIdList -{ - optional int32 errcode = 1; // - optional string errmsg = 2; //错误消息 - repeated string friends = 3; //好友 - repeated string blacklist = 4; //黑名单 -} - //获取公会信息 message CMGuildInfo { @@ -484,33 +427,6 @@ message SMGuildChange optional MFGuildBasic info = 3; //公会信息 } -//查询公会 -message CMGuildSearch -{ - optional MFPaging paging = 1; //分页信息 - optional string guild_name = 2; //公会名字 -} -message SMGuildSearch -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 - optional MFPaging paging = 3; //分页信息 - repeated MFGuildBasic guild_list = 4; //公会列表 -} - -//公会排行榜 -message CMGuildRank -{ - optional MFPaging paging = 1; //分页信息 -} -message SMGuildRank -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 - optional MFPaging paging = 3; //分页信息 - repeated MFGuildBasic guild_list = 4; //公会列表 -} - //公会成员 message CMGuildMemberList { @@ -541,26 +457,6 @@ message SMGuildApplyList optional int32 guild_lv = 5; //公会等级 } -//公会动态(日志) -message CMGuildLog -{ - optional MFPaging paging = 1; //分页信息 -} -message SMGuildLog -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 - optional MFPaging paging = 3; //分页信息 - /* - values[0]: account_id - values[1]: 角色名 - values[2]: 职位 1:队长 2:副队长 3:精英会员 其他(0):普通会员 - values[3]: 行为时间(unix时间戳) - values[4]: 行为 - */ - repeated MFStringTuple logs = 4; -} - //设置公会成员职位 message CMGuildMemberSetJob { @@ -596,19 +492,6 @@ message SMGuildGainExp optional string errmsg = 2; //错误信息 } -//查询公会成员信息 -message CMGuildSearchMember -{ - optional string target_id = 1; //账号id -} -message SMGuildSearchMember -{ - optional int32 errcode = 1; //错误码 - optional string errmsg = 2; //错误信息 - optional MFGuildBasic guild_basic = 3; //公会基本信息 - optional MFUserInfo user_info = 4; //用户信息 -} - //发送聊天消息 message CMSendChatMsg { @@ -668,27 +551,6 @@ message CMUpdateTempCustomData optional int32 delay_flag = 101; //延迟更新标志(只能为1-16)，相同的flag定时器覆盖 } -//查询用户状态 -message CMQueryUserStatus -{ - repeated string user_list = 1; //用户列表 -} -//查询用户状态返回 -message SMQueryUserStatus -{ - repeated MFUserStatus status_list = 1; //用户状态列表 -} - -//获取推荐好友 -message CMRecommandFriend -{ -} -//获取推荐好友返回 -message SMRecommandFriend -{ - repeated MFUserInfo friend_list = 1; //好友列表 -} - //用户上/下线通知 message SMUserStatusNotify {