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{
}