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

# Conflicts:
#	protos/FightInfoProto.proto

protos/CommonProto.proto

@@ -665,4 +665,15 @@ option optimize_for = SPEED;
 		optional int32 luckTimes = 3;//中奖数
 	}
 
+	message MainLevelRankInfo{
+		optional int32 uid = 1;
+		optional int32 level =2;
+		optional string name =3;
+		optional int32 fightId = 4;
+		optional int32 head =5;
+		optional int32 rank =6; //排名
+		optional int32 totalForce =7;
+		optional int32 headFrame = 8;
+	}
+
 	

protos/FightInfoProto.proto

@@ -210,5 +210,12 @@ import "CommonProto.proto";
 		// 事件获得的道具
 		optional Drop enventDrop = 2;
 	}
+	
+
+	message MainLevelRankInfoResponse{
+		repeated MainLevelRankInfo MainLevelRankInfo = 1;
+		optional MainLevelRankInfo myMainLevelRankInfo =2;
+	}
+
 
 

protos/HeroInfoProto.proto

@@ -162,3 +162,11 @@ import "CommonProto.proto";
 		optional Drop drop = 1;//掉落
 		optional int32 pos = 2;
 	}
+
+	message HeroReturnRequest{
+		optional string heroId = 1;
+	}
+
+	message HeroReturnResponse{
+		optional Drop drop =1;
+	}

protos/MessageTypeProto.proto

@@ -404,6 +404,9 @@ enum MessageType{
 
     HERO_COMPOSE_REQUEST = 10703; // 合成英雄
     HERO_COMPOSE_RESPONSE = 10704;
+
+    HERO_RETURN_REQUEST = 10705; //英雄回溯
+    HERO_RETURN_RESPONSE = 10706;
 // I 10800
 // J 10900
 // K 11000
@@ -476,6 +479,8 @@ enum MessageType{
     MAIN_LEVEL_TAKE_STATE_REWARD_REQUEST = 11238; //领取关卡挂机奖励
     MAIN_LEVEL_TAKE_STATE_REWARD_RESPONSE = 11239;
 
+    MAIN_LEVEL_GET_RANK_REQUEST = 11240 ; //  获取关卡排行
+    MAIN_LEVEL_GET_RANK_RESPONSE = 11241 ; // 
 
 
 // N 11300