From 548ddeeeec3f84e381f9fa69826f1e8fa4ab2914 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Wed, 6 May 2020 16:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A5=AD=E7=A5=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/Family.proto           | 28 ++++++++++++++++++++++++++--
 protos/MessageTypeProto.proto | 12 ++++++++++++
 protos/PlayerInfoProto.proto  |  2 ++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/protos/Family.proto b/protos/Family.proto
index 6d92b04..4cf361b 100644
--- a/protos/Family.proto
+++ b/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点推送
     }
 
 
@@ -370,4 +372,26 @@ import "CommonProto.proto";
 	
 	message ResetGuildSkillResponse{
 		optional Drop drop = 1;
-	}
\ No newline at end of file
+	}
+	
+	message FamilyFeteRequest{
+		optional int32 type = 1; //献祭类型
+	}
+	
+	message FamilyFeteResponse{
+		optional int32 type = 1; //献祭类型
+		optional int32 contribute = 2;  //贡献
+		optional int32 curExp = 3;  //经验
+		optional int32 score = 4;  //进度
+	}
+	
+	message FamilyGetFeteRewardRequest{
+		optional int32 id = 1; //进度id
+	}
+	message FamilyGetFeteRewardResponse{
+	}
+	
+	message FamilyFeteRewardProcessIndication{
+		optional int32 score = 1;  //公会祭祀进度
+	}
+	
\ No newline at end of file
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index effc868..75b3090 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -872,4 +872,16 @@ enum MessageType{
 //20111 - 20200 装备、
 	EQUIP_COMPLEX_REQUEST = 20111;//合成装备
 	EQUIP_COMPLEX_RESPONSE = 20112;
+	
+	
+	
+	//30000以后 新增协议号使用协议名定义 协议号自动映射
+	
+	FamilyFeteRequest = 30001;//祭祀
+	FamilyFeteResponse = 30002;//祭祀
+	
+	FamilyGetFeteRewardRequest = 30003;//领取公会祭祀
+	FamilyGetFeteRewardResponse = 30004;//
+	
+	FamilyFeteRewardProcessIndication = 30005 ; // 更新公会进度
 }
diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto
index f592c56..dfd4b60 100644
--- a/protos/PlayerInfoProto.proto
+++ b/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 ; // 祭祀领取进度
 	}