From 9862c48d3c679ba4e6d3630f7f4714fed41a9e13 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Thu, 9 Jan 2020 18:33:27 +0800
Subject: [PATCH] =?UTF-8?q?TASK=E3=80=90ID1005460=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E7=8E=A9=E6=B3=95=E9=9C=80=E6=B1=82=E3=80=91=E7=8C=8E=E5=A6=96?=
 =?UTF-8?q?=E4=B9=8B=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/CommonProto.proto | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 0cf5dda..6c96e8d 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -733,17 +733,6 @@ option optimize_for = SPEED;
 		optional int32 itemId = 7;
 	}
 	
-
-	//猎妖之路节点信息
-	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;
@@ -756,6 +745,18 @@ option optimize_for = SPEED;
 		repeated int32 PokemonInfos = 2;
 		optional int32 totalForce=3;
 	}
+
+	//猎妖之路节点信息
+	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 ExpeditionSimpleHeroInfo{
 		optional string heroId = 1;//英雄id