From 7ce5e055765833b95c2361b2ce2c3209d371c444 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 27 Aug 2019 13:20:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + protos/Family.proto | 5 +++++ protos/MessageTypeProto.proto | 3 +++ 3 files changed, 9 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index bcb9e27..1f581e5 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -502,6 +502,7 @@ option optimize_for = SPEED; optional int32 icon = 9; // 公会图标 optional int32 levelTime=10; //解散公会开始时间 optional FamilyContribute fightResult = 11;//公会战战绩 + optional int32 playerIntoLevel = 12;//加入等級限制 } //无尽副本英雄信息 diff --git a/protos/Family.proto b/protos/Family.proto index faa31b0..b358325 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -295,3 +295,8 @@ import "CommonProto.proto"; message GetAttackHeroBloodResponse{ repeated HeroBloodInfo blood = 1; } + //设置入会等级、是否开启入会 + message FamilySetIntoLevel{ + optional int32 verify = 1;//0表示不开启验证；1表示开启 + optional int32 level = 2; + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index ae52325..361ce74 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -277,6 +277,9 @@ enum MessageType{ FAMILY_ATTACK_BLOOD_REQUEST = 10581;//查看攻击血量 FAMILY_ATTACK_BLOOD_RESPONSE = 10582; + FAMILY_SET_INTO_LEVEL_REQUEST = 10583;//设置入会等级 + FAMILY_SET_INTO_LEVEL_RESPONSE = 10584; + // G 10600 GET_PLAYERINFO_REQUEST = 10600; // From 886a049ec855895d79d466eff2ad555af01b6183 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 27 Aug 2019 13:39:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 6 +----- protos/MessageTypeProto.proto | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/protos/Family.proto b/protos/Family.proto index b358325..d848c80 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -188,6 +188,7 @@ import "CommonProto.proto"; message FamilyChangeJoinTypeRequest{ optional int32 type =1; // //加入类型 1:直接加入 2:申请加入 3:禁止加入 + optional int32 intoLevel = 2; } //公会基本信息变更推送 @@ -295,8 +296,3 @@ import "CommonProto.proto"; message GetAttackHeroBloodResponse{ repeated HeroBloodInfo blood = 1; } - //设置入会等级、是否开启入会 - message FamilySetIntoLevel{ - optional int32 verify = 1;//0表示不开启验证；1表示开启 - optional int32 level = 2; - } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 361ce74..6749fdd 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -276,10 +276,7 @@ enum MessageType{ FAMILY_ATTACK_BLOOD_REQUEST = 10581;//查看攻击血量 FAMILY_ATTACK_BLOOD_RESPONSE = 10582; - - FAMILY_SET_INTO_LEVEL_REQUEST = 10583;//设置入会等级 - FAMILY_SET_INTO_LEVEL_RESPONSE = 10584; - + // G 10600 GET_PLAYERINFO_REQUEST = 10600; // From 3d6d8d1b6e2a9df012dd1f5a3780bef9ff268165 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 27 Aug 2019 12:52:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=98=E6=96=97=E5=9B=9E=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index d848c80..b16f06d 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -257,7 +257,9 @@ import "CommonProto.proto"; //进攻用户的Id optional int32 result = 1; optional int32 starCount = 2; + optional FightData data =3; } + message PersonalFightResult{ optional int32 rank = 1; optional int32 uid = 2;