From 6d9e76bf0f1e7a682c6ed3497be7339e3c0fd0b5 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Tue, 12 May 2020 10:20:03 +0800
Subject: [PATCH] =?UTF-8?q?Task=E3=80=90=E6=96=B0=E6=88=98=E6=96=97?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E3=80=91=E5=85=AC=E4=BC=9A=E6=8F=B4=E5=8A=A9?=
 =?UTF-8?q?=20=E5=8D=8F=E8=AE=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/CommonProto.proto      |  5 +++++
 protos/Family.proto           | 42 +++++++++++++++++++++++++++++++++++
 protos/MessageTypeProto.proto | 23 ++++++++++++++++++-
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index fd466b8..5e990c4 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -786,4 +786,9 @@ option optimize_for = SPEED;
 		optional string content = 3;
 		
 	}
+	
+	message GuildHelpInfo{
+		optional int32 type =1;//阵营
+		optional int32 num =2;	//碎片数量
+	}
 	
\ No newline at end of file
diff --git a/protos/Family.proto b/protos/Family.proto
index 1d905e7..8731f85 100644
--- a/protos/Family.proto
+++ b/protos/Family.proto
@@ -20,6 +20,8 @@ import "CommonProto.proto";
 		repeated int32 takeFeteReward =13 ; // 祭祀领取进度
 		optional int32 lastFeteGuildId =14 ; // 上次祭祀公会id 
 		optional int32 lastFeteType =15 ; // 上次祭祀类型 //每日清除 5点推送
+		optional int32 guildHelpTime =16 ; // 已经援助次数 //每日清除 5点推送
+		repeated GuildHelpInfo guildHelpInfo = 17;//求援信息 每日清除 5点推送
     }
 	
 	
@@ -470,5 +472,45 @@ import "CommonProto.proto";
 	message DoRewardIndication{
 		optional RewardInfo info = 1;
 	}
+	
+	
+	message GuildSendHelpRequest{//发送公会援助  type 阵营 sendMessage是否发送消息
+		repeated int32 type = 1; 
+		optional bool sendMessage = 2;
+	}
+	message GuildSendHelpResponse{
+	}
+	
+	message GuildTakeHelpRewardRequest{//领取公会援助奖励
+		optional int32 type = 2; 
+	}
+	message GuildTakeHelpRewardResponse{
+		optional Drop drop = 1;
+	}
+	
+	message GuildSendHelpMessageRequest{//发送公会援助
+	}
+	message GuildSendHelpMessageResponse{
+	}
+	
+	
+	message GuildTakeHelpBoxRequest{//领取公会求援宝盒
+	}
+	message GuildTakeHelpBoxResponse{
+		optional Drop drop = 1;
+	}
+	
+	message GuildHelpInfoIndication{ //5点推送 修改推送 
+		optional int32 guildHelpTime =1 ; // 已经援助次数 
+		repeated GuildHelpInfo guildHelpInfo = 2;//求援信息
+	}
+	
+	message GuildHelpHelpOtherRequest{ //援助他人 自己援助次数修改 GuildHelpInfoIndication会推
+		optional int32 uid = 1;
+		optional int32 type = 2; 
+	}
+	message GuildHelpHelpOtherResponse{
+	}	
+	
 
 
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 96205f5..ac71a50 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -921,7 +921,28 @@ enum MessageType{
 	
 	
 	//30301-30330 宝物合成
-	
 	ComplexJewelEquipRequest = 30301; // 宝物合成
 	ComplexJewelEquipResponse = 30302; 
+	
+	//30330-30400 公会援助
+	GuildSendHelpRequest = 303301;//发送公会援助
+	GuildSendHelpResponse = 303302; 
+	
+	GuildTakeHelpRewardRequest = 303303;//领取公会援助奖励
+	GuildTakeHelpRewardRequese = 303304; 
+	
+	GuildSendHelpMessageRequest = 303305;//发送公会援助信息	
+	GuildSendHelpMessageResponse = 303306;
+	
+	GuildTakeHelpBoxRequest = 303307;//领取公会求援宝盒
+	GuildTakeHelpBoxResponse = 303308;
+	
+	GuildHelpHelpOtherRequest = 303309; //援助他人 
+	GuildHelpHelpOtherResponse = 303310;
+	
+	GuildHelpInfoIndication = 303311; //修改和5点推送 
+	
+	
 }
+
+