Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

# Conflicts:
#	protos/Family.proto

protos/Family.proto

@@ -17,7 +17,9 @@ import "CommonProto.proto";
         optional int32 frame = 10;      // 头像框
         optional int32 maxBossHurt = 11; // 历史最高伤害
         optional int32 lastHurt = 12 ;// 上次伤害
-
+		repeated int32 takeFeteReward =13 ; // 祭祀领取进度
+		optional int32 lastFeteGuildId =14 ; // 上次祭祀公会id 
+		optional int32 lastFeteType =15 ; // 上次祭祀类型 //每日清除 5点推送
     }
 
 
@@ -373,6 +375,7 @@ import "CommonProto.proto";
 		optional Drop drop = 1;
 	}
 	
+
 	message CarDelayProgressIndication{
 		optional int32 progress = 1; //阶段 -1：未开 1 ： 挑战 2：抢夺
 		optional int32 endTime = 2; //结束时间
@@ -383,4 +386,47 @@ import "CommonProto.proto";
 		repeated RankInfo rankInfo = 1;
 		optional int32 myRank = 2; //我的排名
 		optional int32 myScore = 3 ;//我的积分
-	}
+	}
+
+	message FamilyFeteRequest{
+		optional int32 type = 1; //献祭类型
+	}
+	
+	message FamilyFeteResponse{
+		optional int32 curExp = 1;  //经验
+
+	}
+	
+	message FamilyGetFeteRewardRequest{
+		optional int32 id = 1; //进度id
+	}
+	message FamilyGetFeteRewardResponse{
+	}
+	
+	message FamilyFeteRewardProcessIndication{
+		optional int32 score = 1;  //公会祭祀进度
+	}
+	
+	message DeathPathInfo{
+		optional int32 pathId = 1;
+		optional int32 guildId = 2;
+	}
+	
+	message GetDeathPathStatusResponse{
+		optional int32 status = 1;//0未开启；1开启
+	}
+	message GetDeathPathInfoResponse{
+		optional int32 overTime = 1;//剩余时间
+		optional int32 challengeCount = 2;//已挑战次数
+		repeated DeathPathInfo infos = 3;
+	}
+	message ChallengeDeathPathRequest{
+		optional int32 pathId = 1;
+	}
+	message ChallengeDeathPathResponse{
+		optional FightData fightData = 1;
+		optional int32 damage = 2;
+		optional Drop drop = 3;
+	}
+
+

protos/MessageTypeProto.proto

@@ -171,6 +171,16 @@ enum MessageType{
 	
 	DAILY_CHALLENGE_REQUEST = 10307;//日常挑战
 	DAILY_CHALLENGE_RESPONSE = 10308;
+	
+	DEATH_PATH_GET_STATUS_REQUEST = 10309;//获取十绝阵状态信息
+	DEATH_PATH_GET_STATUS_RESPONSE = 10310;
+	
+	
+	DEATH_PATH_INFO_REQUEST = 10311;//十绝阵内信息
+	DEATH_PATH_INFO_RESPONSE = 10312;
+	
+	DEATH_PATH_CHALLENGE_REQUEST = 10313;//挑战十绝阵
+	DEATH_PATH_CHALLENGE_RESPONSE = 10314;
 
 	
 // E 10400
@@ -881,4 +891,16 @@ enum MessageType{
 //20111 - 20200 装备、
 	EQUIP_COMPLEX_REQUEST = 20111;//合成装备
 	EQUIP_COMPLEX_RESPONSE = 20112;
+	
+	
+	
+	//30000以后 新增协议号使用协议名定义 协议号自动映射
+	
+	FamilyFeteRequest = 30001;//祭祀
+	FamilyFeteResponse = 30002;//祭祀
+	
+	FamilyGetFeteRewardRequest = 30003;//领取公会祭祀
+	FamilyGetFeteRewardResponse = 30004;//
+	
+	FamilyFeteRewardProcessIndication = 30005 ; // 更新公会进度
 }

protos/PlayerInfoProto.proto

@@ -378,6 +378,8 @@ import "CommonProto.proto";
 		repeated LuckWheelRewardPosInfo posInfos = 8;//转盘信息
 		repeated LuckWheelRewardPosInfo posInfosAdvance = 9;//高级转盘信息
 		repeated int32 MonthDailyTake=10;//已领取的月卡id
+		optional int32 lastFeteType =11 ; // 上次祭祀类型 //每日清除 5点推送
+		repeated int32 takeFeteReward =12 ; // 祭祀领取进度
 	}