Merge branch 'master_test_gn' into master_test_gn_lifeGrid

master_huanxiang
yuanshuai 2021-12-13 10:45:30 +08:00
commit 24fdc5b21f
4 changed files with 20 additions and 5 deletions

View File

@ -192,4 +192,13 @@ import "CommonProto.proto";
repeated int32 selectIds = 1; repeated int32 selectIds = 1;
} }
//
message BuyGoodsToItemRequest{
optional int32 goodId = 1;
optional int32 goodsNum = 2;
}
message BuyGoodsToItemResponse{
optional Drop drop = 1;
}

View File

@ -835,13 +835,14 @@ option optimize_for = SPEED;
message ExpeditionSimpleBossInfo{ message ExpeditionSimpleBossInfo{
optional int32 heroTid = 1;//id optional int32 heroTid = 1;//id
optional int32 star = 2; optional int32 star = 2;
optional int32 level =3; optional int32 level = 3;
optional double remainHp =4;// optional double remainHp = 4;//
optional int32 position = 5; // 1 2 3 4 optional int32 position = 5; // 1 2 3 4
optional int32 godSoulLv = 6;//
} }
message ExpeditionTeamInfo{ message ExpeditionTeamInfo{
repeated ExpeditionSimpleBossInfo hero =1; repeated ExpeditionSimpleBossInfo hero =1;
repeated int32 PokemonInfos = 2; repeated int32 PokemonInfos = 2;
optional int32 totalForce=3; optional int32 totalForce=3;
optional int32 teamInfo=4;// id optional int32 teamInfo=4;// id

View File

@ -569,7 +569,7 @@ import "CommonProto.proto";
optional int32 canSweep = 3;//boss optional int32 canSweep = 3;//boss
optional int32 buffCount = 4;//buff optional int32 buffCount = 4;//buff
optional int32 buffTime = 5;//buff optional int32 buffTime = 5;//buff
optional int32 sweepDamage = 6;// optional int64 sweepDamage = 6;//
repeated int32 refreshedBoss = 7;//使boss repeated int32 refreshedBoss = 7;//使boss
optional int32 isRefresh = 8;//10 optional int32 isRefresh = 8;//10
} }
@ -581,7 +581,7 @@ import "CommonProto.proto";
optional int32 kill = 1;//boss optional int32 kill = 1;//boss
optional Drop drop = 2; optional Drop drop = 2;
optional FightData fightData = 3;// optional FightData fightData = 3;//
optional int32 damage = 4;// optional int64 damage = 4;//
} }
message GuildChallengeIndication{ message GuildChallengeIndication{
optional int32 curBoss = 1;//bossId optional int32 curBoss = 1;//bossId

View File

@ -1367,6 +1367,11 @@ enum MessageType{
UpOrDownTransformationRequest = 3050022; UpOrDownTransformationRequest = 3050022;
//
BuyGoodsToItemRequest = 3050023;
BuyGoodsToItemResponse = 3050024;
// //
WeekCardInfoRequest = 3050030; WeekCardInfoRequest = 3050030;