Merge branch 'dh_dev_draw' into master_test_gn

master_huanxiang
duhui 2021-05-28 10:11:27 +08:00
commit c9195e2cd9
3 changed files with 34 additions and 5 deletions

View File

@ -84,4 +84,26 @@ import "CommonProto.proto";
optional Drop drop = 2;
//
optional int32 damageVal = 3;
}
}
//
message choiceHeroRewardRequest{
optional int32 activityId = 1;
optional int32 rewardId = 2;
}
message choiceHeroRewardResponse{
}
message choiceDrawCardRequest{
optional int32 activityId = 1;
optional int32 type = 2; // :1 :2
}
message choiceDrawCardResponse{
optional Drop drop = 1;
}

View File

@ -289,10 +289,11 @@ option optimize_for = SPEED;
}
required int32 activityId = 1; // id
repeated MissionInfo mission = 2; //
optional int32 value = 6; //
optional int32 startTime = 5; //
optional int32 endTime = 3; //
optional int32 endTime = 3; //
optional int32 reallyOpen = 4; // 0: 1
optional int32 startTime = 5; //
optional int32 value = 6; //
optional int32 choiceRewardId = 7; //,id
}
message GmResponse{

View File

@ -1222,6 +1222,13 @@ enum MessageType{
PurpleMansionSealIndication = 304105;
//
choiceHeroRewardRequest = 3040106;
choiceHeroRewardResponse = 3040107;
choiceDrawCardRequest = 3040108;
choiceDrawCardResponse = 3040109;
//800000global
GetWorldServerRequest = 800001;//ip
GetWorldServerResponse = 800002;
@ -1241,7 +1248,6 @@ enum MessageType{
//
GetWorldArenaRecordInfoRequest= 900007;
GetWorldArenaRecordInfoResponse= 900008;
//gs --word