Merge branch 'master_test_hw' into master_test_hw_arean

# Conflicts:
#	protos/MessageTypeProto.proto
master_huanxiang
lvxinran 2020-12-12 14:11:59 +08:00
commit f30caed97d
7 changed files with 38 additions and 0 deletions

View File

@ -34,4 +34,25 @@ import "CommonProto.proto";
message SpecicalMonsterChooseRequest{
optional int32 activityId = 1;
optional int32 selectId = 2;
}
//
message NewGeneralAttackRequest{
// id
optional int32 activityId = 1;
// 使id
optional int32 privilageTypeId = 2;
}
message NewGeneralAttackResponse{
//
optional FightData fightData = 1;
//
optional Drop drop = 2;
}
//
message UpgradeGodTreeRequest{
}
message UpgradeGodTreeResponse{
}

View File

@ -27,6 +27,7 @@ import "CommonProto.proto";
repeated ArenaEnemy arenaEnemys = 3; //
optional FightData fightData =4; //
optional int32 fightResult = 5 ;//
optional Drop drop = 6;
}
message GetArenaRankInfoResponse{

View File

@ -17,6 +17,7 @@ message ChatInfo{
//
optional int32 messageType = 13; // 1:,2:
optional int32 itemId =14; // id
//optional string item = 14; // #
optional int32 type = 15; //0: 1:
optional int32 startTime = 16 ; //
optional int32 endTime = 17; //

View File

@ -40,6 +40,7 @@ option optimize_for = SPEED;
optional int32 ride = 22;//
optional int32 rideLevel = 23;//
optional int32 sex = 24;// 01
optional int32 treeLevel = 25;//
}
message Privilege{

View File

@ -134,6 +134,10 @@ import "CommonProto.proto";
optional bool isSendFinish =2; //
}
message GetAllPokemonRequest{
optional int32 start = 1;//20
}
message GetAllPokemonResponse{
repeated PokemonInfo pokemonInfo =1;
repeated TeamPokemonInfo teamPokemonInfos = 2; //

View File

@ -1098,6 +1098,14 @@ enum MessageType{
SeletSubRewardPoolResponse = 303672;
//303691 - 303692
NewGeneralAttackRequest = 303691;
NewGeneralAttackResponse = 303692;
// 303701 - 303702
UpgradeGodTreeRequest = 303701;
UpgradeGodTreeResponse = 303702;
//800000global
GetWorldServerRequest = 800001;//ip
GetWorldServerResponse = 800002;
@ -1129,6 +1137,7 @@ enum MessageType{
GetDeathPathFirstRequest = 900013;
}

View File

@ -405,6 +405,7 @@ import "CommonProto.proto";
message UpdateBagIndication{
optional int32 type =1; // 0 1
repeated Item item =2;
optional int32 isMax = 3;//
}
message ModifyDecorationRequest{