# Conflicts:
#	protos/CommonProto.proto
master_huanxiang
zhangshanxue 2019-08-30 11:37:32 +08:00
commit 74f5090f76
4 changed files with 23 additions and 1 deletions

View File

@ -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;
}

View File

@ -287,3 +287,8 @@ import "CommonProto.proto";
message EndlessTimeIndication{
repeated EndlessRefreshInfo infos = 1;
}
//
message EndlessMinMapResponse{
optional int32 myXY = 1;
repeated EndlessPoint points = 2;
}

View File

@ -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

View File

@ -27,4 +27,8 @@ message BroadMsgIndication{
repeated ActorEffectBufferInfo ActorEffectBufferInfo =2;
repeated int32 removeBufferId =3; // buffer
repeated int32 removeActorId = 4 ;//
}
message SceneEndIndication{
}