From 2dcd2e2afaf5c7ee4754794e2dd245f03f863461 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 2 Aug 2019 17:45:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=AE=A3=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 10 ++++++++++ protos/MessageTypeProto.proto | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index a2f4abc..d1d7f5f 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -137,3 +137,13 @@ import "CommonProto.proto"; optional int32 postiion = 1; //公会职位 } + + message FamilyChangeRequest{ + optional string content = 1; // 宣言内容 + } + + + message FamilyChangeResponse{ + optional string err = 1 ; // 错误信息 + } + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 9f282ac..4d28178 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -208,6 +208,12 @@ enum MessageType{ FAMILY_POSITION_UPDATE_INDICAITON = 10545; // 公会成员职位变更 + FAMILY_DISSOLUTION_REQUEST = 10546; //解散公会 + FAMILY_DISSOLUTION_RESPONSE = 10547; + + FAMILY_CHANGE_NOTICE_REQUEST = 10548; //编辑宣言 + FAMILY_CHANGE_NOTICE_RESPONSE = 10549; + // G 10600 From 59230cdb0cb2964ca4bd711e0022643e8baaaa54 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 2 Aug 2019 17:52:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 4 ++++ protos/MessageTypeProto.proto | 2 ++ 2 files changed, 6 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index d1d7f5f..316727a 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -147,3 +147,7 @@ import "CommonProto.proto"; optional string err = 1 ; // 错误信息 } + message FamilyChangeJoinTypeRequest{ + optional int32 type =1; // //加入类型 1:直接加入 2:申请加入 3:禁止加入 + } + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 8a26af4..3dacf86 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -215,6 +215,8 @@ enum MessageType{ FAMILY_CHANGE_NOTICE_REQUEST = 10548; //编辑宣言 FAMILY_CHANGE_NOTICE_RESPONSE = 10549; + FAMILY_CHANGE_JOIN_TYPE_REQUEST = 10550; // 修改公会加入类型 + FAMILY_CHANGE_JOIN_TYPE_RESPONSE = 10051; // G 10600 From 529a74da6f193061af2ad0bee8eadd31a5ce15c5 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 2 Aug 2019 18:12:37 +0800 Subject: [PATCH 3/5] fix --- protos/MessageTypeProto.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 3dacf86..859f0d1 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -216,7 +216,7 @@ enum MessageType{ FAMILY_CHANGE_NOTICE_RESPONSE = 10549; FAMILY_CHANGE_JOIN_TYPE_REQUEST = 10550; // 修改公会加入类型 - FAMILY_CHANGE_JOIN_TYPE_RESPONSE = 10051; + FAMILY_CHANGE_JOIN_TYPE_RESPONSE = 10551; // G 10600 From e8461ef49bd941544e015a4cc06825c014fbc2a2 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 2 Aug 2019 18:41:25 +0800 Subject: [PATCH 4/5] family change indicaiton --- protos/Family.proto | 4 ++++ protos/MessageTypeProto.proto | 1 + 2 files changed, 5 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index 316727a..4ced25e 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -151,3 +151,7 @@ import "CommonProto.proto"; optional int32 type =1; // //加入类型 1:直接加入 2:申请加入 3:禁止加入 } + message familyChangeIndication{ + optional FamilyBaseInfo familyBaseInfo =1; + } + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 859f0d1..4958708 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -218,6 +218,7 @@ enum MessageType{ FAMILY_CHANGE_JOIN_TYPE_REQUEST = 10550; // 修改公会加入类型 FAMILY_CHANGE_JOIN_TYPE_RESPONSE = 10551; + FAMILY_CHANGE_BASE_INDICATION = 10552;// 公会信息变更推送 // G 10600 GET_PLAYERINFO_REQUEST = 10600; // From 3bb6903c217bfe1552a607a2d5518cfe00e06e55 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 3 Aug 2019 10:59:47 +0800 Subject: [PATCH 5/5] family update --- protos/Family.proto | 9 ++++++++- protos/MessageTypeProto.proto | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index 4ced25e..db49606 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -151,7 +151,14 @@ import "CommonProto.proto"; optional int32 type =1; // //加入类型 1:直接加入 2:申请加入 3:禁止加入 } - message familyChangeIndication{ + //公会基本信息变更推送 + message FamilyChangeIndication{ optional FamilyBaseInfo familyBaseInfo =1; } + + //转让会长 + message FamilyChairmanChangeRequest{ + optional int32 targetUid = 1 ;//要被转让的人 + } + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 4958708..b82bdf2 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -220,6 +220,9 @@ enum MessageType{ FAMILY_CHANGE_BASE_INDICATION = 10552;// 公会信息变更推送 + FAMILY_TRANSFER_CHAIRMAN_REQUEST = 10553; // 转让会长 + FAMILY_TRANSFER_CHAIRMAN_RESPONSE = 10554; + // G 10600 GET_PLAYERINFO_REQUEST = 10600; // GET_PLAYERINFO_RESPONSE = 10601;