From ca23bed2faa6f25585ea67615e7b4899437ec1f6 Mon Sep 17 00:00:00 2001
From: wangyuan <wangyuan@qq.com>
Date: Thu, 1 Aug 2019 21:03:02 +0800
Subject: [PATCH] family apply

---
 protos/CommonProto.proto |  2 +-
 protos/Family.proto      | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 20753b7..ceecefa 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -16,7 +16,7 @@ option optimize_for = SPEED;
 		optional int32 level = 3;
 		optional int32 exp = 4;
 		optional int32 vipLevel = 5;
-		optional string familyId = 6;
+		optional int32 familyId = 6;
 		optional string head = 7;
 		optional int32 curMapId = 8;
 
diff --git a/protos/Family.proto b/protos/Family.proto
index 516f4ee..8729894 100644
--- a/protos/Family.proto
+++ b/protos/Family.proto
@@ -28,11 +28,10 @@ import "CommonProto.proto";
         required string name = 1;   // 玩家名称
         required int32 roleUid = 2; // 申请人ID
         required int32 time = 3;    // 申请时间
-        required int32 icon = 4;
-        required int32 frame = 5;
-        required int32 outTime = 6; // 离线时间长（秒） 0表示在线
-        required int32 level = 7;
-        required int32 foreces = 8;  // 灵魂力
+        required int32 frame = 4; //头像框
+        required int32 outTime = 5; // 离线时间长（秒） 0表示在线
+        required int32 level = 6;
+        required int32 foreces = 7;  // 灵魂力
     }
 
 
@@ -108,4 +107,9 @@ import "CommonProto.proto";
 	//获取公会日志信息
 	message GetFamilyLogResponse{
 		repeated FamilyLogInfo familyLogInfo =1;
+	}
+
+	//获取公会申请信息
+	message GetFamilyApplyResponse{
+		repeated FamilyApply familyApply =1;
 	}
\ No newline at end of file