diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index c422c27..765d504 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -8,11 +8,10 @@ enum CMMessageId_e _CMJoin = 200; _CMMove = 201; - _CMEdit = 202; _CMDropItem = 203; - _CMSendEmote = 204; + _CMEmote = 204; _CMSpectate = 205; - _CMSendVoice = 206; + _CMVoice = 206; } enum SMMessageId_e diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index d51435b..d1e2052 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -102,7 +102,7 @@ message MFPlayerStats optional int32 kills = 4; optional int32 dead = 5; optional int32 damage_type = 6; - //source_type + optional int32 source_type = 30; optional int32 killer_id = 7; optional int32 damage_given = 8; optional int32 damage_taken = 9; @@ -119,7 +119,7 @@ message MFPlayerStats optional int32 chg_elo = 19; optional int32 heal_heath = 20; - optional string uuid = 21; + optional string account_id = 21; repeated MFGoods annual_goods = 22; } @@ -170,7 +170,7 @@ message CMJoin optional int32 bot = 6; //是否机器人 optional string name = 7; //角色名 optional int32 use_touch = 8; //zzz - optional string uuid = 9; //账号id account_id + optional string account_id = 9; //账号id account_id repeated int32 emotes = 10; //表情列表 optional string icon = 11; //头像 optional int32 energy_shield = 12; //能量护盾 @@ -213,13 +213,6 @@ message CMMove optional MFVector2D to_move_dir = 24; //移动方向 } -//xxx -message CMEditMsg -{ - optional bool cull = 1; //zz - optional float zoom = 2; //zz -} - //丢弃道具 message CMDropItem { @@ -228,7 +221,7 @@ message CMDropItem } //发送表情 -message CMSendEmote +message CMEmote { optional int32 type = 1; optional MFVector2D pos = 2; @@ -245,11 +238,10 @@ message CMSpectate } //语音 -message CMSendVoice +message CMVoice { optional int32 mode = 1; //模式 - optional string uuid = 2; //唯一id - optional string msg = 3; //语音内容 + optional string msg = 2; //语音内容 } @@ -259,7 +251,7 @@ message CMSendVoice message SMVoiceNotify { optional int32 mode = 1; //模式 - optional string uuid = 2; //唯一id + optional string account_id = 2; //唯一id optional string msg = 3; //语音内容 }