Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol

protos/CommonProto.proto

@@ -779,4 +779,11 @@ option optimize_for = SPEED;
 		optional int32 state = 3;//1已领取 0未领取
 		optional int32 totleAmt = 4;//当前累计金额
 	}
+	
+	message CarGrapRecordItem{
+		optional int32 time =1;
+		optional int32 uid =2;
+		optional string content = 3;
+		
+	}
 	

protos/Family.proto

@@ -392,7 +392,7 @@ import "CommonProto.proto";
 		optional int32 score = 5;
 		optional int32 hadChallenge =6; // 是否已挑战过，1：表示挑战过，2：未挑战过。
 		optional int32 rank = 7;
-		optional TeamOneInfo teamInfo = 8;
+		repeated TeamSimpleInfo teamInfo = 8;
 	}
 	
 	message GetCarChallenegListResponse{
@@ -444,5 +444,9 @@ import "CommonProto.proto";
 		optional Drop drop = 3;
 		optional int32 historyMax = 4;//历史最高伤害
 	}
+	
+	message CarGrapRecordResponse{
+		repeated CarGrapRecordItem carChallengeItem =1;
+	}
 
 

protos/FightInfoProto.proto

@@ -225,6 +225,7 @@ import "CommonProto.proto";
 	message FastFightChallengeResponse{
 		optional int32 score =  1; //获取积分信息
 		optional int32 hurt = 2 ;// 伤害值
+		optional FightData fightData = 3;
 	}
 
 

protos/HeroInfoProto.proto

@@ -200,3 +200,16 @@ import "CommonProto.proto";
 		optional Drop drop = 2;//合成的装备
 	}
 	
+	
+	message ComplexJewelEquipRequest{
+		optional int32 type = 1;//宝器类型 灵宝、魂宝
+		optional int32 rance = 2;//宝器属性  
+		optional int32 targetleve = 3;//目标品质 0一键合成
+		optional int32 num = 4;//合成数量 
+	}
+	
+	message ComplexJewelEquipResponse{
+		repeated string equipIds =1;//消耗的装备
+		optional Drop drop = 2;//合成的装备
+	}
+	

protos/MessageTypeProto.proto

@@ -465,6 +465,10 @@ enum MessageType{
 	
 	GET_CAR_CHALLENEG_LIST_REQUEST = 16672 ;// 获取车迟匹配信息
 	GET_CAR_CHALLENEG_LIST_RESPONSE = 16673;
+	
+	GET_CAR_GRAP_RECORD_REQUEST = 16674; //获取车迟抢夺记录
+	GET_CAR_GRAP_RECORD_RESPONSE = 16675;
+	
 // H 10700
     HERO_RAND_REQQUEST = 10701;
     HERO_RAND_RESPONSE = 10702;
@@ -896,6 +900,7 @@ enum MessageType{
 	
 	//30000以后 新增协议号使用协议名定义 协议号自动映射
 	
+	//30000-3300 公会
 	FamilyFeteRequest = 30001;//祭祀
 	FamilyFeteResponse = 30002;//祭祀
 	
@@ -903,4 +908,11 @@ enum MessageType{
 	FamilyGetFeteRewardResponse = 30004;//
 	
 	FamilyFeteRewardProcessIndication = 30005 ; // 更新公会进度
+	
+	
+	
+	//30301-30330 宝物合成
+	
+	ComplexJewelEquipRequest = 30301; // 宝物合成
+	ComplexJewelEquipResponse = 30302; 
 }