diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index b1d5530..e5e69de 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -445,16 +445,6 @@ message SMReConnect { } -//地图信息 -message SMMapInfo -{ - optional int32 width = 1; //地图宽度 - optional int32 height = 2; //地图高度 - optional int32 speed = 3; //地图移动速度 - repeated MFPlace places = 4; //建筑物 - repeated MFObject objects = 5; //地图对象 -} - //加入 message CMJoin { @@ -550,14 +540,6 @@ message CMVoice //endcmmsg -//语音通知 -message SMVoiceNotify -{ - optional int32 mode = 1; //模式 - optional string account_id = 2; //唯一id - optional string msg = 3; //语音内容 -} - //加入成功 message SMJoinedNotify { @@ -569,6 +551,16 @@ message SMJoinedNotify optional bool elo_start = 6; } +//地图信息 +message SMMapInfo +{ + optional int32 width = 1; //地图宽度 + optional int32 height = 2; //地图高度 + optional int32 speed = 3; //地图移动速度 + repeated MFPlace places = 4; //建筑物 + repeated MFObject objects = 5; //地图对象 +} + //玩家信息 message SMPlayerInfo { @@ -639,3 +631,11 @@ message SMDisconnectNotify { optional string reason = 1; //断线原因 } + +//语音通知 +message SMVoiceNotify +{ + optional int32 mode = 1; //模式 + optional string account_id = 2; //唯一id + optional string msg = 3; //语音内容 +} diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 3d395de..9ff574a 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -13,7 +13,8 @@ message SafeArea optional int32 level = 2; //安全区登记 optional int32 rad = 3; //半径 optional int32 wait_time = 4; //等待时间 - optional int32 hurt = 5; //伤害/秒 + optional int32 shrink_time = 5; //收缩伤害 + optional int32 hurt = 6; //伤害/秒 } message Item