Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

2019-08-26 13:56:20 +08:00 · 2019-08-26 13:56:20 +08:00 · ef215df187
parent 34d45d46a1 3d6d8d1b6e
commit ef215df187
3 changed files with 5 additions and 1 deletions
--- 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;//加入等級限制 
 	}
 	
 	//无尽副本英雄信息
--- 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;
 	}

 	//公会基本信息变更推送
@ -256,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;
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@ -276,7 +276,7 @@ enum MessageType{
 		
 	FAMILY_ATTACK_BLOOD_REQUEST = 10581;//查看攻击血量
 	FAMILY_ATTACK_BLOOD_RESPONSE = 10582;
-	
+
 	
 // G 10600
    GET_PLAYERINFO_REQUEST   = 10600; //