From d5f454fef8fe5f639d96fdbde7faf3142c684f78 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 3 Aug 2019 17:37:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E6=95=A3=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + protos/Family.proto | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 012c7f0..c212240 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -492,6 +492,7 @@ option optimize_for = SPEED; optional int32 maxNum = 7 ;// 最大人数 optional int32 joinType = 8; //加入类型 1:直接加入 2:申请加入 3:禁止加入 optional int32 icon = 9; // 公会图标 + optional int32 levelTime=10; //解散公会开始时间 } //无尽副本英雄信息 diff --git a/protos/Family.proto b/protos/Family.proto index c595e7f..8fe55c2 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -163,3 +163,8 @@ import "CommonProto.proto"; optional int32 targetUid = 1 ;//要被转让的人 } + //解散公会和取消 + message FamilyDissolutionRequest{ + optional int32 type =1 ;//操作类型 1 ：解散公会 2 ： 取消解散公会 + } + From 531f6b729ec9629990ad09368f9117f33dad5dc1 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 3 Aug 2019 18:02:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E6=95=A3=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index 8fe55c2..09e4e47 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -125,6 +125,10 @@ import "CommonProto.proto"; optional int32 targetUid = 1; // 被踢的人 } + message FamilyKickIndication{ + optional int32 type = 1; // 1 ：被踢， 2 ：公会解散 + } + message FamilyAppointmentReqeust{ optional int32 targetUid = 1; //被委任的人 optional int32 position = 2; //公会职位 1:会长 2:管理员 3:一般成员