遗物背包合成

script/module/bag/Grid.lua

@@ -267,7 +267,8 @@ function makeItemSuipian(net, itemConfig)
 	end
 	if itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN and
 		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_SKIN and
-		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM then
+		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM and
+		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC then
 		return
 	end
 
@@ -296,7 +297,7 @@ function makeItemSuipian(net, itemConfig)
 				end
 			end
 		end
-	elseif itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM then
+	elseif itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM or itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC then
 		net.suipian[1].camp = 0
 		net.suipian[1].star = 0
 		net.suipian[1].grade = itemConfig.rare or 0
@@ -484,6 +485,9 @@ function canHeCheng(itemConfig)
 		if suipianType == SuipianLogic.SUMMON_SUBTYPE_TALISAM then
 			return true
 		end
+		if suipianType == SuipianLogic.SUMMON_SUBTYPE_RELIC then
+			return true
+		end
 	end
 
     if ItemDefine.isFuwen(itemConfig.id) then

script/module/bag/ItemDefine.lua

@@ -34,6 +34,8 @@ ITEM_SUBTYPE_SUIPIAN = 2 			-- 普通碎片
 ITEM_SUBTYPE_SUIPIAN_SKIN = 3 		-- 皮肤碎片
 ITEM_SUBTYPE_TALISMAM = 4 			-- 秘宝
 ITEM_SUBTYPE_SUIPIAN_TALISMAM = 5 	-- 秘宝碎片
+ITEM_SUBTYPE_RELIC=6                -- 遗物
+ITEM_SUBTYPE_SUIPIAN_RELIC =7       -- 遗物碎片
 
 -- 道具可操作类型
 ITEM_OP_USE = 1 				-- 使用

script/module/bag/SuipianLogic.lua

@@ -23,6 +23,7 @@ SUMMON_SUBTYPE_HERO = 1 -- 英雄
 SUMMON_SUBTYPE_EQUIP = 2 -- 装备
 SUMMON_SUBTYPE_SKIN = 3  -- 皮肤
 SUMMON_SUBTYPE_TALISAM = 4 --秘宝
+SUMMON_SUBTYPE_RELIC = 5  --遗物
 
 -- 查询
 function query(human, itemID)
@@ -67,7 +68,8 @@ function summon(human, itemID, itemUseCnt)
 	if itemConfig.get[2] ~= SUMMON_SUBTYPE_HERO 
 	and itemConfig.get[2] ~= SUMMON_SUBTYPE_EQUIP
 	and itemConfig.get[2] ~= SUMMON_SUBTYPE_SKIN
-	and itemConfig.get[2] ~= SUMMON_SUBTYPE_TALISAM then
+	and itemConfig.get[2] ~= SUMMON_SUBTYPE_TALISAM 
+	and itemConfig.get[2] ~= SUMMON_SUBTYPE_RELIC then
 		return
 	end
 	
@@ -850,13 +852,13 @@ end
 
 
 function CG_SUIPIAN_SYNTHESIS(human, synthesisType)
-	if not synthesisType or synthesisType < SUMMON_SUBTYPE_HERO  or synthesisType > SUMMON_SUBTYPE_TALISAM then
+	if not synthesisType or synthesisType < SUMMON_SUBTYPE_HERO  or synthesisType > SUMMON_SUBTYPE_RELIC then
 		print("[CG_SUIPIAN_SYNTHESIS] 合成类型错误 synthesisType = "..synthesisType)
 		return
 	end
 
-	--目前只有两种碎片能合成
-	if synthesisType ~= SUMMON_SUBTYPE_HERO and  synthesisType ~= SUMMON_SUBTYPE_TALISAM then
+	--目前只有三种碎片能合成
+	if synthesisType ~= SUMMON_SUBTYPE_HERO and  synthesisType ~= SUMMON_SUBTYPE_TALISAM and synthesisType ~= SUMMON_SUBTYPE_RELIC then
 		print("[CG_SUIPIAN_SYNTHESIS] 合成类型错误 synthesisType = "..synthesisType)
 		return
 	end
@@ -888,6 +890,8 @@ function CG_SUIPIAN_SYNTHESIS(human, synthesisType)
 		targetSubType = ItemDefine.ITEM_SUBTYPE_SUIPIAN
 	elseif synthesisType == SUMMON_SUBTYPE_TALISAM then
 		targetSubType = ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM
+	elseif synthesisType == SUMMON_SUBTYPE_RELIC then
+		targetSubType = ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC
 	end
 
 	for itemID,itemCnt in pairs(human.db.bag) do