Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol

protos/CommonProto.proto

@@ -480,6 +480,14 @@ option optimize_for = SPEED;
 		optional int32 tower = 1;//试炼层数
 		optional int32 intoType = 2;//可进入标识
 	}
+
+	message FamilyBaseInfo{
+		optional int32 id =1; // 公会id
+		optional string name = 2 ; //  公会名称
+		optional string annouce =3 ; // 公会宣言
+		optional int32 levle = 4 ; //等级
+	}
+	
 	//无尽副本英雄信息
 	message endlessHero{
 		optional string heroId = 1; //英雄Id

protos/Family.proto

@@ -0,0 +1,34 @@
+package com.ljsd.jieling.protocols;
+
+option optimize_for = SPEED;
+
+import "CommonProto.proto";
+
+
+message FamilyCreateReqeust{
+	optional string name = 1 ; //公会名称
+	optional string announce  =2 ; // 公会宣言
+}
+
+
+message FamilySearchReqeust{
+	optional string name = 1 ;// 要搜素的公会名称
+}
+
+message FamilySeachResponse{
+	repeated FamilyBaseInfo  familyBaseInfo =1;
+}
+
+message FamilyApplyRequest{
+	repeated int32 familyId  = 1; //申请family 
+}
+
+//申请成功 推送成功加入公会信息
+message FamilyJoinIndicaion{
+	repeated FamilyBaseInfo  familyBaseInfo =1;
+}
+
+
+message FamilyRecommandResponse{
+	repeated FamilyBaseInfo  familyBaseInfo =1;
+}

protos/MessageTypeProto.proto

@@ -159,6 +159,25 @@ enum MessageType{
     FB_STAR_REWARD_REQUEST = 10517; //副本星级奖励
     FB_STAR_REWARD_RESPONSE = 10518;
 
+    FAMILY_CREATE_REQUEST =  10519; //创建公会
+    FAMILY_CREATE_RESPONSE = 10520;
+
+    FAMILY_RECOMEND_REQUEST = 10521; // 公会推荐列表
+    FAMILY_RECOMEND_RESPONSE = 10522;
+
+    FAMILY_JOIN_REQUEST = 10523; // 加入公会
+    FAMILY_JOIN_RESPONSE = 10524; 
+
+    FAMILY_APPLY_REQEUST = 10525; //申请公会
+    FAMILY_APPLY_RESPONSE = 10526;
+
+    FAMILY_SEARCH_REQEUST = 10527 ;// 公会搜素
+    FAMILY_SEARCH_RESPONSE = 10528 ;
+
+    FAMILY_JOIN_INDICATION = 10529; //公会推送
+
+
+
 // G 10600
     GET_PLAYERINFO_REQUEST   = 10600; //
     GET_PLAYERINFO_RESPONSE  = 10601;