Merge branch 'master_test' into master_test_hw
commit
06b8e5db81
|
@ -65,4 +65,8 @@ import "CommonProto.proto";
|
|||
message GoodLuckResponse{
|
||||
optional int32 index = 1;
|
||||
optional Drop drop = 2;
|
||||
}
|
||||
|
||||
message FuXingStoreBuyRequest{
|
||||
optional int32 activityId = 1;
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
|
@ -44,7 +44,7 @@ import "CommonProto.proto";
|
|||
// 任务获得的道具
|
||||
optional Drop missionDrop = 3; // 工会boss代表随机掉落
|
||||
//英雄剩余血量
|
||||
repeated int32 remainHpList = 4;
|
||||
repeated int64 remainHpList = 4;
|
||||
// 更新主线任务
|
||||
optional Mission mission = 5;
|
||||
// 探索地图剩余时间(秒)
|
||||
|
|
|
@ -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; //次数
|
||||
|
|
|
@ -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;//英雄皮肤
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
//800000起为global 协议
|
||||
GetWorldServerRequest = 800001;//获取世界服ip
|
||||
|
|
|
@ -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;//到期时间
|
||||
}
|
Loading…
Reference in New Issue