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

protos/CommonProto.proto

@@ -99,3 +99,10 @@ option optimize_for = SPEED;
 	message GMCommand{
 		optional string command =1 ;	// 指令字符串  type#prarm1#param2
 	}
+
+	message AdventureStateInfo{
+		optional int32 positionId = 1;  // 区域编号
+		repeated string heroIdList =2 ; // 驻扎英雄id
+		optional int32 startTime =3;   // 开始时间
+		optional int32 hourDuration =4; //持续时长
+	}

protos/FightInfoProto.proto

@@ -0,0 +1,11 @@
+package com.ljsd.jieling.protocols;
+
+option optimize_for = SPEED;
+
+import "CommonProto.proto";
+
+// request 编号需要小于 response 编号
+
+	message GetAdventureStateInfoResponse{
+		repeated AdventureStateInfo adventureStateInfoList = 1;
+	}