Merge branch 'master_test_gn' into master_test_gn_zbh

# Conflicts:
#	protos/MessageTypeProto.proto
master_huanxiang
mengchengzhen 2021-07-15 17:09:39 +08:00
commit 8021945db7
2 changed files with 33 additions and 5 deletions

View File

@ -106,4 +106,22 @@ import "CommonProto.proto";
}
// /
message qiMenDunJiaDrawRequest{
optional int32 activityId = 1;
}
message qiMenDunJiaDrawResponse{
optional Drop drop = 1;//
repeated int32 idList = 2;//id
}
message qiMenDunJiaHitListRequest{
optional int32 activityId = 1;
}
message qiMenDunJiaHitListResponse{
repeated int32 hitList = 1;
}

View File

@ -1037,6 +1037,7 @@ enum MessageType{
// X 12300
// Y 12400
// Z 12500
@ -1236,7 +1237,15 @@ enum MessageType{
choiceWishHeroResponse = 3040125;
// -
//
qiMenDunJiaDrawRequest = 3040110;
qiMenDunJiaDrawResponse = 3040111;
qiMenDunJiaHitListRequest = 3040112;
qiMenDunJiaHitListResponse = 3040113;
// -
beautyBagCardIndication = 3040126;
beautyBagWishEquipRequest = 3040127;
@ -1245,6 +1254,7 @@ enum MessageType{
//800000global
GetWorldServerRequest = 800001;//ip
GetWorldServerResponse = 800002;