Merge branch 'dev_dh_bt' into bt/shenbing

master_huanxiang
duhui 2023-03-29 16:09:37 +08:00
commit 4fa6528edc
1 changed files with 8 additions and 9 deletions

View File

@ -751,15 +751,14 @@ option optimize_for = SPEED;
message TeamOneTeamInfo{ message TeamOneTeamInfo{
repeated TeamSimpleInfo team =1; repeated TeamSimpleInfo team =1;
repeated TeamSimpleInfo PokemonInfos = 2; repeated TeamSimpleInfo PokemonInfos = 2;
repeated TeamSimpleInfo MagicSoldier = 3; optional int32 totalForce = 3;
optional int32 totalForce=4; repeated int64 remainHp = 4;//
repeated int64 remainHp = 5;// repeated PurpleSealShowInfo sealShow = 5;//
repeated PurpleSealShowInfo sealShow = 6;// repeated TransformationCardInfo transformationCardInfo = 6;//
repeated TransformationCardInfo transformationCardInfo = 7;// repeated SixiangxinfaInfo sixiangxinfaInfo = 7;//
repeated SixiangxinfaInfo sixiangxinfaInfo = 8;// repeated LifeGridInfo lifeGridInfo = 8;//
repeated LifeGridInfo lifeGridInfo = 9;// repeated UserMountInfo userMountInfo = 9;//
repeated UserMountInfo userMountInfo = 10;// repeated TeamSimpleInfo MagicSoldier = 10;//
} }
// //
message TeamOneInfo{ message TeamOneInfo{