Merge branch 'master_test_gn' into master_test_gn_endless

lvxinran 2021-07-03 01:21:32 +08:00
commit a84116efb9
6 changed files with 23 additions and 6 deletions

View File

@ -796,6 +796,7 @@ option optimize_for = SPEED;
optional int32 itemId = 7;
optional int32 position = 8;//
optional int32 userTitle = 9;
optional int32 practiceLevel = 10;
}
message ExpeditionSimpleBossInfo{
@ -861,6 +862,8 @@ option optimize_for = SPEED;
optional string targetname =4;
optional int32 type =5;//
optional int32 time =6;//
optional int32 helpPracticeLevel = 7;
optional int32 targetPracticeLevel = 8;
}
@ -945,6 +948,7 @@ option optimize_for = SPEED;
optional FightData fightData = 6;
optional int32 power = 7;
optional int32 type = 8;//1: 2
optional int32 practiceLevel = 9;//
}
//
message HardStageChapterReward{

View File

@ -362,6 +362,7 @@ import "CommonProto.proto";
optional string sendName = 3;
optional int32 head = 4;
optional int32 headFrame = 5;
optional int32 practiceLevel = 6;
}
message RedPackageLikeRequest{
optional int32 uid = 1;
@ -529,6 +530,7 @@ import "CommonProto.proto";
optional int32 uid = 1;//uid
optional string name = 2;//name
repeated GuildHelpInfo guildHelpInfo = 3;//
optional int32 practiceLevel = 4;//
}
message GuildHelpHelpOtherRequest{ // GuildHelpInfoIndication

View File

@ -239,5 +239,14 @@ import "CommonProto.proto";
optional int32 leftTime = 3; //
}
//
message SweepDemonRequest {
optional int32 id = 1; //
optional bool onkeySweep = 2;//
}
message SweepDemonResponse {
//
optional Drop Drop = 1; //
}

View File

@ -367,10 +367,6 @@ import "CommonProto.proto";
//
//
// 1: oldSealId != newSealId :
// 2: oldSealId == newSealId && newSealId.subId == subId :
// 3: oldSealId == newSealId && newSealId.subId != subId :
message ReplacePurpleMansionSealRequest{
optional int32 oldSealId = 1;//id
optional int32 newSealId = 2;//id

View File

@ -84,6 +84,7 @@ enum MessageType{
WELFARE_RED_PACKET_INFO = 10056;//
WELFARE_RED_PACKET_SEND_REQUEST = 10057;//
WELFARE_RED_PACKET_SEND_RESPONSE = 10058;
WELFARE_RED_PACKET_REQUEST = 10059;
// B 10100
BUY_STORE_ITEM_REQUEST = 10100; //
@ -1030,7 +1031,9 @@ enum MessageType{
VIP_LEVEL_STATE_REWARD_REQUEST = 12224;//
VIP_LEVEL_STATE_REWARD_RESPONSE = 12225;
SWEEP_DEMON_REQUEST = 12226;//
SWEEP_DEMON_RESPONSE = 12227;//

View File

@ -887,7 +887,7 @@ import "CommonProto.proto";
message VipLevelStateRequset{
}
message VipLevelStateResponse{
repeated KeyVal vipState = 1;//<id,(0,1)>
repeated KeyVal vipState = 1;//<id,(0,1 2:)>
}
//
message VipLevelStateRewardRequset{
@ -896,3 +896,6 @@ import "CommonProto.proto";
message VipLevelStateRewardResponse{
optional Drop drop = 1;
}
//
message WelfareRedPacketRequest{
}