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

protos/CommonProto.proto

@@ -91,6 +91,7 @@ option optimize_for = SPEED;
 		
 		repeated string especialEquip = 11;//所穿戴法宝
 		repeated SoulPos soulPos = 12;//魂印
+		optional int32 lockState = 13;// 上锁状态 1 ：上锁 0：未上锁
 	}
 	
 
@@ -669,4 +670,15 @@ option optimize_for = SPEED;
 		repeated int32 taskIds = 2;
 	}
 
+	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

@@ -197,5 +197,25 @@ import "CommonProto.proto";
 		optional AdventureBossSimpleInfo  adventureBossInfo =1; // 召唤bosss信息
 	}
 
+		
+	message QuickStartMonsterFightRequest{
+		optional int32 fightId = 1;
+		optional int32 teamId = 2;  //队伍id
+	}
+
+
+	message QuickStartMonsterFightResponse{
+		//战斗结果
+		optional int32 result = 1;
+		// 事件获得的道具
+		optional Drop enventDrop = 2;
+	}
+	
+
+	message MainLevelRankInfoResponse{
+		repeated MainLevelRankInfo MainLevelRankInfo = 1;
+		optional MainLevelRankInfo myMainLevelRankInfo =2;
+	}
+
 
 

protos/HeroInfoProto.proto

@@ -162,3 +162,16 @@ import "CommonProto.proto";
 		optional Drop drop = 1;//掉落
 		optional int32 pos = 2;
 	}
+
+	message HeroReturnRequest{
+		optional string heroId = 1;
+	}
+
+	message HeroReturnResponse{
+		optional Drop drop =1;
+	}
+
+	message HeroLockChangeRequest{
+		optional string heroId =1;
+		optional int32 lockState = 2 ; // 1 上锁 0 ：解锁
+	}

protos/MessageTypeProto.proto

@@ -313,6 +313,9 @@ enum MessageType{
 
 	FAMILY_REFUSE_JOIN_INDICATION = 10583;//拒绝玩家加入工会indication
 
+    FRIEND_BLACK_OPT_REQUEST =  10584; // 黑名单操作
+    FRIEND_BLACK_OPT_RESPONSE = 10585;
+
 // G 10600
     GET_PLAYERINFO_REQUEST   = 10600; //
     GET_PLAYERINFO_RESPONSE  = 10601;
@@ -404,6 +407,12 @@ enum MessageType{
 
     HERO_COMPOSE_REQUEST = 10703; // 合成英雄
     HERO_COMPOSE_RESPONSE = 10704;
+
+    HERO_RETURN_REQUEST = 10705; //英雄回溯
+    HERO_RETURN_RESPONSE = 10706;
+
+    HERO_LOCK_CHANGE_REQUEST = 10707 ;// 英雄上锁操作
+    HERO_LOCK_CHANGE_RESPONSE =  10708;
 // I 10800
 // J 10900
 // K 11000
@@ -476,6 +485,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
@@ -495,6 +506,8 @@ enum MessageType{
 	
 // Q 11600
 	QUESTION_INDICATION = 11600;//问卷推送
+	QUICK_START_MONSTERFIGHTER_REQUEST = 11601;//兽潮快速战斗
+	QUICK_START_MONSTERFIGHTER_REPONSE = 11602;
 // R 11700
     RECONNECT_REQUEST   = 11700; //重连请求
     RECONNECT_RESPONSE  = 11701;

protos/PlayerInfoProto.proto

@@ -283,7 +283,7 @@ import "CommonProto.proto";
 	}
 
 	message GetFriendInfoRequest{
-		optional int32 type = 1; //1:好友列表, 2:推荐列表 3:申请列表
+		optional int32 type = 1; //1:好友列表, 2:推荐列表 3:申请列表 4 黑名单信息
 	}
 
 	message GetFriendInfoResponse{
@@ -355,6 +355,11 @@ import "CommonProto.proto";
 		repeated int32 friendIds = 1;
 	}
 
+	message FriendBlackOptRequest{
+		optional int32 type  =1 ; // 操作类型 ： 1 加入黑名单 2 解除黑名单
+		optional int32 blackUid  =2;// 用户uid
+	}
+
 	message FivePlayerUpdateIndication{
 		optional int32 hadTakeDailyBox = 1 ;//是否领取每日礼包 1：已领取vip等级 -1：未领取
 		repeated Privilege privilege =2 ; //特权使用信息