From 0d15b7960665e86f9a4ccb4cbbd5e332f108f255 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 11 Mar 2019 20:18:54 +0800 Subject: [PATCH] 1 --- server/tools/protobuild/cs_msgid.proto | 17 +++++++- server/tools/protobuild/cs_proto.proto | 54 ++++++++++++++------------ 2 files changed, 45 insertions(+), 26 deletions(-) diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 267f34e..c422c27 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -5,12 +5,27 @@ enum CMMessageId_e { _CMPing = 101; _CMLogin = 103; + + _CMJoin = 200; + _CMMove = 201; + _CMEdit = 202; + _CMDropItem = 203; + _CMSendEmote = 204; + _CMSpectate = 205; + _CMSendVoice = 206; } enum SMMessageId_e { - _SMPing = 101; _SMRpcError = 102; _SMLogin = 103; + + _SMVoiceNotify = 1001; + _SMJoinedNotify = 1002; + _SMPlayerInfo = 1003; + _SMUpdate = 1004; + _SMKillMsg = 1005; + _SMPickup = 1006; + _SMDisconnectNotify = 1007; } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 774f6e1..d51435b 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -182,12 +182,6 @@ message CMJoin optional string gmode = 21; } -//断线通知 -message SMDisconnectNotify -{ - optional string reason = 1; //断线原因 -} - //移动 message CMMove { @@ -243,6 +237,32 @@ message CMSendEmote //optional bool is_ping = 5; } +//自杀 +message CMSpectate +{ + optional int32 spec_next = 1; + optional int32 spec_prev = 2; +} + +//语音 +message CMSendVoice +{ + optional int32 mode = 1; //模式 + optional string uuid = 2; //唯一id + optional string msg = 3; //语音内容 +} + + +//endcmmsg + +//语音通知 +message SMVoiceNotify +{ + optional int32 mode = 1; //模式 + optional string uuid = 2; //唯一id + optional string msg = 3; //语音内容 +} + //加入成功 message SMJoinedNotify { @@ -305,24 +325,8 @@ message SMPickup optional int32 count = 3; } -//自杀 -message CMSpectate +//断线通知 +message SMDisconnectNotify { - optional int32 spec_next = 1; - optional int32 spec_prev = 2; -} - -//语音 -message CMSendVoice -{ - optional int32 mode = 1; //模式 - optional string uuid = 2; //唯一id - optional string msg = 3; //语音内容 -} - -message CMVoiceNotify -{ - optional int32 mode = 1; //模式 - optional string uuid = 2; //唯一id - optional string msg = 3; //语音内容 + optional string reason = 1; //断线原因 }