Merge branch 'master_test' into master_test_hw

master_huanxiang
lvxinran 2021-04-02 14:45:51 +08:00
commit 06b8e5db81
8 changed files with 120 additions and 14 deletions

View File

@ -65,4 +65,8 @@ import "CommonProto.proto";
message GoodLuckResponse{
optional int32 index = 1;
optional Drop drop = 2;
}
message FuXingStoreBuyRequest{
optional int32 activityId = 1;
}

View File

@ -52,7 +52,7 @@ option optimize_for = SPEED;
message Item{
optional int32 itemId = 1;
optional int32 itemNum = 2;
optional int64 itemNum = 2;
optional int32 endingTime = 3;
optional int32 nextFlushTime = 4; // 0
}
@ -309,6 +309,9 @@ option optimize_for = SPEED;
optional int32 headFrame = 8;
optional string servername = 9;//
optional int32 gender = 10;//
optional int32 userSkin = 11;
optional int32 userTitle = 12;
optional int32 userMount = 13;
}
@ -371,6 +374,10 @@ option optimize_for = SPEED;
optional int32 rank =5; //
optional int32 headFrame = 6; //
optional int32 uid = 7;
optional int32 userSkin = 8;
optional int32 userTitle = 9;
optional int32 userMount = 10;
optional int32 sex = 11;
}
message AdventureBossInfo{
@ -413,7 +420,10 @@ option optimize_for = SPEED;
optional int32 head = 12; //
optional int32 frame = 13; //
optional int32 soulVal = 14; //
optional int32 userSkin = 15;
optional int32 userTitle = 16;
optional int32 userMount = 17;
optional int32 sex = 18;
}
message GiftGoodsInfo{
optional int32 goodsId =1;//id
@ -442,7 +452,7 @@ option optimize_for = SPEED;
message ItemInfo{
optional int32 templateId = 1;//ID
optional int32 overlap = 2;//
optional int64 overlap = 2;//
optional int32 nextRefreshTime =3; //
}
@ -465,6 +475,9 @@ option optimize_for = SPEED;
optional int32 guildSign = 9 ;//
optional int32 sex = 10;//
optional string serverName = 11;//
optional int32 userSkin = 12;
optional int32 userTitle = 13;
optional int32 userMount = 14;
}
@ -587,6 +600,9 @@ option optimize_for = SPEED;
optional int32 head =5;
optional int32 headFrame =6;
optional int32 uid = 7;
optional int32 userSkin = 8;
optional int32 userTitle = 9;
optional int32 userMount = 10;
}
//
@ -605,6 +621,10 @@ option optimize_for = SPEED;
optional int32 level =4;
optional int32 head =5;
optional int32 headFrame =6;
optional int32 userSkin = 7;
optional int32 userTitle = 8;
optional int32 userMount = 9;
optional int32 sex = 10;
}
message SignInInfo{
@ -625,7 +645,7 @@ option optimize_for = SPEED;
repeated TeamSimpleInfo team =1;
repeated TeamSimpleInfo PokemonInfos = 2;
optional int32 totalForce=3;
repeated int32 remainHp = 4;//
repeated int64 remainHp = 4;//
}
//
message TeamOneInfo{
@ -648,6 +668,10 @@ option optimize_for = SPEED;
optional int32 head =5;
optional int32 headFrame =6;
optional int32 uid = 7;
optional int32 userSkin = 8;
optional int32 userTitle = 9;
optional int32 userMount = 10;
optional int32 sex = 11;
}
//
message HeroBloodInfo{
@ -692,6 +716,9 @@ option optimize_for = SPEED;
optional int32 level = 6;
optional int32 rank = 7;
optional int32 score = 8;
optional int32 userSkin = 9;
optional int32 userTitle = 10;
optional int32 userMount = 11;
}
message LuckWheelRewardPosInfo{
@ -714,6 +741,9 @@ option optimize_for = SPEED;
optional int32 rank =6; //
optional int32 totalForce =7;
optional int32 headFrame = 8;
optional int32 userSkin = 9;
optional int32 userTitle = 10;
optional int32 userMount = 11;
}
@ -874,6 +904,20 @@ option optimize_for = SPEED;
optional int32 skinId = 1;
optional int32 overTime = 2;
}
//
message UserSkinInfo{
optional int32 skinId = 1;
optional int32 overTime = 2;
}
//
message UserTitleInfo{
optional int32 titleId = 1;
optional int32 overTime = 2;
}
//
message UserMountInfo{
optional int32 mountId = 1;
optional int32 overTime = 2;
}

View File

