心愿

protos/ActivityProto.proto

@@ -5,203 +5,203 @@ option optimize_for = SPEED;
 import "CommonProto.proto";
 
 
-	//社稷大典贡献道具
-	message CommitShejiActivityItemRequest{
+//社稷大典贡献道具
+message CommitShejiActivityItemRequest{
   optional int32 itemId = 1;  //道具id
   optional int32 itemNum = 2;  //道具数量
-	}
+}
 
-	message CommitShejiActivityItemResponse{
+message CommitShejiActivityItemResponse{
   optional Drop drop = 1;
-	}
+}
 
-	message GetShejiAwardRequest{
+message GetShejiAwardRequest{
   optional int32 activityId = 1;
-	}
-	message GetShejiAwardResponse{
+}
+message GetShejiAwardResponse{
   optional Drop drop = 1;
-	}
+}
 
-	//选择易经宝库终极奖励
-	message SeletSubRewardPoolRequest{
+//选择易经宝库终极奖励
+message SeletSubRewardPoolRequest{
   optional int32 selectId = 1;
   optional int32 activityId = 2;
-	}
-	message SeletSubRewardPoolResponse{
+}
+message SeletSubRewardPoolResponse{
 
-	}
-	//灵兽up抽卡
-	message SpecicalMonsterChooseRequest{
+}
+//灵兽up抽卡
+message SpecicalMonsterChooseRequest{
   optional int32 activityId = 1;
   optional int32 selectId = 2;
-	}
+}
 
-	// 新将来袭
-	message NewGeneralAttackRequest{
+// 新将来袭
+message NewGeneralAttackRequest{
   // 活动id
   optional int32 activityId = 1;
   // 使用次数类型id
   optional int32 privilageTypeId = 2;
-	}
+}
 
-	message NewGeneralAttackResponse{
+message NewGeneralAttackResponse{
   // 战斗属性
   optional FightData fightData = 1;
   // 道具
   optional Drop drop = 2;
-	}
+}
 
-	//扭转乾坤
-	message GoodLuckRequest{
+//扭转乾坤
+message GoodLuckRequest{
   optional int32 activityId = 1;
-	}
+}
 
-	message GoodLuckResponse{
+message GoodLuckResponse{
   optional int32 index = 1;
   optional Drop drop = 2;
-	}
+}
 
-	message FuXingStoreBuyRequest{
+message FuXingStoreBuyRequest{
   optional int32 activityId = 1;
-	}
+}
 
-	// 踏碎凌霄
-	message TasuilingxiaoRequest{
+// 踏碎凌霄
+message TasuilingxiaoRequest{
   // 活动id
   optional int32 activityId = 1;
-	}	
+}
 
-	message TasuilingxiaoResponse{
+message TasuilingxiaoResponse{
   // 战斗属性
   optional FightData fightData = 1;
   // 掉落
   optional Drop drop = 2;
   // 伤害值
   optional int32 damageVal = 3;
-	}
+}
 
 
-	// 选择抽卡
-	message choiceHeroRewardRequest{
+// 选择抽卡
+message choiceHeroRewardRequest{
   optional int32 activityId = 1;
   optional int32 rewardId = 2;
-	}
+}
 
-	message choiceHeroRewardResponse{
-	}
+message choiceHeroRewardResponse{
+}
 
-	message choiceDrawCardRequest{
+message choiceDrawCardRequest{
   optional int32 activityId = 1;
   optional int32 type = 2; // 单抽:1 十连抽:2
-	}
+}
 
-	message choiceDrawCardResponse{
+message choiceDrawCardResponse{
   optional Drop drop = 1;
-	}
+}
 
 
-	// 奇门遁甲/玲珑棋局
-	message qiMenDunJiaDrawRequest{
+// 奇门遁甲/玲珑棋局
+message qiMenDunJiaDrawRequest{
   optional int32 activityId = 1;
   optional int32 num = 2;//1:单抽,10:十连抽
-	}
+}
 
-	message qiMenDunJiaDrawResponse{
+message qiMenDunJiaDrawResponse{
   optional Drop drop = 1;//获得的奖励列表
   repeated int32 idList = 2;//获得奖励id
-	}
+}
 
-	message qiMenDunJiaHitListRequest{
+message qiMenDunJiaHitListRequest{
   optional int32 activityId = 1;
-	}
+}
 
-	message qiMenDunJiaHitListResponse{
+message qiMenDunJiaHitListResponse{
   repeated int32 hitList = 1;
-	}
+}
 
 
-	// 御剑飞行
-	message RidingSwardActivityRequest{
+// 御剑飞行
+message RidingSwardActivityRequest{
   optional int32 activityId = 1;//活动id
-	}
-	message RidingSwardActivityResponse{
+}
+message RidingSwardActivityResponse{
   optional int32 state = 1;//当前状态，0：关闭，1：投注，2：比赛中
   optional int64 time = 2;//下轮开始时间
   repeated ModelUserInfo modelInfo = 3;//假人信息
   optional int32 rankId = 4;//当前比赛脚本
   optional int32 betCount = 5;//投注次数
-	}
-	// 获取信息
-	message RidingSwardInfoRequest{
-	}
-	// 领取奖励
-	message RidingSwardRewardRequest{
+}
+// 获取信息
+message RidingSwardInfoRequest{
+}
+// 领取奖励
+message RidingSwardRewardRequest{
   optional int32 round = 1;//轮次,-1为全部领取
   optional int32 swardId = 2;//押注的剑
-	}
-	message RidingSwardRewardResponse{
+}
+message RidingSwardRewardResponse{
   optional Drop drop = 1;//奖励道具
-	}
-	// 竞猜
-	message RidingSwardBetRequest{
+}
+// 竞猜
+message RidingSwardBetRequest{
   optional int32 swardId = 1;//选择的剑
   optional int32 costNum = 2;//投注数量
-	}
+}
 
