soul merge response

protos/HeroInfoProto.proto

@@ -93,6 +93,10 @@ import "CommonProto.proto";
 		repeated int32 soulId =2;  //消耗的魂印
 	}
 	
+	message MergeSoulResponse{
+		optional Drop drop = 1; //合成物
+	}
+	
 	message OptHeroSoul{
 		optional string heroId =1 ; //所穿英雄id
 		repeated SoulEquipPos soulEquipIds =2 ; //装备id

protos/MessageTypeProto.proto

@@ -849,4 +849,8 @@ enum MessageType{
 	MONTHCARD_TAKE_DAILY_REQUEST =20101;
 	MONTHCARD_TAKE_DAILY_RESPONSE =20102;
 	MONTHCARD_INDICATION =20103;
+	
+//20111 - 20200 装备、
+	EQUIP_COMPLEX_REQUEST = 20111;//合成装备
+	EQUIP_COMPLEX_RESPONSE = 20112;
 }