From 028bbc281cd3264f0941868a3166936b4cb62feb Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Wed, 13 May 2020 11:20:37 +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      |  9 +++++++++
 protos/Family.proto           | 15 +++++++++++++--
 protos/MessageTypeProto.proto |  4 ++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 5e990c4..506dc30 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -791,4 +791,13 @@ option optimize_for = SPEED;
 		optional int32 type =1;//阵营
 		optional int32 num =2;	//碎片数量
 	}
+	
+	message GuildHelpLog{
+		optional int32 helperuid =1;
+		optional int32 targetuid =2;
+		optional string helpername =3;
+		optional string targetname =4;
+		optional int32 type =5;//阵营
+		optional int32 time =6;//时间秒
+	}
 	
\ No newline at end of file
diff --git a/protos/Family.proto b/protos/Family.proto
index 813bdc6..399a3f9 100644
--- a/protos/Family.proto
+++ b/protos/Family.proto
@@ -506,7 +506,8 @@ import "CommonProto.proto";
 	
 	message GuildHelpInfoIndication{ //5点推送 修改推送 
 		optional int32 uid = 1;//uid
-		repeated GuildHelpInfo guildHelpInfo = 2;//求援信息
+		optional string name = 2;//name
+		repeated GuildHelpInfo guildHelpInfo = 3;//求援信息
 	}
 	
 	message GuildHelpHelpOtherRequest{ //援助他人 自己援助次数修改 GuildHelpInfoIndication会推
@@ -522,5 +523,15 @@ import "CommonProto.proto";
 	message GuildHelpGetAllResponse{
 		repeated GuildHelpInfoIndication guildHelpInfoIndication = 1;//求援信息
 	}	
-
+	
+	message GuildGetHelpLogRequest{ //请求援助日志 只能获取当天的
+	
+	}
+	message GuildGetHelpLogResponse{ 
+		repeated GuildHelpLog guildHelpLog = 1;
+	}
+	
+	message GuildHelpLogIndication{//新的援助会推
+		optional GuildHelpLog guildHelpLog = 1;
+	}
 
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index e3e3559..3e9bdb7 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -944,6 +944,10 @@ enum MessageType{
 	GuildHelpGetAllRequest = 303312 ; //获取成员援助信息
 	GuildHelpGetAllRResponse = 303313 ; 
 	
+	GuildGetHelpLogRequest = 303314; //请求援助日志 
+	GuildGetHelpLogResponse = 303315; 
+	GuildHelpLogIndication = 303316; //新的援助会推
+	
 }