心愿

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;//历史最高战斗力
 	}
 
 
@@ -758,7 +758,7 @@ option optimize_for = SPEED;
 		repeated SixiangxinfaInfo sixiangxinfaInfo = 7;//四象心法
 		repeated LifeGridInfo lifeGridInfo = 8;//命格
 		repeated UserMountInfo userMountInfo = 9;//坐骑
-		
+		repeated TeamSimpleInfo MagicSoldier = 10;//神兵
 	}
 	//第一编队信息
 	message TeamOneInfo{

protos/HeroInfoProto.proto

@@ -414,23 +414,6 @@ import "CommonProto.proto";
   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{
   repeated beautyBagCardInfo infoList = 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;
+}