心愿

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 itemId = 1;  //道具id
-		optional int32 itemNum = 2;  //道具数量 
+  optional int32 itemNum = 2;  //道具数量
-	}
+}
-	
-	message CommitShejiActivityItemResponse{
-		optional Drop drop = 1; 
-	}
-	
-	message GetShejiAwardRequest{
-		optional int32 activityId = 1; 
-	}
-	message GetShejiAwardResponse{
-		optional Drop drop = 1; 
-	}
-	
-	//选择易经宝库终极奖励
-	message SeletSubRewardPoolRequest{
-		optional int32 selectId = 1; 
-		optional int32 activityId = 2; 
-	}
-	message SeletSubRewardPoolResponse{
-		
-	}
-	//灵兽up抽卡
-	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 GoodLuckRequest{
-		optional int32 activityId = 1;
-	}
 
-	message GoodLuckResponse{
+message CommitShejiActivityItemResponse{
-		optional int32 index = 1;
+  optional Drop drop = 1;
-		optional Drop drop = 2;
+}
-	}
-	
-	message FuXingStoreBuyRequest{
-		optional int32 activityId = 1;
-	}
-	
-	// 踏碎凌霄
-	message TasuilingxiaoRequest{
-		// 活动id
-		optional int32 activityId = 1;
-	}	
-	
-	message TasuilingxiaoResponse{
-		// 战斗属性
-		optional FightData fightData = 1;
-		// 掉落
-		optional Drop drop = 2;
-		// 伤害值
-		optional int32 damageVal = 3;
-	}
-	
-	
-	// 选择抽卡
-	message choiceHeroRewardRequest{
-		optional int32 activityId = 1;
-		optional int32 rewardId = 2;
-	}
-	
-	message choiceHeroRewardResponse{
-	}
-	
-	message choiceDrawCardRequest{
-		optional int32 activityId = 1;
-		optional int32 type = 2; // 单抽:1 十连抽:2
-	}
-	
-	message choiceDrawCardResponse{
-		optional Drop drop = 1;
-	}
-	
-	
-	// 奇门遁甲/玲珑棋局
-	message qiMenDunJiaDrawRequest{
-		optional int32 activityId = 1;
-		optional int32 num = 2;//1:单抽,10:十连抽
-	}
-	
-	message qiMenDunJiaDrawResponse{
-		optional Drop drop = 1;//获得的奖励列表
-		repeated int32 idList = 2;//获得奖励id
-	}
-	
-	message qiMenDunJiaHitListRequest{
-		optional int32 activityId = 1;
-	}
-	
-	message qiMenDunJiaHitListResponse{
-		repeated int32 hitList = 1;
-	}
-	
 
