Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts: # protos/CommonProto.protomaster_huanxiang
commit
74f5090f76
|
@ -466,7 +466,7 @@ option optimize_for = SPEED;
|
|||
optional int32 state = 3; //当前状态 1 : 不可移动 0 : 可移动
|
||||
optional int32 type =4 ;// 演员类型 1 玩家 2 怪物 3 矿点 4 npc
|
||||
optional Creature Creature = 6 ;//动作演员信息
|
||||
optional int32 userName = 7; //玩家名称(只有玩家才有)
|
||||
optional string userName = 7; //玩家名称(只有玩家才有)
|
||||
}
|
||||
|
||||
|
||||
|
@ -592,7 +592,13 @@ option optimize_for = SPEED;
|
|||
optional int32 mapId = 1;
|
||||
optional int32 worldLevel = 2;
|
||||
}
|
||||
|
||||
message PlayerBindPhone{
|
||||
optional string phoneNum = 1;
|
||||
optional int32 state = 2;//本月绑定状态 0 未绑定 1已绑定未领奖 2已领奖
|
||||
}
|
||||
//无尽副本小地图点信息
|
||||
message EndlessPoint{
|
||||
optional int32 location = 1;
|
||||
optional int32 monsterId = 2;
|
||||
}
|
|
@ -287,3 +287,8 @@ import "CommonProto.proto";
|
|||
message EndlessTimeIndication{
|
||||
repeated EndlessRefreshInfo infos = 1;
|
||||
}
|
||||
//无尽副本小地图信息
|
||||
message EndlessMinMapResponse{
|
||||
optional int32 myXY = 1;
|
||||
repeated EndlessPoint points = 2;
|
||||
}
|
||||
|
|
|
@ -151,6 +151,9 @@ enum MessageType{
|
|||
|
||||
ENDLESS_REFRESH_INDICAITON = 10420;//无尽副本推送刷新时间
|
||||
|
||||
ENDLESS_MIN_MAP_INFO_REQUEST = 10421;//无尽副本小地图信息
|
||||
ENDLESS_MIN_MAP_INFO_RESPONSE = 10422;
|
||||
|
||||
// F 10500
|
||||
FIGHT_START_REQUEST = 10500; //
|
||||
FIGHT_START_RESPONSE = 10501;
|
||||
|
@ -541,6 +544,10 @@ enum MessageType{
|
|||
|
||||
SIGN_IN_REQUEST = 11827; //签到
|
||||
SIGN_IN_RESPONSE =11828;
|
||||
|
||||
SCENE_GAME_OVER_READY_INDICATION = 11829 ; // 最后狂欢时刻到来
|
||||
|
||||
SCENE_GAME_OVER_INDICATION = 11830; // 场景结算
|
||||
|
||||
|
||||
// T 11900
|
||||
|
|
|
@ -27,4 +27,8 @@ message BroadMsgIndication{
|
|||
repeated ActorEffectBufferInfo ActorEffectBufferInfo =2;
|
||||
repeated int32 removeBufferId =3; // 被删除的buffer
|
||||
repeated int32 removeActorId = 4 ;//演员被移除
|
||||
}
|
||||
|
||||
message SceneEndIndication{
|
||||
|
||||
}
|
Loading…
Reference in New Issue