Merge branch 'master_test_gn' into dh_dev_sevenworld

master_huanxiang
duhui 2021-09-17 14:23:50 +08:00
commit e9cb856ee5
3 changed files with 27 additions and 20 deletions

View File

@ -466,9 +466,9 @@ import "CommonProto.proto";
}
message ChallengeDeathPathResponse{
optional FightData fightData = 1;
optional int32 damage = 2;
optional int64 damage = 2;
optional Drop drop = 3;
optional int32 historyMax = 4;//历史最高伤害
optional int64 historyMax = 4;//历史最高伤害
}
message CarGrapRecordResponse{

View File

@ -343,21 +343,28 @@ import "CommonProto.proto";
}
// 获取鸿蒙阵信息
message GetHongmengInfoResponse{
}
// 鸿蒙阵信息推送
message HongmengInfoIndication{
repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者
message GetHongmengInfoRequest{
}
message GetHongmengInfoResponse{
repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者
repeated HongmengAddition hongmengAdditions = 2; // 共鸣加成
repeated HongmengHeroInfo hongmengResonacnes = 3; // 共鸣使者
optional int32 hongmengTabletMax = 4; // 鸿蒙碑等级上限,0:未开启,其他为鸿蒙碑等级
}
}
// 鸿蒙阵信息推送
message HongmengInfoIndication{
repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者
repeated HongmengAddition hongmengAdditions = 2; // 共鸣加成
repeated HongmengHeroInfo hongmengResonacnes = 3; // 共鸣使者
optional int32 hongmengTabletMax = 4; // 鸿蒙碑等级上限,0:未开启,其他为鸿蒙碑等级
}
// 鸿蒙碑新手引导推送
message HongmengSteleNewHandIndication{
optional int32 state = 1;// 开启鸿蒙碑
}
optional int32 state = 1;// 开启鸿蒙碑
}
// 修行玩法 升级
message UpPracticeLevelRequest{}

View File

@ -533,18 +533,18 @@ enum MessageType{
GET_ENDLESS_HERO_LIST_INFO_REQUEST = 16691;//获取无尽副本可以使用的英雄
GET_ENDLESS_HERO_LIST_INFO_RESPONSE = 16692;
// H 10700
HERO_RAND_REQQUEST = 10701;
HERO_RAND_RESPONSE = 10702;
// H 10700
HERO_RAND_REQQUEST = 10701;
HERO_RAND_RESPONSE = 10702;
HERO_COMPOSE_REQUEST = 10703; // 合成英雄
HERO_COMPOSE_RESPONSE = 10704;
HERO_COMPOSE_REQUEST = 10703; // 合成英雄
HERO_COMPOSE_RESPONSE = 10704;
HERO_RETURN_REQUEST = 10705; //英雄回溯
HERO_RETURN_RESPONSE = 10706;
HERO_RETURN_REQUEST = 10705; //英雄回溯
HERO_RETURN_RESPONSE = 10706;
HERO_LOCK_CHANGE_REQUEST = 10707 ;// 英雄上锁操作
HERO_LOCK_CHANGE_RESPONSE = 10708;
HERO_LOCK_CHANGE_REQUEST = 10707 ;// 英雄上锁操作
HERO_LOCK_CHANGE_RESPONSE = 10708;
HERO_SKIN_GET_ALL_REQUEST = 10709;//获取所有皮肤
HERO_SKIN_GET_ALL_RESPONSE = 10710;