Merge branch 'dh_dev_sevenworld' into master_test_gn

# Conflicts:
#	protos/PlayerInfoProto.proto

protos/CommonProto.proto

@@ -1070,4 +1070,10 @@ option optimize_for = SPEED;
 		optional int32 treeLevel = 8;//神树等级
 		optional int32 fourTotal = 9;//四灵总层数
 	}
+
+	// 七界试炼，遗物信息
+	message Relic{
+		optional int32 id = 1;//遗物id
+		optional int32 status = 2;//遗物状态，0：未激活，1：已激活
+	}
 	

protos/MessageTypeProto.proto

@@ -1286,7 +1286,7 @@ enum MessageType{
 	qiMenDunJiaHitListResponse = 3040113;
 
 	
-// 乾坤宝盒-许愿魂印
+	// 乾坤宝盒-许愿魂印
 	beautyBagCardIndication = 3040126;
 
 	beautyBagWishEquipRequest = 3040127;
@@ -1294,6 +1294,21 @@ enum MessageType{
 	beautyBagWishEquipResponse = 3040128;
 
 
+	// 七界试炼协议
+	// 七界，界面信息
+	SevenWorldInfoRequest = 3050001;
+	SevenWorldInfoResponse = 3050002;
+	SevenWorldInfoIndication = 3050003;
+
+	// 七界，获取遗物信息
+	SevenWorldRelicRequest = 3050004;
+	SevenWorldRelicResponse = 3050005;
+
+	// 七界，挑战
+	SevenWorldChallengeRequest = 3050010;
+	SevenWorldChallengeResponse = 3050011;
+
+
 
 	
 	//800000起为global 协议

protos/PlayerInfoProto.proto

@@ -970,23 +970,23 @@ import "CommonProto.proto";
 		optional int32 isCross = 1;// 0：否，1：是
 	}
 	
-    message CheckBuyGoodsRequest{
-        optional int32 goodsId = 1;
-        }
-    message CheckBuyGoodsResponse{
-        optional string orderId = 1;
+	message CheckBuyGoodsRequest{
+		optional int32 goodsId = 1;
+	}
+	message CheckBuyGoodsResponse{
+		optional string orderId = 1;
 	}
 	message XunBaoMiZongEnterRequest{
-    }
-    message XunBaoMiZongEnterResponse{
-        optional bool isEnter = 1;
+	}
+	message XunBaoMiZongEnterResponse{
+		optional bool isEnter = 1;
 	}
 	//太初密卷
 	message TaiChuSecretvolumeRequest{
-    }
+	}
 	message TaiChuSecretvolumeResponse{
 	    repeated taiChuSecretvolume secretvolume = 1;
-    }
+	}
 	//玉虚论道获取编队信息
 	message GetPlayerCrossYxldOneTeamInfoRequest{
 		optional int32 playerId = 1;
@@ -995,5 +995,38 @@ import "CommonProto.proto";
 	message GetPlayerCrossYxldOneTeamInfoResponse{
 		optional TeamOneInfo teamInfo = 1;
 	}
-	
+
+	// 七界试炼
+	message SevenWorldInfoRequest{
+		optional int32 tierId = 1;//层数id
+	}
+
+	message SevenWorldInfoResponse{
+		optional int32 id = 1; //层数id
+		optional int32 ranking = 2; //排名
+		optional int32 integral = 3; //积分
+		optional int32 totalTier = 4; //总层数
+	}
+
+	message SevenWorldRelicRequest{
+		optional int32 relicId = 1;//遗物id
+	}
+
+	message SevenWorldRelicResponse{
+		repeated Relic info = 1;//遗物信息，只有已解锁的
+	}
+
+	message SevenWorldChallengeRequest{
+		optional int32 tierId = 1;// 层数id
+		optional int32 privilageTypeId = 2;//特权id
+	}
+
+	message SevenWorldChallengeResponse{
+		optional int32 result = 1;//战斗结果
+		optional FightData fightData = 2;// 战斗数据
+		optional Drop drop = 3;// 获得道具
+		repeated int32 teamBuffIds = 4;//队伍加成id列表
+		repeated int32 relicIds = 5;//遗物加成id列表
+		optional int32 round = 6;//回合数，计算加成
+	}