@ -24,6 +24,10 @@ import "CommonProto.proto";
optional bool isTakeGuildHelpReward = 17; //
repeated GuildHelpInfo guildHelpInfo = 18;// 5
optional int32 lastHelpSendTime =19 ; //
optional int32 userSkin = 20;
optional int32 userTitle = 21;
optional int32 userMount = 22;
optional int32 sex = 23;
}
@ -576,6 +580,7 @@ import "CommonProto.proto";
optional int32 blood = 2;//
//optional int32 canSweep = 3;//boss
optional int32 isKill = 3;//
optional int32 isRefresh = 4;//
}
message GuildChallengeBuyBuffIndication{
optional int32 buffCount = 1;

View File

@ -44,7 +44,7 @@ import "CommonProto.proto";
//
optional Drop missionDrop = 3; // boss
//
repeated int32 remainHpList = 4;
repeated int64 remainHpList = 4;
// 线
optional Mission mission = 5;
//

View File

@ -138,11 +138,15 @@ import "CommonProto.proto";
optional int32 start = 1;//20
}
message GetAllPokemonResponse{
repeated PokemonInfo pokemonInfo =1;
repeated TeamPokemonInfo teamPokemonInfos = 2; //
repeated int32 pokemonGot = 3;//
repeated int32 pokemonBookEnabled = 4;//
}
message GetAllPropertyInfoResponse{
repeated int32 allBookEnabled = 1;//
repeated int32 equipGot = 2;//
}
@ -181,13 +185,16 @@ import "CommonProto.proto";
optional Drop drop = 1;
}
message PokemonBookEnableRequest{
message AllBookEnableRequest{
optional int32 bookId = 1;//id
}
message GetAllRingFireResponse{
repeated RingFireInfo ringFireInfo =1;
}
message PokemonBookEnableResponse{
optional Drop drop = 1;
}
message SoulRandRequest{
optional int32 time =1; //

View File

@ -6,14 +6,14 @@ import "CommonProto.proto";
message HeroInfo {
optional string heroId = 1;
optional int32 heroHp = 2;
optional int32 heroMaxHp =3;
optional int64 heroHp = 2;
optional int64 heroMaxHp =3;
}
message TrialHeroInfo{
optional string heroId = 1;//Id
optional int32 tmpId = 2;//id
optional int32 star = 3;
optional int32 heroHp = 4;//
optional int64 heroHp = 4;//
optional int32 level = 5;//
optional int32 skinId = 6;//
}

View File

@ -381,7 +381,9 @@ enum MessageType{
FAST_FIGHT_CHALLENGE_REQUEST = 10586; //
FAST_FIGHT_CHALLENGE_RESPONSE = 10587;
FU_XING_STORE_BUY_REQUEST = 10588;//
FU_XING_STORE_BUY_RESPONSE = 10589;
// G 10600
GET_PLAYERINFO_REQUEST = 10600; //
GET_PLAYERINFO_RESPONSE = 10601;
@ -505,6 +507,9 @@ enum MessageType{
//GUILD_CHALLENGE_FIVE_INDICATION = 16686;//
GOOD_LUCK_REQUEST = 16687;//
GOOD_LUCK_RESPONSE = 16688;
GET_ALL_PROPERTY_INFO_REQUEST = 16689;//
GET_ALL_PROPERTY_INFO_RESPONSE = 16690;
// H 10700
HERO_RAND_REQQUEST = 10701;
@ -720,8 +725,8 @@ enum MessageType{
POKEMON_FREE_REQUEST = 11512; //
POKEMON_FREE_RESPONSE = 11513;
POKEMON_BOOK_ENABLE_REQUEST = 11514;//
POKEMON_BOOK_ENABLE_REPONSE = 11515;
ALL_BOOK_ENABLE_REQUEST = 11514;//
ALL_BOOK_ENABLE_REPONSE = 11515;
// Q 11600
QUESTION_INDICATION = 11600;//
QUICK_START_MONSTERFIGHTER_REQUEST = 11601;//
@ -801,6 +806,8 @@ enum MessageType{
RANK_PROUD_REQUEST = 11758;//
RANK_PROUD_RESPONSE = 11759;
RECHARGE_SUCCESS_INDICATION = 11760;//
// S 11800
SUCCESS_RESPONSE = 11800; //
@ -1146,6 +1153,18 @@ enum MessageType{
// 使
UseHeadFrameRequest = 303901;
UseHeadFrameResponse = 303902;
//
ActiveUserSkinRequest = 303903;
ActiveUserSkinResponse = 303904;
//
ActiveUserTitleRequest = 303905;
ActiveUserTitleResponse = 303906;
//
ActiveUserMountRequest = 303907;
ActiveUserMountResponse = 303908;
//800000global
GetWorldServerRequest = 800001;//ip

View File

@ -75,6 +75,9 @@ import "CommonProto.proto";
optional int32 worldLeve = 34;//
repeated int32 DemonsTrialRewardInfo = 35;//
repeated HeadFrameList headFrameBag = 36;//
repeated UserSkinInfo userSkinList = 37;//
repeated UserTitleInfo userTitleList = 38;//
repeated UserMountInfo userMountList = 39;//
}
@ -793,4 +796,28 @@ import "CommonProto.proto";
optional int32 validTime = 1;//
}
message LoginConfirmRequest{
}
message RechargeSuccessIndication{
optional string orderId = 1;
}
//
message ActiveUserSkinRequest{
optional int32 skinId = 1;//id
}
message ActiveUserSkinResponse{
optional int32 validTime = 1;//
}
//
message ActiveUserTitleRequest{
optional int32 titleId = 1;//id
}
message ActiveUserTitleResponse{
optional int32 validTime = 1;//
}
//
message ActiveUserMountRequest{
optional int32 mountId = 1;//id
}
message ActiveUserMountResponse{
optional int32 validTime = 1;//
}