-	// 御剑飞行
+message GetShejiAwardRequest{
-	message RidingSwardActivityRequest{
+  optional int32 activityId = 1;
-		optional int32 activityId = 1;//活动id
+}
-	}
+message GetShejiAwardResponse{
-	message RidingSwardActivityResponse{
+  optional Drop drop = 1;
-		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{
-		optional int32 round = 1;//轮次,-1为全部领取
-		optional int32 swardId = 2;//押注的剑
-	}
-	message RidingSwardRewardResponse{
-		optional Drop drop = 1;//奖励道具
-	}
-	// 竞猜
-	message RidingSwardBetRequest{
-		optional int32 swardId = 1;//选择的剑
-		optional int32 costNum = 2;//投注数量	
-	}
 
-	// 统一返回
+//选择易经宝库终极奖励
-	message RidingSwardInfoResponse{
+message SeletSubRewardPoolRequest{
-		repeated RidingSwardRecord recordLsit = 1;//记录
+  optional int32 selectId = 1;
-		repeated RidingSwardBet betList = 2;//竞猜记录
+  optional int32 activityId = 2;
-		optional RidingSwardLastRank lastRank = 3;//上次排名
+}
-		optional int32 betCount = 4;//投注次数
+message SeletSubRewardPoolResponse{
-	}
-	
-	//周卡
-	message WeekCardInfoRequest{		
-	}
-	message WeekCardInfoResponse{	
-	    repeated WeekCard allWeekCardInfo = 1;
-	}
-	message WeekCardRewardRequest{
-	    optional int32 id = 1; //周卡id	
-	}
-	message WeekCardRewardResponse{
-		optional Drop drop = 1;
-	}
-	message WeekCardIndicationInfoResponse{	
-	    repeated WeekCard allWeekCardInfo = 1;
-	}
 
-	//天地洪炉up抽卡选择协议
+}
-	message TrumpGachaSelectItemRequest{
+//灵兽up抽卡
-		optional int32 activityId = 1;
+message SpecicalMonsterChooseRequest{
-		repeated int32 selectIds = 2;
+  optional int32 activityId = 1;
-	}
+  optional int32 selectId = 2;
+}
 
-	//获取天地洪炉抽奖up道具
+// 新将来袭
-	message GetTrumpSelectItemRequest{		
+message NewGeneralAttackRequest{
-	}
+  // 活动id
-	message GetTrumpSelectItemResponse{
+  optional int32 activityId = 1;
-		repeated int32 selectIds = 1;
+  // 使用次数类型id
-	}
+  optional int32 privilageTypeId = 2;
+}
+
+message NewGeneralAttackResponse{
+  // 战斗属性
+  optional FightData fightData = 1;
+  // 道具
+  optional Drop drop = 2;
+}
+
+//扭转乾坤
+message GoodLuckRequest{
+  optional int32 activityId = 1;
+}
+
+message GoodLuckResponse{
+  optional int32 index = 1;
+  optional Drop drop = 2;
+}
+
+message FuXingStoreBuyRequest{
+  optional int32 activityId = 1;
+}
+
+// 踏碎凌霄
+message TasuilingxiaoRequest{
+  // 活动id
+  optional int32 activityId = 1;
+}
+
+message TasuilingxiaoResponse{
+  // 战斗属性
+  optional FightData fightData = 1;
+  // 掉落
+  optional Drop drop = 2;
+  // 伤害值
+  optional int32 damageVal = 3;
+}
 
 
-	// 妖晶购买道具
+// 选择抽卡
-	message BuyGoodsToItemRequest{
+message choiceHeroRewardRequest{
-		optional int32 goodId = 1;
+  optional int32 activityId = 1;
-		optional int32 goodsNum = 2;
+  optional int32 rewardId = 2;
-	}
+}
-	message BuyGoodsToItemResponse{
-		optional Drop drop = 1;
-	}
 
-	//英雄升星活动 选择升星英雄协议
+message choiceHeroRewardResponse{
-	message UpStarActivitySelectRequest{
+}
-		optional int32 activityId = 1;
+
-		optional int32 selectId = 2;
+message choiceDrawCardRequest{
-	}
+  optional int32 activityId = 1;
-	
+  optional int32 type = 2; // 单抽:1 十连抽:2
-	message ExploreActivityIndication{	
+}
-	    optional int32 guildId = 1;//工会id
+
-		optional int32 exploreKillMonsterNum = 2;//探索活动杀敌数 
+message choiceDrawCardResponse{
-	}
+  optional Drop drop = 1;
+}
+
+
+// 奇门遁甲/玲珑棋局
+message qiMenDunJiaDrawRequest{
+  optional int32 activityId = 1;
+  optional int32 num = 2;//1:单抽,10:十连抽
+}
+
+message qiMenDunJiaDrawResponse{
+  optional Drop drop = 1;//获得的奖励列表
+  repeated int32 idList = 2;//获得奖励id
+}
+
+message qiMenDunJiaHitListRequest{
+  optional int32 activityId = 1;
+}
+
+message qiMenDunJiaHitListResponse{
+  repeated int32 hitList = 1;
+}
+
+
+// 御剑飞行
+message RidingSwardActivityRequest{
+  optional int32 activityId = 1;//活动id
+}
+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{
+  optional int32 round = 1;//轮次,-1为全部领取
+  optional int32 swardId = 2;//押注的剑
+}
+message RidingSwardRewardResponse{
+  optional Drop drop = 1;//奖励道具
+}
+// 竞猜
+message RidingSwardBetRequest{
+  optional int32 swardId = 1;//选择的剑
+  optional int32 costNum = 2;//投注数量
+}
+
+// 统一返回
+message RidingSwardInfoResponse{
+  repeated RidingSwardRecord recordLsit = 1;//记录
+  repeated RidingSwardBet betList = 2;//竞猜记录
+  optional RidingSwardLastRank lastRank = 3;//上次排名
+  optional int32 betCount = 4;//投注次数
+}
+
+//周卡
+message WeekCardInfoRequest{
+}
+message WeekCardInfoResponse{
+  repeated WeekCard allWeekCardInfo = 1;
+}
+message WeekCardRewardRequest{
+  optional int32 id = 1; //周卡id
+}
+message WeekCardRewardResponse{
+  optional Drop drop = 1;
+}
+message WeekCardIndicationInfoResponse{
+  repeated WeekCard allWeekCardInfo = 1;
+}
+
+//天地洪炉up抽卡选择协议
+message TrumpGachaSelectItemRequest{
+  optional int32 activityId = 1;
+  repeated int32 selectIds = 2;
+}
+
+//获取天地洪炉抽奖up道具
+message GetTrumpSelectItemRequest{
+}
+message GetTrumpSelectItemResponse{
+  repeated int32 selectIds = 1;
+}
+
+
+// 妖晶购买道具
+message BuyGoodsToItemRequest{
+  optional int32 goodId = 1;
+  optional int32 goodsNum = 2;
+}
+message BuyGoodsToItemResponse{
+  optional Drop drop = 1;
+}
+
+//英雄升星活动 选择升星英雄协议
+message UpStarActivitySelectRequest{
+  optional int32 activityId = 1;
+  optional int32 selectId = 2;
+}
+
+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 ; //目前无用
+		repeated FightUnitInfo MagicSoldierList = 3;//神兵信息
-		optional string specialPassive = 4; // 特殊标记（猎妖之路 圣物被动情况）
+		optional string teamPassiveList = 4; //目前无用
-		optional int32 firstCamp = 5;//出手优先级 0默认我方先出
+		optional string specialPassive = 5; // 特殊标记（猎妖之路 圣物被动情况）
-		optional int64 forceScore = 6;//历史最高战斗力
+		optional int32 firstCamp = 6;//出手优先级 0默认我方先出
-
+		optional int64 forceScore = 7;//历史最高战斗力
 	}
 
 
@@ -205,7 +205,7 @@ option optimize_for = SPEED;
 		optional int32 effectiveTime = 7; // 秒 0:永久有效
 		optional string sendName = 8 ; //发送者名字
 		optional int32 mailType = 9; //邮件类型 1:系统邮件 2:idip 业务邮件
-        optional int32 isTop = 10; //0不置顶 1置顶
+    optional int32 isTop = 10; //0不置顶 1置顶
 		optional int32 markType =11; //0无类型 1:站内信 
 	}
 
@@ -749,16 +749,16 @@ option optimize_for = SPEED;
 	}
 	
 	message TeamOneTeamInfo{
-        repeated TeamSimpleInfo team =1;
+    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{
@@ -773,7 +773,7 @@ option optimize_for = SPEED;
 		optional int32 userTitle = 9;
 		optional int32 practiceLevel = 10;//修行等级
 		repeated TeamOneTeamInfo crossTeam = 11;//跨服玉虚论道 三队伍	
-        optional int32 crossTeamScore = 12;//跨服玉虚论道积分	
+    optional int32 crossTeamScore = 12;//跨服玉虚论道积分
 		optional string serverName = 13;  //服务器名称
 	}
 	
@@ -1078,7 +1078,7 @@ option optimize_for = SPEED;
 	
 	//通用键值对
 	message KeyVal{
-	    optional int32 key = 1;
+		optional int32 key = 1;
 		optional int32 val = 2;
 	}
 

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;//主动修改神兵得位置
@@ -1326,4 +1326,36 @@ message MagicSoldierStrongRequest{
   repeated string costIds = 4;//升星消耗
 }
 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;
 }