Merge branch 'master_test_gn_ys' into master_test_gn

# Conflicts:
#	protos/CommonProto.proto
master_huanxiang
yuanshuai 2021-09-22 15:16:50 +08:00
commit fcbd24e755
4 changed files with 44 additions and 0 deletions

View File

@ -1050,6 +1050,20 @@ option optimize_for = SPEED;
optional string myServerName = 18; //
}
//
message SixiangxinfaPropertyInfo{
optional int32 propertyId = 1;//id
optional int32 propertyNum=2;//
}
//
message SixiangxinfaInfo{
optional int32 professionId = 1;//id
optional int32 level = 2;//
repeated SixiangxinfaPropertyInfo propertyInfoList=3;//
}
//
message FourChallengeInfo{
optional int32 type = 1;//

View File

@ -420,7 +420,30 @@ import "CommonProto.proto";
repeated beautyBagCardInfo infoList = 1;
}
//
message SixiangUpRequest{
optional int32 professionId = 1;
}
message SixiangUpResponse{
repeated SixiangxinfaPropertyInfo infoList = 1;
}
//
message SixiangUpStarRequest{
optional int32 professionId = 1;
}
message SixiangUpStarResponse{
optional int32 starLv = 1;
repeated SixiangxinfaPropertyInfo infoList = 2;
}

View File

@ -1100,6 +1100,12 @@ enum MessageType{
//20111 - 20200
EQUIP_COMPLEX_REQUEST = 20111;//
EQUIP_COMPLEX_RESPONSE = 20112;
SIXIANG_UP_REQUEST = 20201;//
SIXIANG_UP_RESPONSE = 20202;
SIXIANG_UP_STAR_REQUEST = 20203;//
SIXIANG_UP_STAR_RESPONSE = 20204;

View File

@ -84,6 +84,7 @@ import "CommonProto.proto";
optional int32 randomCount = 43;//
repeated randomTypeNum drawTimes = 44;//
repeated HelpFightList helpFightList = 45;//
repeated SixiangxinfaInfo sixiangInfos = 46;//
}