Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

protos/CommonProto.proto

@@ -99,6 +99,7 @@ option optimize_for = SPEED;
 		repeated SoulPos soulPos = 12;//魂印
 		optional int32 lockState = 13;// 上锁状态 1 ：上锁 0：未上锁
 		repeated string jewels = 14;//宝器
+		optional int32 createtype  = 15;//创建类型 1猎妖援助
 	}
 	
 

protos/Expedition.proto

@@ -25,7 +25,7 @@ import "CommonProto.proto";
 	
 	message TakeExpeditionBoxRewardResponse{
 		optional Drop drop = 1;
-		repeated int32 leve = 2;  //阶段id  3层的时候有困难和普通两个
+		repeated int32 leve = 2;  //阶段id  3层的时候有困难和普通两个 
 	} 
 	
 
@@ -70,6 +70,15 @@ import "CommonProto.proto";
 	}
 
 	
+	message EndConfirmExpeditionBattleRequest{
+		optional int32 nodeId = 1; //节点id 
+	}
+	
+	message EndConfirmExpeditionBattleResponse {
+
+	}
+	
+	
 	message TakeHolyEquipRequest{
 		optional int32 nodeId = 1; //节点id 
 		optional int32 type = 2;  //获取类型
@@ -108,6 +117,28 @@ import "CommonProto.proto";
 		optional int32 score =1 ;
 		repeated TreasureRewardState treasureRewardState=2;
 	}
-
+	
+	message StoreNodeRequest{
+		optional int32 nodeId =1;//节点id -1 放弃节点
+	}
+	
+	message StoreNodeResponse{
+	}
+	
+	message HeroNodeRequest{
+		optional int32 nodeId =1;//招募节点
+		optional int32 heroId =2;//招募英雄id
+	}
+	
+	message HeroNodeResponse{
+	}
+	
+	message ExpeditionResetIndication { //猎妖重置
+		repeated ExpeditionNodeInfo nodeInfo = 1; //节点信息
+		repeated ExpeditionSimpleHeroInfo heroInfo = 2;//己方英雄信息
+		repeated int32 rewardids = 3;//领取过奖励的id
+		repeated ExpeditionEquip equipIds = 4;//圣物
+		repeated string removesHeroIds = 5;//移除援助的英雄
+	}
 	
 	

protos/MessageTypeProto.proto

@@ -958,6 +958,18 @@ enum MessageType{
 	GuildGetHelpLogResponse = 303315; 
 	GuildHelpLogIndication = 303316; //新的援助会推
 	
+	
+	//303400 303500 远征
+	EndConfirmExpeditionBattleRequest = 303400;//远征失败节点确认
+	EndConfirmExpeditionBattleResponse = 303401;
+	
+	StoreNodeRequest = 303402;
+	StoreNodeResponse = 303403;
+	
+	HeroNodeRequest = 303404;
+	HeroNodeResponse = 303405;
+	
+	ExpeditionResetIndication = 303406;
 }
 
 

protos/PlayerInfoProto.proto

@@ -67,7 +67,7 @@ import "CommonProto.proto";
 		optional int32 missingRefreshCount = 28;//迷宫寻宝妖精刷新次数
 		repeated MonthCardInfo monthinfos = 29;//月卡
 		repeated int32 dailyChallengeInfo = 30;//每日挑战信息
-		optional int32 expeditionLeve =31 ; //猎妖之路阶段 
+		optional int32 expeditionLeve =31 ; //猎妖之路阶段 -1 待选择
 	}
 
 
@@ -381,7 +381,7 @@ import "CommonProto.proto";
 		repeated int32 MonthDailyTake=10;//已领取的月卡id
 		optional int32 lastFeteType =11 ; // 上次祭祀类型 //每日清除 5点推送
 		repeated int32 takeFeteReward =12 ; // 祭祀领取进度
-		optional int32 expeditionLeve =13 ; //猎妖之路阶段 
+		optional int32 expeditionLeve =13 ; //猎妖之路阶段 -1 待选择
 	}