-	// 统一返回
-	message RidingSwardInfoResponse{
+// 统一返回
+message RidingSwardInfoResponse{
   repeated RidingSwardRecord recordLsit = 1;//记录
   repeated RidingSwardBet betList = 2;//竞猜记录
   optional RidingSwardLastRank lastRank = 3;//上次排名
   optional int32 betCount = 4;//投注次数
-	}
+}
 
-	//周卡
-	message WeekCardInfoRequest{		
-	}
-	message WeekCardInfoResponse{	
+//周卡
+message WeekCardInfoRequest{
+}
+message WeekCardInfoResponse{
   repeated WeekCard allWeekCardInfo = 1;
-	}
-	message WeekCardRewardRequest{
+}
+message WeekCardRewardRequest{
   optional int32 id = 1; //周卡id
-	}
-	message WeekCardRewardResponse{
+}
+message WeekCardRewardResponse{
   optional Drop drop = 1;
-	}
-	message WeekCardIndicationInfoResponse{	
+}
+message WeekCardIndicationInfoResponse{
   repeated WeekCard allWeekCardInfo = 1;
-	}
+}
 
-	//天地洪炉up抽卡选择协议
-	message TrumpGachaSelectItemRequest{
+//天地洪炉up抽卡选择协议
+message TrumpGachaSelectItemRequest{
   optional int32 activityId = 1;
   repeated int32 selectIds = 2;
-	}
+}
 
-	//获取天地洪炉抽奖up道具
-	message GetTrumpSelectItemRequest{		
-	}
-	message GetTrumpSelectItemResponse{
+//获取天地洪炉抽奖up道具
+message GetTrumpSelectItemRequest{
+}
+message GetTrumpSelectItemResponse{
   repeated int32 selectIds = 1;
-	}
+}
 
 
-	// 妖晶购买道具
-	message BuyGoodsToItemRequest{
+// 妖晶购买道具
+message BuyGoodsToItemRequest{
   optional int32 goodId = 1;
   optional int32 goodsNum = 2;
-	}
-	message BuyGoodsToItemResponse{
+}
+message BuyGoodsToItemResponse{
   optional Drop drop = 1;
-	}
+}
 
-	//英雄升星活动 选择升星英雄协议
-	message UpStarActivitySelectRequest{
+//英雄升星活动 选择升星英雄协议
+message UpStarActivitySelectRequest{
   optional int32 activityId = 1;
   optional int32 selectId = 2;
-	}
+}
 
-	message ExploreActivityIndication{	
+message ExploreActivityIndication{
   optional int32 guildId = 1;//工会id
   optional int32 exploreKillMonsterNum = 2;//探索活动杀敌数
-	}
+}

protos/CommonProto.proto

