diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto index bfe8262..ac01f3c 100755 --- a/dependency/proto/Message2Clients.proto +++ b/dependency/proto/Message2Clients.proto @@ -17,18 +17,20 @@ message MessageOfStudent PlayerState player_state = 9; int64 guid = 10; PlayerState state = 11; - // double fail_time = 12; // 挂科的时间 - // double emo_time = 14; // EMO的时间 + BulletType bullet_type = 12; + int32 learning_speed = 13; // 修理电机的速度 + int32 treat_speed = 14; // 治疗的速度 int64 player_id = 15; int32 view_range = 16; // 视野距离 int32 radius = 17; // 半径 - int32 damage = 18; + // int32 damage = 18; double danger_alert = 19; // 危险警报,在捣蛋鬼靠近时会有预警 int32 score = 20; int32 treat_progress = 21; // 治疗进度 int32 rescue_progress = 22; // 救援进度 StudentType student_type = 23; - repeated StudentBuffType buff = 24; + double facing_direction = 24; + repeated StudentBuffType buff = 25; } message MessageOfTricker @@ -36,20 +38,23 @@ message MessageOfTricker int32 x = 1; int32 y = 2; int32 speed = 3; - int32 damage = 4; // 对学生造成的心理伤害 + int32 damage = 4; // 对学生造成的伤害 repeated double time_until_skill_available = 5; PlaceType place = 6; repeated PropType prop = 7; TrickerType tricker_type = 8; int64 guid = 9; - bool movable = 10; // 是否进入了攻击后摇 + // bool movable = 10; // 是否进入了攻击后摇 + int32 score = 10; int64 player_id = 11; int32 view_range = 12; // 视野距离 int32 radius = 13; // 半径 PlayerState player_state = 14; double trick_desire = 15; double class_volume = 16; - repeated TrickerBuffType buff = 17; + double facing_direction = 17; + BulletType bullet_type = 18; + repeated TrickerBuffType buff = 19; } message MessageOfBullet @@ -61,7 +66,8 @@ message MessageOfBullet int64 guid = 5; PlayerType team = 6; PlaceType place = 7; - double bomb_range = 8; + double bomb_range = 8; + int32 speed = 9; } message MessageOfBombedBullet //for Unity,直接继承自THUAI5 @@ -110,11 +116,19 @@ message MessageOfGate int32 progress = 3; } +message MessageOfHiddenGate +{ + int32 x = 1; + int32 y = 2; + bool opened = 3; +} + message MessageOfDoor { int32 x = 1; int32 y = 2; bool is_open = 3; + int32 number = 4; } message MessageOfChest @@ -133,6 +147,13 @@ message MessageOfMap repeated Row row = 2; } +message MessageOfNews +{ + string news = 1; + int64 from_id = 2; + int64 to_id = 3; +} + message MessageOfObj { oneof message_of_obj @@ -146,6 +167,8 @@ message MessageOfObj MessageOfDoor door_message = 7; MessageOfGate gate_message = 8; MessageOfChest chest_message = 9; + MessageOfHiddenGate hidden_gate_message = 10; + MessageOfNews news_message = 11; } } @@ -181,9 +204,9 @@ message BoolRes // 用于只需要判断执行操作是否成功的行为,如 bool act_success = 1; } -message MsgRes // 用于获取队友发来的消息 -{ - bool have_message = 1; // 是否有待接收的消息 - int64 from_player_id = 2; - string message_received = 3; -} +// message MsgRes // 用于获取队友发来的消息 +// { +// bool have_message = 1; // 是否有待接收的消息 +// int64 from_player_id = 2; +// string message_received = 3; +// } diff --git a/dependency/proto/Services.proto b/dependency/proto/Services.proto index c501b5d..f9d5837 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -15,9 +15,10 @@ service AvailableService rpc Move (MoveMsg) returns (MoveRes); rpc PickProp (PropMsg) returns (BoolRes); rpc UseProp (PropMsg) returns (BoolRes); + rpc ThrowProp (PropMsg) returns (BoolRes); rpc UseSkill (SkillMsg) returns (BoolRes); rpc SendMessage (SendMsg) returns (BoolRes); - rpc GetMessage (IDMsg) returns (stream MsgRes); + // rpc GetMessage (IDMsg) returns (stream MsgRes); rpc StartLearning (IDMsg) returns (BoolRes); // 开始修理机器 rpc StartRescueMate (IDMsg) returns (BoolRes); // 开始救人 rpc StartTreatMate (IDMsg) returns (BoolRes);