From 80fa28f7677e6105c597e0c664a077210a51622a Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 1 Aug 2019 15:16:22 +0800 Subject: [PATCH 1/2] family join --- protos/Family.proto | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index 73708a3..3b85820 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -23,9 +23,19 @@ message FamilyApplyRequest{ repeated int32 familyId = 1; //申请family } + + //申请成功 推送成功加入公会信息 message FamilyJoinIndicaion{ - repeated FamilyBaseInfo familyBaseInfo =1; + optional FamilyBaseInfo familyBaseInfo =1; +} + +message FamilyJoinRequest{ + optional int32 familyId = 1 ;// 要进入公会的id +} + +message FamilyJoinResponse{ + optional FamilyJoinIndicaion familyJoinIndicaion =1; } From 7863f2c3021a458c5c95de8acab01ea83e7a41b8 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 1 Aug 2019 17:56:31 +0800 Subject: [PATCH 2/2] fix family --- protos/CommonProto.proto | 7 ++- protos/Family.proto | 107 +++++++++++++++++++++++++--------- protos/MessageTypeProto.proto | 15 +---- 3 files changed, 86 insertions(+), 43 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 3fd013d..ed54178 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -487,8 +487,11 @@ option optimize_for = SPEED; optional string name = 2 ; // 公会名称 optional string annouce =3 ; // 公会宣言 optional int32 levle = 4 ; //等级 - optional int32 totalNum =5; //总共人数 - optional int32 maxNum = 6 ;// 最大人数 + optional int32 exp = 5; //公会经验 + optional int32 totalNum =6; //总共人数 + optional int32 maxNum = 7 ;// 最大人数 + optional int32 joinType = 8; //加入类型 1:直接加入 2:申请加入 3:禁止加入 + optional int32 icon = 9; // 公会图标 } //无尽副本英雄信息 diff --git a/protos/Family.proto b/protos/Family.proto index 3b85820..c4b2b1a 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -4,41 +4,90 @@ option optimize_for = SPEED; import "CommonProto.proto"; - -message FamilyCreateReqeust{ - optional string name = 1 ; //公会名称 - optional string announce =2 ; // 公会宣言 -} + message FamilyUserInfo{ + required int32 roleUid = 1; //玩家ID + required string userName = 2; //玩家名称 + required int32 userLevel = 3; //玩家等级 + required int32 position = 4; //公会职位 0:无 1:会长 2:副会长 3:长老 4:精英 5:会员 + required int32 contribute = 5; //贡献 + optional int32 seconds = 6; //距离上一次登陆时间, 0在线 , > 0 距离上次登录时间 秒 + optional int32 contributeToday = 7;//今日贡献 + optional int32 soulForce = 8; // 战斗力 + optional string head = 9; // 新头像 + optional int32 frame = 10; // 头像框 + } -message FamilySearchReqeust{ - optional string name = 1 ;// 要搜素的公会名称 -} + message FamilyLogInfo{ + required string name = 1; //玩家名称 + required string info = 2; //log内容 + required int32 time = 3; //记录时间 + } -message FamilySeachResponse{ - repeated FamilyBaseInfo familyBaseInfo =1; -} - -message FamilyApplyRequest{ - repeated int32 familyId = 1; //申请family -} + message FamilyApply{ + 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; // 灵魂力 + } + message FamilyNoticeInfo { + required string guildNotice = 1;// 公会公告 + required int32 updateTime = 2; // 修改公告时间 + repeated int32 steps = 3; // 踩公告的玩家 + repeated int32 adminres = 4; // 赞公告的玩家 + required int32 hasNew = 5; // 1：有新字 + } -//申请成功 推送成功加入公会信息 -message FamilyJoinIndicaion{ - optional FamilyBaseInfo familyBaseInfo =1; -} + message FamilyRecomandInfo{ + optional FamilyBaseInfo familyBaseInfo =1; + optional int32 isApply = 2 ;//是否申请过 0：未申请 1：已申请 + } -message FamilyJoinRequest{ - optional int32 familyId = 1 ;// 要进入公会的id -} - -message FamilyJoinResponse{ - optional FamilyJoinIndicaion familyJoinIndicaion =1; -} + message GetFamilyInfoResponse{ + optional FamilyBaseInfo familyBaseInfo =1; // 公会信息 + optional FamilyUserInfo familyUserInfo =2; // 个人信息 + } -message FamilyRecommandResponse{ - repeated FamilyBaseInfo familyBaseInfo =1; -} \ No newline at end of file + message FamilyCreateReqeust{ + optional string name = 1 ; //公会名称 + optional string announce =2 ; // 公会宣言 + } + + + message FamilySearchReqeust{ + optional string name = 1 ;// 要搜素的公会名称 + } + + message FamilySeachResponse{ + repeated FamilyRecomandInfo familyRecomandInfo =1; + } + + message FamilyApplyRequest{ + repeated int32 familyId = 1; //申请family + } + + + //申请成功 推送成功加入公会信息 + message FamilyJoinIndicaion{ + optional FamilyBaseInfo familyBaseInfo =1; + } + + message FamilyJoinRequest{ + optional int32 familyId = 1 ;// 要进入公会的id + } + + message FamilyJoinResponse{ + optional FamilyJoinIndicaion familyJoinIndicaion =1; + } + + + message FamilyRecommandResponse{ + repeated FamilyRecomandInfo familyRecomandInfo =1; + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 77455bb..9f81f9e 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -130,15 +130,6 @@ enum MessageType{ ENDLESS_MAP_HERO_INFO_REQUEST = 10410;//无尽副本英雄信息 ENDLESS_MAP_HERO_INFO_RESPONSE = 10411; - - ENDLESS_MAP_RESET_REQUEST = 10412;//无尽副本重置 - ENDLESS_MAP_RESET_RESPONSE = 10413; - - ENDLESS_MAP_TRANSFER_REQUEST = 10414;//无尽副本传送 - ENDLESS_MAP_TRANSFER_RESPONSE = 10415; - - ENDLESS_MAP_SIGN_REQUEST = 10416;//无尽副本设置标记 - ENDLESS_MAP_SIGN_RESPONSE = 10417; // F 10500 FIGHT_START_REQUEST = 10500; // FIGHT_START_RESPONSE = 10501; @@ -185,6 +176,9 @@ enum MessageType{ FAMILY_JOIN_INDICATION = 10529; //公会推送 + FAMILY_GET_INFO_REQUEST = 10530 ; // 获取公会信息 + FAMILY_GET_INFO_RESPONSE = 10531; + // G 10600 @@ -260,9 +254,6 @@ enum MessageType{ LOGIN_REQUEST = 11100; // 登陆或注册 LOGIN_RESPONSE = 11101; - - LUCKCAT_REWARD_RESPONSE = 11102;//招财猫 - // M 11200 MAP_ENTER_REQUEST = 11200; // 进入地图 MAP_ENTER_RESPONSE = 11201;