@@ -7,7 +7,7 @@ option optimize_for = SPEED;
 	message ErrorResponse{
 		optional int32  errCode =1 ; // 错误码，默认为0，-1 读errMSg ，其他的读配置
 		optional string errMsg =2 ; // 错误信息
-		repeated string errParams =3; //错误参数
+		repeated string errParams =3; //错误参数	`
 	}
 
 	message Player{
@@ -154,11 +154,11 @@ option optimize_for = SPEED;
 	message FightTeamInfo {
 		repeated FightUnitInfo fightUnitList = 1;
 		repeated FightUnitInfo pokemonUnitList = 2;//灵兽技能 技能1#技能2#技能3
-		optional string teamPassiveList = 3 ; //目前无用
-		optional string specialPassive = 4; // 特殊标记（猎妖之路 圣物被动情况）
-		optional int32 firstCamp = 5;//出手优先级 0默认我方先出
-		optional int64 forceScore = 6;//历史最高战斗力
-
+		repeated FightUnitInfo MagicSoldierList = 3;//神兵信息
+		optional string teamPassiveList = 4; //目前无用
+		optional string specialPassive = 5; // 特殊标记（猎妖之路 圣物被动情况）
+		optional int32 firstCamp = 6;//出手优先级 0默认我方先出
+		optional int64 forceScore = 7;//历史最高战斗力
 	}
 
 
@@ -751,14 +751,14 @@ option optimize_for = SPEED;
 	message TeamOneTeamInfo{
     repeated TeamSimpleInfo team =1;
 		repeated TeamSimpleInfo PokemonInfos = 2;
-		optional int32 totalForce=3;
+		optional int32 totalForce = 3;
 		repeated int64 remainHp = 4;//剩余血量百分比
 		repeated PurpleSealShowInfo sealShow = 5;//紫府神印
 		repeated TransformationCardInfo transformationCardInfo = 6;//身外化身变身卡
 		repeated SixiangxinfaInfo sixiangxinfaInfo = 7;//四象心法
 		repeated LifeGridInfo lifeGridInfo = 8;//命格
 		repeated UserMountInfo userMountInfo = 9;//坐骑
-		
+		repeated TeamSimpleInfo MagicSoldier = 10;//神兵
 	}
 	//第一编队信息
 	message TeamOneInfo{

protos/HeroInfoProto.proto

@@ -5,625 +5,608 @@ option optimize_for = SPEED;
 import "CommonProto.proto";
 
 
-	message GetHeroListInfoRequest{
+message GetHeroListInfoRequest{
   optional int32 index = 1; //第一次请求索引为0, 第二次:第一次索引+每页的数量
-	}
+}
 
-	message GetHeroListInfoResponse{
+message GetHeroListInfoResponse{
   repeated Hero heroList = 1;
-		optional bool isSendFinish =2; //是否发送完成
-	}
-	//获取无尽副本可使用英雄
-	message GetEndlessHeroListInfoRequest{
+  optional bool isSendFinish = 2; //是否发送完成
+}
+//获取无尽副本可使用英雄
+message GetEndlessHeroListInfoRequest{
   optional int32 index = 1; //第一次请求索引为0, 第二次:第一次索引+每页的数量
-	}
+}
 
-	message GetEndlessHeroListInfoResponse{
+message GetEndlessHeroListInfoResponse{
   repeated Hero heroList = 1;
-		optional bool isSendFinish =2; //是否发送完成
-		optional int32 endlessMapId= 3;//无尽副本地图id
-	}
+  optional bool isSendFinish = 2; //是否发送完成
+  optional int32 endlessMapId = 3;//无尽副本地图id
+}
 
-	message DrawHeroRequest{
+message DrawHeroRequest{
   optional int32 type = 1;
   optional string str = 2;
-	}
+}
 
-	message DrawHeroResponse{
+message DrawHeroResponse{
   repeated Hero heroList = 1;
-	}
+}
 
-	message HeroRandRequest{
-		optional int32 type =1; //抽卡类型
-	}
+message HeroRandRequest{
+  optional int32 type = 1; //抽卡类型
+}
 
-	message HeroRandResponse{
-		optional Drop drop =1 ;
+message HeroRandResponse{
+  optional Drop drop = 1 ;
   optional Drop extraBox = 2 ;//宝箱奖励
   optional int32 mustCount = 3;//剩余必出次数
   repeated randomTypeNum drawTimes = 4;//类型抽卡次数
-	}
+}
 
-	message TeamposSaveRequest{
-		optional TeamPosInfo TeamPosInfo =1;
-	}
+message TeamposSaveRequest{
+  optional TeamPosInfo TeamPosInfo = 1;
+}
 
-	message GetAllTeamPosResponse{
-		repeated TeamPosInfo TeamPosInfo =1;
-	}
+message GetAllTeamPosResponse{
+  repeated TeamPosInfo TeamPosInfo = 1;
+}
 
 
-	message UpHeroLevelRequest{
+message UpHeroLevelRequest{
   optional string heroId = 1; //升级或突破的英雄id
   optional int32 targetLevel = 2 ;// 目标等级
-	}
+}
 
-	message UpHeroLevelResponse{
+message UpHeroLevelResponse{
   optional string heroId = 1; //升级或突破的英雄id
   optional int32 targetLevel = 2 ;// 目标等级
-	}
+}
 
-	message ConsumeItem{
+message ConsumeItem{
   optional int32 type = 1;// 类型,1:英雄,2:万能道具 3:飞升丹
   optional string itemId = 2;//物品id或英雄id
-	}
+}
 
-	message ConsumeMaterial{
-		optional int32 position=1; //卡槽位置
-		repeated ConsumeItem heroIds=2; //消耗英雄ids
-	}
+message ConsumeMaterial{
+  optional int32 position = 1; //卡槽位置
+  repeated ConsumeItem heroIds = 2; //消耗英雄ids
+}
 
-	message UpHeroStarRequest{
+message UpHeroStarRequest{
   optional string heroId = 1; //升星的英雄id
   repeated ConsumeMaterial consumeMaterials = 2; //消耗英雄组信息
   optional int32 type = 3;//1为英雄进阶 2为法宝进阶
-	}
+}
 
 
-	message UpQuickSoulEquipRequest{
+message UpQuickSoulEquipRequest{
   optional string equipId = 1; //升级魂印id
-		repeated string soulEquipIds= 2; //消耗信息
-	}
+  repeated string soulEquipIds = 2; //消耗信息
+}
 
-	message UpSoulEquipResponse{
+message UpSoulEquipResponse{
   optional string equipId = 1; //升级魂印id
-		optional int32 leve =2;//经验
-		optional int32 exp =3;//等级
-		repeated string soulEquipIds= 4; //消耗信息
-	}
+  optional int32 leve = 2;//经验
+  optional int32 exp = 3;//等级
+  repeated string soulEquipIds = 4; //消耗信息
+}
 
-	message EquipWearRequest{
-		optional string heroId =1 ; //所穿英雄id
-		repeated string equipId =2 ; //装备id
+message EquipWearRequest{
+  optional string heroId = 1 ; //所穿英雄id
+  repeated string equipId = 2 ; //装备id
   optional int32 type = 3;//1、装备 ；2、宝器
-	}
+}
 
-	message SoulEquipPos{
-		optional int32 equipId =1 ; //装备id
-		optional int32 position= 2; //卡槽位置
-	}
+message SoulEquipPos{
+  optional int32 equipId = 1 ; //装备id
+  optional int32 position = 2; //卡槽位置
+}
 
-	message MergeSoulRequest{
+message MergeSoulRequest{
   optional int32 targetId = 1; //目标合成物
-		repeated int32 soulId =2;  //消耗的魂印
-	}
+  repeated int32 soulId = 2;  //消耗的魂印
+}
 
-	message MergeSoulResponse{
+message MergeSoulResponse{
   optional Drop drop = 1; //合成物
-	}
+}
 
-	message OptHeroSoul{
-		optional string heroId =1 ; //所穿英雄id
-		repeated SoulEquipPos soulEquipIds =2 ; //装备id
-	}
+message OptHeroSoul{
+  optional string heroId = 1 ; //所穿英雄id
+  repeated SoulEquipPos soulEquipIds = 2 ; //装备id
+}
 
-	message SoulEquipWearRequest{
-		optional OptHeroSoul wearInfo =1;
-		optional OptHeroSoul unloadInfo =2;
-	}
-	message SoulEquipUnLoadWearRequest{
-		optional string heroId =1 ; //所穿英雄id
-		repeated SoulEquipPos soulEquipIds =2 ; //装备id
-	}
+message SoulEquipWearRequest{
+  optional OptHeroSoul wearInfo = 1;
+  optional OptHeroSoul unloadInfo = 2;
+}
+message SoulEquipUnLoadWearRequest{
+  optional string heroId = 1 ; //所穿英雄id
+  repeated SoulEquipPos soulEquipIds = 2 ; //装备id
+}
 
-	// 穿戴神印
-	message WearGodSealRequest{
+// 穿戴神印
+message WearGodSealRequest{
   optional int32 type = 1;//0:卸下，1：装备
   optional OptHeroSoul wearInfo = 2;
-	}
-	message WearGodSealResponse{
+}
+message WearGodSealResponse{
   optional Drop drop = 1;
-	}
+}
 
-	// 合成神印
-	message UpGodSealRequest{
+// 合成神印
+message UpGodSealRequest{
   optional int32 itemId = 1;//合成的道具id
   optional string heroId = 2;//英雄id
-	}
-	message UpGodSealResponse{
+}
+message UpGodSealResponse{
   optional Drop drop = 1;
-	}
+}
 
-	message EquipUnLoadOptRequest{
+message EquipUnLoadOptRequest{
   optional string heroId = 1;
-		repeated string equipIds =2;
+  repeated string equipIds = 2;
   optional int32 type = 3;//1、装备 ；2、宝器
 
-	}
-	message HeroComposeRequest{
+}
+message HeroComposeRequest{
   optional Item item = 1; //合成英雄需要用的碎片,和合成英雄的个数
-	}
-	message HeroComposeResponse{
+}
+message HeroComposeResponse{
   optional Drop drop = 1;
-	}
-	message GetAllEquipRequest{
+}
+message GetAllEquipRequest{
   optional int32 index = 1; //第一次请求索引为0, 第二次:第一次索引+每页的数量
   optional int32 type = 2;//1、装备 、3魂印（不要在此请求法宝）4、宝器
 
-	}
-	message GetAllEquipResponse{
-		repeated Equip equip =1;
-		optional bool isSendFinish =2; //是否发送完成
-	}
+}
+message GetAllEquipResponse{
+  repeated Equip equip = 1;
+  optional bool isSendFinish = 2; //是否发送完成
+}
 
-	message GetAllPokemonRequest{
+message GetAllPokemonRequest{
   optional int32 start = 1;//从哪开始，每次20个
-	}
+}
 
 
-	message GetAllPokemonResponse{
-		repeated PokemonInfo pokemonInfo =1;
+message GetAllPokemonResponse{
+  repeated PokemonInfo pokemonInfo = 1;
   repeated TeamPokemonInfo teamPokemonInfos = 2; // 异妖编队
   repeated int32 pokemonGot = 3;//已经获得过的灵兽
-	}
-	message GetAllPropertyInfoResponse{
+}
+message GetAllPropertyInfoResponse{
   repeated int32 allBookEnabled = 1;//已经激活的羁绊
   repeated int32 equipGot = 2;//已经获得过的魂印
   repeated EquipBookInfo equipList = 3;//已经获得过的装备
 
-	}
+}
 
-	// 替换异妖编队
-	message ReplaceTeamPokemonInfoRequest {
+// 替换异妖编队
+message ReplaceTeamPokemonInfoRequest {
   repeated TeamPokemonInfo teamPokemonInfos = 1; // 异妖编队
-	}
+}
 
-	message PokenmonUpLevelRequest{//灵兽升级
-		optional string pokemonId =1;//灵兽id
-		optional int32 level =2; // 升级到的等级
-	}
+message PokenmonUpLevelRequest{//灵兽升级
+  optional string pokemonId = 1;//灵兽id
+  optional int32 level = 2; // 升级到的等级
+}
 
-	message PokenmonUpLevelResponse{
+message PokenmonUpLevelResponse{
   optional int32 level = 1;
-	}
+}
 
-	message PokemonAdvancedRequest{  //灵兽进阶
+message PokemonAdvancedRequest{//灵兽进阶
   optional string pokemonId = 1; //要进阶的灵兽的id
   repeated string consumePokemonIds = 2;//消耗的材料
-	}
-	message PokemonBackRequest{  //灵兽涅槃
+}
+message PokemonBackRequest{//灵兽涅槃
   optional string pokemonId = 1; //灵兽id
-	}
-	message PokemonBackResponse{  
+}
+message PokemonBackResponse{
   optional Drop drop = 1;
-	}
+}
 
-	message PokemonFreeRequest{  //灵兽放生
+message PokemonFreeRequest{//灵兽放生
   repeated string pokemonId = 1; //灵兽id
   optional int32 pieceId = 2;//灵兽碎片id 只能传一个
   optional int32 pieceNum = 3;
 
-	}
-	message PokemonFreeResponse{  
+}
+message PokemonFreeResponse{
   optional Drop drop = 1;
-	}
+}
 
-	message AllBookEnableRequest{
+message AllBookEnableRequest{
   optional int32 bookId = 1;//图鉴id
-	}
+}
 
-	message GetAllRingFireResponse{
-		repeated RingFireInfo ringFireInfo =1;
-	}
-	message PokemonBookEnableResponse{
+message GetAllRingFireResponse{
+  repeated RingFireInfo ringFireInfo = 1;
+}
+message PokemonBookEnableResponse{
   optional Drop drop = 1;
-	}
+}
 
-	message SoulRandRequest{
-		optional int32 time =1; //次数
-	}
-	message SoulRandResponse{
+message SoulRandRequest{
+  optional int32 time = 1; //次数
+}
+message SoulRandResponse{
   optional Drop drop = 1;//掉落
   optional int32 pos = 2;
-		optional int32 time =3; //次数
-	}
+  optional int32 time = 3; //次数
+}
 
-	message SoulForceRandRequest{
-	}
-	message SoulForceRandResponse{
+message SoulForceRandRequest{
+}
+message SoulForceRandResponse{
   optional Drop drop = 1;//掉落
   optional int32 pos = 2;
-	}
+}
 
-	message HeroReturnRequest{
+message HeroReturnRequest{
   optional string heroId = 1;
   optional int32 type = 2; // 0:神将回归元 1：神将回退
-	}
+}
 
-	message HeroReturnResponse{
-		optional Drop drop =1;
-	}
+message HeroReturnResponse{
+  optional Drop drop = 1;
+}
 
-	message HeroLockChangeRequest{
-		optional string heroId =1;
+message HeroLockChangeRequest{
+  optional string heroId = 1;
   optional int32 lockState = 2 ; // 1 上锁 0 ：解锁
-	}
+}
 
-	message ComplexEquipRequest{
+message ComplexEquipRequest{
   optional int32 type = 1;//装备类型
   optional int32 star = 2;//装备星级 0一键合成
   optional int32 num = 3;//合成数量
-	}
+}
 
-	message ComplexEquipResponse{
+message ComplexEquipResponse{
   optional Drop drop = 1;//合成的装备
-	}
+}
 
 
-	message ComplexJewelEquipRequest{
+message ComplexJewelEquipRequest{
   optional int32 type = 1;//宝器类型 灵宝、魂宝
   optional int32 rance = 2;//宝器属性
   optional int32 targetleve = 3;//目标品质 0一键合成
   optional int32 num = 4;//合成数量
-	}
+}
 
-	message ComplexJewelEquipResponse{
-		repeated string equipIds =1;//消耗的装备
+message ComplexJewelEquipResponse{
+  repeated string equipIds = 1;//消耗的装备
   optional Drop drop = 2;//合成的装备
-	}
+}
 
-	message EspecialEquipBackRequest{
+message EspecialEquipBackRequest{
   repeated string heroIdLsit = 1;//法宝归元
-	}
-	message EspecialEquipBackResponse{
+}
+message EspecialEquipBackResponse{
   optional Drop drop = 1;
-	}
+}
 
 
-	message SaveHeroChangeRequest{
+message SaveHeroChangeRequest{
   optional string heroId = 1; //操作英雄id
-	}
+}
 
-	message SaveHeroChangeResponse{
+message SaveHeroChangeResponse{
   optional int32 heroTempId = 2; //置换的id
-	}
+}
 
-	message CancelHeroChangeRequest{
+message CancelHeroChangeRequest{
   optional string heroId = 1; //操作英雄id
-	}
+}
 
-	message CancelHeroChangeResponse{
-	}
+message CancelHeroChangeResponse{
+}
 
 
-	message DoHeroChangeRequest{ 
+message DoHeroChangeRequest{
   optional string heroId = 1; //操作英雄id
-	}
+}
 
-	message DoHeroChangeResponse{
+message DoHeroChangeResponse{
   optional Drop drop = 1;//掉落
-	}
-	message GetAllSkinResponse{
+}
+message GetAllSkinResponse{
   repeated SkinInfo skinInfo = 1;
-	}
-	message ChangeSkinRequest{
+}
+message ChangeSkinRequest{
   optional string heroId = 1;
   optional int32 skinId = 2;
-	}
-	message GetSkinIndication{
+}
+message GetSkinIndication{
   optional SkinInfo skinInfo = 1;//激活皮肤的推送
-	}
+}
 
-	// 开启共鸣格子
-	message OpenResonanceRequest {
+// 开启共鸣格子
+message OpenResonanceRequest {
   optional int32 gridId = 1; // 格子id
-	}
+}
 
 
-	// 共鸣
-	message ResonanceRequest{
+// 共鸣
+message ResonanceRequest{
   optional string heroId = 1; // 需要共鸣的神将id
   optional int32 gridId = 2; // 格子id
   optional int32 type = 3; // 1:共鸣 2：卸下共鸣神将 3:卸下鸿蒙使者 4:上阵鸿蒙使者
-	}
-	message ResonanceResponse{
+}
+message ResonanceResponse{
   optional int32 leftTime = 1; // 如果是卸下，返回倒计时 单位 秒
-	}
+}
 
-	// 花费妖晶清除共鸣冷却时间
-	message CleanResonanceTimeRequest{
+// 花费妖晶清除共鸣冷却时间
+message CleanResonanceTimeRequest{
   optional int32 gridId = 2; // 格子id
   optional int32 type = 1;   // 1：清除共鸣区cd 2：清除鸿蒙使者cd
-	}
+}
 
 
-	// 鸿蒙守卫、鸿蒙使者、共鸣信息
-	message HongmengHeroInfo{
+// 鸿蒙守卫、鸿蒙使者、共鸣信息
+message HongmengHeroInfo{
   optional int32 gridId = 1; // 共鸣格子
   optional string heroId = 2; // 共鸣神将id
   optional int64  time = 3; // 共鸣神将卸下后的冷却时间 单位 秒
-	}
+}
 
-	// 共鸣加成
-	message HongmengAddition{
+// 共鸣加成
+message HongmengAddition{
   optional int32 additionType = 1; // 加成类型 1：等级 2：装备 3：魂宝 4：灵宝 5：法宝
   optional int32 value = 2; // 加成值
   optional int32 heroTid = 3; // 来自哪个英雄，0表示鸿蒙碑，-1未开启，其他英雄id
-	}
+}
 
-	// 获取鸿蒙阵信息
-	message GetHongmengInfoRequest{
+// 获取鸿蒙阵信息
+message GetHongmengInfoRequest{
 
-	}
-	message GetHongmengInfoResponse{
+}
+message GetHongmengInfoResponse{
   repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者
   repeated HongmengAddition hongmengAdditions = 2; // 共鸣加成
   repeated HongmengHeroInfo hongmengResonacnes = 3; // 共鸣使者
   optional int32 hongmengTabletMax = 4; // 鸿蒙碑等级上限,0：未开启，其他为鸿蒙碑等级
-	}
+}
 
-	// 鸿蒙阵信息推送
-	message HongmengInfoIndication{
+// 鸿蒙阵信息推送
+message HongmengInfoIndication{
   repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者
   repeated HongmengAddition hongmengAdditions = 2; // 共鸣加成
   repeated HongmengHeroInfo hongmengResonacnes = 3; // 共鸣使者
   optional int32 hongmengTabletMax = 4; // 鸿蒙碑等级上限,0：未开启，其他为鸿蒙碑等级
-	}
+}
 
-	// 鸿蒙碑新手引导推送
-	message HongmengSteleNewHandIndication{
+// 鸿蒙碑新手引导推送
+message HongmengSteleNewHandIndication{
   optional int32 state = 1;// 开启鸿蒙碑
-	}
+}
 
-	// 修行玩法 升级
-	message UpPracticeLevelRequest{}
+// 修行玩法 升级
+message UpPracticeLevelRequest{}
 
-	message UpPracticeLevelResponse{
+message UpPracticeLevelResponse{
   optional int32 practiceLevel = 1;//等级
-	}
+}
 
-	// 修行玩法 主角修为等级提升
-	message XiuxianLevelUpResponse{
+// 修行玩法 主角修为等级提升
+message XiuxianLevelUpResponse{
   optional int32 xiuxianLevel = 1;// 主角修为等级
-	}
+}
 
 
-	// 修行玩法 替换紫府神印
-	message ReplacePurpleMansionSealRequest{
+// 修行玩法 替换紫府神印
+message ReplacePurpleMansionSealRequest{
   optional int32 oldSealId = 1;//旧神印id
   optional int32 newSealId = 2;//新神印id
   optional string subId = 3;//附属英雄id
-	}
+}
 
-	message ReplacePrupleMansionSealResponse{
+message ReplacePrupleMansionSealResponse{
   repeated PurpleMansionSeal sealList = 1;
-	}
+}
 
-	// 推送神印信息
-	message PurpleMansionSealIndication{
+// 推送神印信息
+message PurpleMansionSealIndication{
   repeated PurpleMansionSeal sealList = 1;
-	}
+}
 
-	
-	// 心愿抽卡
-	message wishDrawCardIndication{
-		repeated wishDrawCardInfo infoList = 1;
-	}
-	
-	message choiceWishHeroRequest{
-		repeated wishDrawCardInfo infoList = 1;//不用status
-	}
-	
-	message choiceWishHeroResponse{
-		repeated wishDrawCardInfo infoList = 1;
-		optional int32 serverOpenTime = 2;//开服时间
-		repeated int32 heroList = 3;//当天开启的英雄列表
-	}
-	
-	
-	// 乾坤宝盒-许愿魂印
-	message beautyBagCardIndication{
+// 乾坤宝盒-许愿魂印
+message beautyBagCardIndication{
   repeated beautyBagCardInfo infoList = 1;
-	}
+}
 
-	message beautyBagWishEquipRequest{
+message beautyBagWishEquipRequest{
   repeated beautyBagCardInfo infoList = 1;
-	}
+}
 
-	message beautyBagWishEquipResponse{
+message beautyBagWishEquipResponse{
   repeated beautyBagCardInfo infoList = 1;
 
-	}
+}
 
-	//四象心法强化协议
-	message SixiangUpRequest{
+//四象心法强化协议
+message SixiangUpRequest{
   optional int32 professionId = 1;
-	}
+}
 
-	message SixiangUpResponse{
+message SixiangUpResponse{
   repeated SixiangxinfaPropertyInfo infoList = 1;
 
-	}
+}
 
-	//四象心法进阶协议
-	message SixiangUpStarRequest{
+//四象心法进阶协议
+message SixiangUpStarRequest{
   optional int32 professionId = 1;
-	}
+}
 
-	message SixiangUpStarResponse{
+message SixiangUpStarResponse{
   optional int32 starLv = 1;
   repeated SixiangxinfaPropertyInfo infoList = 2;
 
-	}
+}
 
 
-	//获取好感度数据协议
-	message GetLikableDataResponse{
+//获取好感度数据协议
+message GetLikableDataResponse{
   repeated LikableInfo infoList = 1;
   optional int32 likableRemainTime = 2;//好感度剩余捐赠次数
-	}
+}
 
 
-	//好感度提升协议
-	message HeroUpLikableRequest{
+//好感度提升协议
+message HeroUpLikableRequest{
   optional int32 heroStaticId = 1;//英雄静态id
   optional int32 itemId = 2;//消耗道具id
   optional int32 itemNum = 3;//消耗道具数量
-	}
+}
 
-	///装备图鉴数据推送
-	message EquipBookIndication{
+///装备图鉴数据推送
+message EquipBookIndication{
   repeated EquipBookInfo changeEquipList = 1;//装备图鉴修改数据(推的是当前数量)
-	}
+}
 
-	//英雄神魂绑定协议
-	message HeroGodSoulBindRequest{
+//英雄神魂绑定协议
+message HeroGodSoulBindRequest{
   optional string heroId = 1;//当前神魂升级神将
   optional int32 godSoulLv = 2;//神魂等级
-		repeated string bindHeros=3;//被绑定神将
-	}
+  repeated string bindHeros = 3;//被绑定神将
+}
 
-	//修行技能升级
-	message PracticeSkillUpRequest{
+//修行技能升级
+message PracticeSkillUpRequest{
   optional int32 skillId = 1;
-	}
+}
 
-	//法宝之魂升级协议
-	message FaBaoSoulUpLvRequest{
+//法宝之魂升级协议
+message FaBaoSoulUpLvRequest{
   optional int32 id = 1;
   optional int32 level = 2;
-	}
+}
 
 
-	// 身外化身
-	message GetTransformationRequest{
-	}
+// 身外化身
+message GetTransformationRequest{
+}
 
-	message GetTransformationResponse{
+message GetTransformationResponse{
   repeated TransformationCardInfo list = 1;//化身列表信息
   optional int32 id = 2;//化身之力id
   optional Drop drop = 3;//激活变身卡化身之力掉落
-	}
+}
 
-	message UpOrDownTransformationRequest{
+message UpOrDownTransformationRequest{
   optional int32 id = 1;//变身卡id
   optional int32 index = 2;//位置
-	}
-	//身外化身升级 升星
-	message TransformationUpGradeRequest{
+}
+//身外化身升级 升星
+message TransformationUpGradeRequest{
   optional int32 type = 1;//1:升级 1：升星
   optional int32 id = 2;//变身卡id
   repeated KeyVal itemList = 3;//消耗的道具id,数量
 
-	}
+}
 
-	message TransformationUpGradeResponse{
+message TransformationUpGradeResponse{
   optional TransformationCardInfo info = 1;//化身信息
   optional Drop drop = 2;//掉落
-	}
-	//化身之力升级
-	message TransformationForceUpRequest{
+}
+//化身之力升级
+message TransformationForceUpRequest{
   optional int32 id = 1;//当前id
 
-	}
-	message TransformationForceUpResponse{
+}
+message TransformationForceUpResponse{
   optional int32 id = 1;//当前id
-	}
+}
 
 
-	//命石合成升级
-	message LifeStoneUpRequest{
+//命石合成升级
+message LifeStoneUpRequest{
   optional int32 type = 1;//操作类型 1:批量合成  2:一键合成  3:命石单个合成  4:快速合成
   optional int32 gridId = 2;//当前选择命格id 这个值大于0说明在命格界面操作 否则是在背包操作
   optional int32 gridIndex = 3;//当前命格内索引
   optional int32 curGemId = 4;//当前选择命石id
   optional int32 selectNum = 5;//批量时选择消耗数量
-	}
+}
 
-	//当前命石已装备的情况返回命格数据
-	message LifeStoneUpResponse{
+//当前命石已装备的情况返回命格数据
+message LifeStoneUpResponse{
   optional LifeGridInfo lifeGridInfo = 1;//命格信息
   optional Drop drop = 2;//合成掉落
-	}
+}
 
-	//命格穿戴/卸下
-	message LifeGridChangeRequest{
+//命格穿戴/卸下
+message LifeGridChangeRequest{
   optional int32 type = 1;//操作类型 1:穿戴  2:卸下
   optional int32 position = 2;//命格id
   optional int32 index = 3;//命格里格子索引
   optional int32 lifeStoneId = 4;//当前选择命石道具id
-	}
+}
 
-	//返回命格数据
-	message LifeGridChangeResponse{
+//返回命格数据
+message LifeGridChangeResponse{
   optional LifeGridInfo lifeGridInfo = 1;//命格信息
-	}
+}
 
-    //神魔阵营选择职业协议
-	message GodDevilHeroSelectPropRequest{
+//神魔阵营选择职业协议
+message GodDevilHeroSelectPropRequest{
   optional string heroId = 1; // 神将id
   optional int32 propId = 2; // 阵营id (对应HeroConfig表PropertyName字段)
-	}
+}
 
-	message LikeHeroRankRequest{
+message LikeHeroRankRequest{
   optional int32 rankSubId = 1; // 排行榜子页签id
   optional int32 heroTid = 2; // 英雄模板id
-	}
+}
 
-	message userLikeHeroRankInfoRequest{
+message userLikeHeroRankInfoRequest{
   optional int32 rankSubId = 1; // 排行榜子页签id
-	}
+}
 
-	message userLikeHeroRankInfoResponse{
+message userLikeHeroRankInfoResponse{
   repeated int32 heroTid = 1; // 英雄id
-	}
+}
 
-	// 摘星阁，英雄装备位置强化
-	message EquipIntensifyRequset{
+// 摘星阁，英雄装备位置强化
+message EquipIntensifyRequset{
   optional string heroId = 1;//英雄id
   optional int32 type = 2;//0：突破 1-4：强化对应位置
-	}
+}
 
-	message EquipIntensifyResponse{
+message EquipIntensifyResponse{
   repeated EquipIntensifyInfo infos = 1;//装备强化信息
   optional int32 equipRankUp = 2;//装备突破
-	}
+}
 
-	// 摘星阁，家园装备强化重置
-	message HomeEquipStrongResetRequset{
+// 摘星阁，家园装备强化重置
+message HomeEquipStrongResetRequset{
   optional string heroId = 1;//英雄id
-	}
+}
 
-	message HomeEquipStrongResetResponse{
+message HomeEquipStrongResetResponse{
   optional Drop drop = 1;
-	}
+}
 
-	// 建木神树升级
-	message UpgradeGodTreeRequest{
+// 建木神树升级
+message UpgradeGodTreeRequest{
   optional string jewelId = 1;//魂灵宝id
   optional int32 count = 2;//升几级
-	}
+}
 
-	message UpgradeGodTreeResponse{
-	}
+message UpgradeGodTreeResponse{
+}
 
-	// 神将置换
-	message HeroChangeRequest{
+// 神将置换
+message HeroChangeRequest{
   optional string heroID1 = 1;
   optional string heroID2 = 2;
   optional int32 itemID = 3;//道具id
-	}
+}
 
-	message HeroChangeResponse{
+message HeroChangeResponse{
   repeated Hero heros = 1;
-	}
+}

protos/MessageTypeProto.proto

@@ -1522,7 +1522,7 @@ enum MessageType{
   MAGIC_SOLDIER_INFO_REQUEST = 3050211;//信息
   MAGIC_SOLDIER_INFO_RESPONSE = 3050212;
 
-  MAGIC_SOLDIER_LOCATION_REQUEST = 3050213;//更换位置
+  MAGIC_SOLDIER_LOCATION_REQUEST = 3050213;//单独神兵位置信息更换
   MAGIC_SOLDIER_LOCATION_RESPONSE = 3050214;
 
   MAGIC_SOLDIER_RETURN_REQUEST = 3050215;//涅槃
@@ -1534,6 +1534,11 @@ enum MessageType{
   MAGIC_SOLDIER_STRONG_REQUEST = 3050219;//升级，升星
   MAGIC_SOLDIER_STRONG_RESPONSE = 3050220;
 
+  MAGIC_SOLDIER_EXCHANGE_REQUEST = 3050221;//阵上更换位置
+  MAGIC_SOLDIER_EXCHANGE_RESPONSE = 3050222;
+
+  DESIRE_DRAW_CARD_REQUEST = 3050223;
+  DESIRE_DRAW_CARD_RESPONSE = 3050224;
 
   //==========================================================800000起为global 协议==========================================================
 

protos/PlayerInfoProto.proto

@@ -1297,7 +1297,7 @@ message MagicSoldierInfoResponse{
   repeated MagicSoldier infos = 1;//全部神兵信息
   repeated int32 book = 2;//神兵图鉴信息
 }
-//更换位置
+//单独神兵位置信息更换
 message MagicSoldierLocationRequest{
   optional string id = 1;//主动修改得神兵id
   optional int32 point = 2;//主动修改神兵得位置
@@ -1327,3 +1327,35 @@ message MagicSoldierStrongRequest{
 }
 message MagicSoldierStrongResponse{
 }
+//阵上交换位置
+message magicSoldierExchangeRequest{
+  optional string id = 1;//交换得第一个神兵
+  optional string id2 = 2;//交换得第二个神兵
+}
+message MagicSoldierExchangeResponse{
+}
+
+// 心愿抽卡
+message DesireDrawCardRequest{
+  optional int32 type = 1;//卡池类型
+  optional int32 tempId = 2;//物品id
+}
+
+message DesireDrawCardResponse{
+  optional int32 type = 1;//卡池类型
+  optional int32 tempId = 2;//物品id
+}
+
+message choiceWishHeroRequest{
+  optional int32 type = 1;//卡池类型
+}
+
+message choiceWishHeroResponse{
+  optional int32 desireId = 1;//心愿物品id
+  repeated int32 newList = 2;//新增的物品列表
+}
+
+message wishDrawCardIndication{
+  // 暂不用
+  repeated wishDrawCardInfo infoList = 1;
+}