Merge branch 'dh_dev_practice' into master_test_gn_hardstage

master_huanxiang
xuexinpeng 2021-05-24 11:05:26 +08:00
commit 9347a3572c
1 changed files with 7 additions and 1 deletions

View File

@ -105,7 +105,6 @@ option optimize_for = SPEED;
repeated string jewels = 14;//宝器
optional int32 createtype = 15;//创建类型 1猎妖援助
optional int32 changeId = 16;//置换模板id 默认0
repeated int32 sealIdList = 17;//紫府神印id列表
}
message PokemonInfo{
@ -637,6 +636,12 @@ option optimize_for = SPEED;
optional int32 days = 1; //签到的天数
optional int32 state = 2;//今日是否领取
}
message PurpleSealShowInfo{
optional int32 id = 1;
optional int32 type = 2;
optional int32 heroTId = 3;
}
message TeamSimpleInfo{
optional string heroid = 1;
@ -652,6 +657,7 @@ option optimize_for = SPEED;
repeated TeamSimpleInfo PokemonInfos = 2;
optional int32 totalForce=3;
repeated int64 remainHp = 4;//剩余血量百分比
repeated PurpleSealShowInfo sealShow = 5;//紫府神印
}
//第一编队信息
message TeamOneInfo{