Merge branch 'master_test_gn' into master_test_gn_xxp

# Conflicts:
#	protos/MessageTypeProto.proto
master_huanxiang
xuexinpeng 2022-01-06 16:11:04 +08:00
commit 6fe6780220
2 changed files with 12 additions and 0 deletions

View File

@ -441,3 +441,10 @@ import "CommonProto.proto";
message EndlessTakeTreasureResponse{
optional Drop drop =1;
}
//
message TowerGetRewardInfoShowRequest{
}
message TowerGetRewardInfoShowResponse{
optional Drop drop = 1;//
}

View File

@ -1382,6 +1382,7 @@ enum MessageType{
WeekCardRewardResponse = 3050033;
WeekCardIndicationInfoResponse = 3050034;
//
ExplorerMapInfoRequest = 3050040;
ExplorerMapInfoResponse = 3050041;
@ -1392,6 +1393,10 @@ enum MessageType{
ExplorerMapRewardRequest = 3050046;
ExplorerMapRewardResponse = 3050047;
ExplorerMapIndicationResponse = 3050048;
//
TowerGetRewardInfoShowRequest = 3050050;
TowerGetRewardInfoShowResponse = 3050051;
//800000global