diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 4264670..da3f944 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -53,6 +53,7 @@ import "CommonProto.proto"; // 建木神树 message UpgradeGodTreeRequest{ + optional int32 count = 1; } message UpgradeGodTreeResponse{ } diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index e120382..e766389 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -78,6 +78,8 @@ option optimize_for = SPEED; optional int32 skillId = 7;//装备附带技能 optional int32 isLocked = 8; //是否被锁定 1：被锁定 0:未锁定 optional int32 exp = 9; //字段可选 魂印传入经验（对应宝器强化等级） + optional int32 treeLv = 10;// 神树等级 + optional int32 fourSpirit = 11;//四灵试炼层数 } message SoulPos{ @@ -106,7 +108,7 @@ option optimize_for = SPEED; optional int32 createtype = 15;//创建类型 1猎妖援助 optional int32 changeId = 16;//置换模板id 默认0 } - + message PokemonInfo{ optional int32 tempId = 1; //异妖id optional string id = 2; @@ -288,16 +290,16 @@ option optimize_for = SPEED; required int32 state = 3; //任务状态，0：未领奖，1：已领奖 -1：领取花费奖励 } - required int32 activityId = 1; // 活动id - repeated MissionInfo mission = 2; // 任务信息 + required int32 activityId = 1; // 活动id + repeated MissionInfo mission = 2; // 任务信息 optional int32 endTime = 3; // 活动结束时间 - optional int32 reallyOpen = 4; // 0:假开启 1：真开启 - optional int32 startTime = 5; // 任务开始时间 + optional int32 reallyOpen = 4; // 0:假开启 1：真开启 + optional int32 startTime = 5; // 任务开始时间 optional int32 value = 6; //活动记录值 optional int32 choiceRewardId = 7; //心愿抽奖,选择得奖励id - } + } - message GmResponse{ + message GmResponse{ optional Drop drop =1; optional string info =2; } @@ -486,6 +488,7 @@ option optimize_for = SPEED; optional int32 userTitle = 13; optional int32 userMount = 14; optional int32 practiceLevel = 15;//修行等级 + optional int32 firstOrMini = 16;//四灵试炼，0：首通，1：最低战力 } @@ -942,6 +945,7 @@ option optimize_for = SPEED; optional int32 num = 2; } + //山河社稷图战斗信息 message HardStagePlayerInfo{ optional int32 uid = 1; @@ -1020,4 +1024,25 @@ option optimize_for = SPEED; optional string strategyLink = 2;//使用链接 optional string windowLink = 3;//素材链接 } + + // 四灵试炼信息 + message FourChallengeInfo{ + optional int32 type = 1;//四灵类型 + optional int32 overTime = 2;//四灵活动开启状态 + optional int32 currentFloor = 3;//层数 + optional int32 remainTimes = 4;//剩余次数 + } + + // 助战信息 + message HelpFightList{ + optional int32 uid = 1; + optional string userName = 2; + optional int32 guildName = 3;//0好友 1公会 + optional int32 trailType = 4;//试炼类型 + optional Hero hero = 5; //助战英雄 + optional int32 state = 6;//状态，0:未使用，1：已使用 + repeated Equip jewels = 7;//英雄的魂宝灵宝 + optional int32 treeLevel = 8;//神树等级 + optional int32 fourTotal = 9;//四灵总层数 + } \ No newline at end of file diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index fc3c73b..d227540 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -105,7 +105,7 @@ import "CommonProto.proto"; } message FightRePlayRequest{ - optional int32 type =1; // 类型 1： 竞技场 + optional int32 type =1; // 类型 1：竞技场防守记录，2：竞技场冠军纪录，3：boss记录，4：四灵试炼战斗记录 optional string fightId =2; // fight 动态Id } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 341ebe4..5b5bb18 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -402,6 +402,7 @@ enum MessageType{ FU_XING_STORE_BUY_REQUEST = 10588;//福星高照购买 FU_XING_STORE_BUY_RESPONSE = 10589; + // G 10600 GET_PLAYERINFO_REQUEST = 10600; // GET_PLAYERINFO_RESPONSE = 10601; @@ -1204,6 +1205,33 @@ enum MessageType{ ZeroPlayerUpdateIndication = 303703; + // 303704 - 303709 助战 + // 获取助战列表 + GetHelpHeroListRequest = 303704; + GetHelpHeroListResponse = 303705; + + // 设置自己的助战 + SetHelpHeroRequest = 303706; + SetHelpHeroResponse = 303707; + + // 选择使用助战英雄 + UseHelpHeroRequest = 303708; + UseHelpHeroResponse = 303709; + + // 四灵，获取回放信息 + GetFourChallengeRecordRequest = 303710; + GetFourChallengeRecordResponse = 303711; + + // 推送四灵试炼信息 + SendFourChallengeInfoIndication = 303712; + + // 四灵试炼 + FOUR_CHALLENGE_GET_INFO_REQUEST = 303713;//获取四灵试炼状态 + FOUR_CHALLENGE_GET_INFO_RESPONSE = 303714; + + FOUR_CHALLENGE_DO_REQUEST = 303715;//挑战四灵试炼 + FOUR_CHALLENGE_DO_RESPONSE = 303716; + // 心魔试炼 DemonsTrialRewardRequest = 303801; DemonsTrialRewardResponse = 303802; @@ -1256,6 +1284,7 @@ enum MessageType{ qiMenDunJiaHitListRequest = 3040112; qiMenDunJiaHitListResponse = 3040113; + // 乾坤宝盒-许愿魂印 beautyBagCardIndication = 3040126; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index f818e24..28eaefb 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -83,6 +83,7 @@ import "CommonProto.proto"; repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 repeated randomTypeNum drawTimes = 44;//类型抽卡总次数 + repeated HelpFightList helpFightList = 45;//已选取的助战信息 } @@ -670,7 +671,7 @@ import "CommonProto.proto"; message ViewHeroInfoResponse{ optional Hero hero =1; - repeated Equip equip =2; // 英雄所穿装备、魂印（法宝不在内，放在Hero中） + repeated Equip equip =2; // 英雄所穿装备、魂印、法宝 repeated SpecialEffects SpecialEffects = 3;//属性信息 optional int32 force = 4 ; //战力 optional int32 guildSkill = 5;//公会技能 @@ -794,9 +795,58 @@ import "CommonProto.proto"; optional int32 weekTime = 2; } + //获取四灵试炼信息 + message FourChallengeGetInfoResponse{ + repeated FourChallengeInfo info = 1; + } + // 四灵，挑战 扫荡协议 + message FourChallengeDoRequest{ + optional int32 challengeId = 1; + optional int32 type = 2;//0为挑战，1为扫荡 + } + message FourChallengeDoResponse{ + optional Drop drop = 1; + optional FightData fightData = 2;//0为挑战，1为扫荡 + } + + //四灵试炼 助战协议 + message GetHelpHeroListRequest{ + optional int32 type = 1; //0:获取我的助战信息 + } + message GetHelpHeroListResponse{ + repeated HelpFightList helpHeros = 1;//助战英雄列表 + } + + // 四灵，设置我的助战 + message SetHelpHeroRequest{ + optional string heroId = 1;//英雄id + } + message SetHelpHeroResponse{ + optional Drop drop = 1;//设置助战奖励 + } + + // 四灵，选择使用助战 + message UseHelpHeroRequest{ + optional string heroId = 1;//英雄id + optional int32 type = 2;//英雄类型 + optional int32 status = 3;//0：取消，1：选择 + } + + // 四灵，获取战斗记录 + message GetFourChallengeRecordRequest{ + optional int32 type = 1;//类型，人佛妖道 + optional int32 tier = 2;//层数 + } + + message GetFourChallengeRecordResponse{ + repeated UserRank userRank = 1;//玩家信息 + } + + + //世界等级推送 message WorldLevelIndication{ - optional int32 worldLeve = 1;//世界等级推送 + optional int32 worldLeve = 1; } // 使用头像框