From 752b0970b5633b043c53ef8da1982b828b3ae8a4 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Sat, 9 May 2020 05:28:26 +0800
Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1006175=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E6=96=B0=E6=88=98=E6=96=97=E7=89=88=E6=9C=AC=E3=80=91=E5=AE=9D?=
 =?UTF-8?q?=E7=89=A9=E5=90=88=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/HeroInfoProto.proto    | 13 +++++++++++++
 protos/MessageTypeProto.proto |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto
index b8ba634..71abbc6 100644
--- a/protos/HeroInfoProto.proto
+++ b/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;//合成的装备
+	}
+	
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 202f31c..e0cbbfd 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -896,6 +896,7 @@ enum MessageType{
 	
 	//30000以后 新增协议号使用协议名定义 协议号自动映射
 	
+	//30000-3300 公会
 	FamilyFeteRequest = 30001;//祭祀
 	FamilyFeteResponse = 30002;//祭祀
 	
@@ -903,4 +904,11 @@ enum MessageType{
 	FamilyGetFeteRewardResponse = 30004;//
 	
 	FamilyFeteRewardProcessIndication = 30005 ; // 更新公会进度
+	
+	
+	
+	//30301-30330 宝物合成
+	
+	ComplexJewelEquipRequest = 30301; // 宝物合成
+	ComplexJewelEquipResponse = 30302; 
 }