Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

# Conflicts:
#	protos/CommonProto.proto

protos/CommonProto.proto

@@ -488,3 +488,8 @@ option optimize_for = SPEED;
 		optional int32 levle = 4 ; //等级
 	}
 	
+	//无尽副本英雄信息
+	message endlessHero{
+		optional string heroId = 1; //英雄Id
+		optional int32 hp = 2;//英雄血量
+	}

protos/MapInfoProto.proto

@@ -257,5 +257,8 @@ import "CommonProto.proto";
 		optional Drop drop = 1;
 	}
 	
-	
+	message GetEndlessHeroResponse{
+	//英雄信息
+		repeated endlessHero heroInfo =1;
+	}
 	

protos/MessageTypeProto.proto

@@ -127,6 +127,9 @@ enum MessageType{
     
 	EQUIP_LOCK_REQUEST = 10408; //装备锁定
 	EQUIP_LOCK_RESPONSE = 10409; 
+	
+	ENDLESS_MAP_HERO_INFO_REQUEST = 10410;//无尽副本英雄信息
+	ENDLESS_MAP_HERO_INFO_RESPONSE = 10411;
 // F 10500
     FIGHT_START_REQUEST   = 10500; //
     FIGHT_START_RESPONSE  = 10501;