Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol

protos/CommonProto.proto

@@ -734,7 +734,31 @@ option optimize_for = SPEED;
 	}
 	
 
-
+	//猎妖之路节点信息
+	message ExpeditionNodeInfo{
+		optional int32 sortId = 1;//节点id
+		optional int32 lay = 2;//节点层
+		optional int32 type = 3;//节点类型
+		optional ExpeditionTeamInfo bossTeaminfo = 4;//节点队伍信息
+		optional int32 state = 5;////节点状态 0未开启 1未通过 2未领取圣物 3已完成
+		repeated int32 holyEquipID = 6;//圣物id
+	}
 	
-
+	message ExpeditionSimpleBossInfo{
+		optional int32 heroTid = 1;//英雄模板id
+		optional int32 star = 2;
+		optional int32 level =3;
+		optional int32 remainHp =4;//剩余血量
+	}
+	
+	message ExpeditionTeamInfo{
+        repeated ExpeditionSimpleBossInfo hero =1;
+		repeated int32 PokemonInfos = 2;
+		optional int32 totalForce=3;
+	}
+	
+	message ExpeditionSimpleHeroInfo{
+		optional int32 heroId = 1;//英雄id
+		optional int32 remainHp =2;//剩余血量
+	}
 	

protos/Expedition.proto

@@ -0,0 +1,48 @@
+package com.ljsd.jieling.protocols;
+
+option optimize_for = SPEED;
+
+import "CommonProto.proto";
+
+	
+	//获取节点信息
+	message GetExpeditionRequest{
+	}
+	
+	message GetExpeditionResponse{
+		repeated ExpeditionNodeInfo nodeInfo = 1; //节点信息
+		repeated ExpeditionSimpleHeroInfo heroInfo = 2;//己方英雄信息
+		repeated int32 lay = 3;//领取过奖励的id
+		 
+	}
+
+	message TakeExpeditionBoxRewardRequest{
+		optional int32 lay = 1;  //层
+	}
+
+	
+	message TakeExpeditionBoxRewardResponse{
+		optional Drop drop = 1;
+	} 
+	
+
+	message ReliveExpeditionHeroRequest{
+		optional int32 heroId = 1; //复活英雄id
+	}
+	
+	message ReliveExpeditionHeroResponse{
+		optional ExpeditionSimpleHeroInfo heroInfo =1;//复活的英雄信息
+	}
+
+	
+	message StartExpeditionBattleRequest{
+		optional int32 nodeId = 1; //节点id 
+		optional int32 expInfo = 2; //扩展信息 复活节点传英雄id 
+	}
+	
+	message StartExpeditionBattle{
+		repeated ExpeditionNodeInfo nodeInfo = 1;
+		repeated ExpeditionSimpleHeroInfo heroInfo = 2;//己方英雄信息
+	}
+	
+	

protos/MessageTypeProto.proto

@@ -806,4 +806,23 @@ enum MessageType{
 // X 12300
 // Y 12400
 // Z 12500
+
+
+// 20001 - 20100 猎妖之路 
+
+	
+	EXPEDITION_GET_EXPEDITION_REQUEST = 20002;//获取节点信息
+	EXPEDITION_GET_EXPEDITION_RESONSE = 20003;
+
+	EXPEDITION_TAKE_BOXREWARD_REQUEST = 20004;//获取层级奖励
+	EXPEDITION_TAKE_BOXREWARD_RESONSE = 20005;
+	
+	EXPEDITION_RELIVE_HERO_REQUEST = 20006;//复活英雄
+	EXPEDITION_RELIVE_HERO_RESONSE = 20007;
+	
+	EXPEDITION_START_BATTLE_REQUEST = 20008;//节点操作
+	EXPEDITION_START_BATTLE_RESONSE = 20009;
+	
+
+	
 }