精灵碎片相关

script/module/bag/Grid.lua

@@ -361,7 +361,8 @@ function makeItemSuipian(net, itemConfig)
 	if itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN and
 		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_SKIN and
 		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM and
-		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC then
+		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC and
+		itemConfig.subType ~= ItemDefine.ITEM_SUBTYPE_SUIPIAN_ELF then
 		return
 	end
 
@@ -390,7 +391,9 @@ function makeItemSuipian(net, itemConfig)
 				end
 			end
 		end
-	elseif itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM or itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC then
+	elseif itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM or
+			itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC or 
+			itemConfig.subType == ItemDefine.ITEM_SUBTYPE_SUIPIAN_ELF then
 		net.suipian[1].camp = 0
 		net.suipian[1].star = 0
 		net.suipian[1].grade = itemConfig.rare or 0

script/module/bag/ItemDefine.lua

@@ -41,6 +41,8 @@ ITEM_SUBTYPE_TALISMAM = 4 			-- 秘宝
 ITEM_SUBTYPE_SUIPIAN_TALISMAM = 5 	-- 秘宝碎片
 ITEM_SUBTYPE_RELIC=6                -- 遗物
 ITEM_SUBTYPE_SUIPIAN_RELIC =7       -- 遗物碎片
+ITEM_SUBTYPE_ELF = 8	 			-- 精灵
+ITEM_SUBTYPE_SUIPIAN_ELF = 9        -- 精灵碎片
 
 -- 道具可操作类型
 ITEM_OP_USE = 1 				-- 使用

script/module/bag/SuipianLogic.lua

@@ -25,13 +25,15 @@ SUMMON_SUBTYPE_EQUIP = 2 -- 装备
 SUMMON_SUBTYPE_SKIN = 3  -- 皮肤
 SUMMON_SUBTYPE_TALISAM = 4 --秘宝
 SUMMON_SUBTYPE_RELIC = 5  --遗物
-SUMMON_SUBTYPE_MAX = 5
+SUMMON_SUBTYPE_ELF = 6  -- 精灵
+
+SUMMON_SUBTYPE_MAX = 6
 
 SUMMON_HECHENG_TYPE_GOOD = 11 --可合成物品
 
 function SuipianLogic_CanHeCheng(nID)
 	if nID == SUMMON_SUBTYPE_HERO or nID == SUMMON_SUBTYPE_SKIN  or SUMMON_SUBTYPE_TALISAM == nID 
-		or SUMMON_SUBTYPE_RELIC == nID then
+		or SUMMON_SUBTYPE_RELIC == nID or SUMMON_SUBTYPE_ELF == nID then
 			return true
 	end
 	
@@ -865,13 +867,16 @@ end
 
 
 function CG_SUIPIAN_SYNTHESIS(human, synthesisType)
-	if not synthesisType or synthesisType < SUMMON_SUBTYPE_HERO  or synthesisType > SUMMON_SUBTYPE_RELIC then
+	if not synthesisType or synthesisType < SUMMON_SUBTYPE_HERO  or synthesisType > SUMMON_SUBTYPE_ELF then
 		print("[CG_SUIPIAN_SYNTHESIS] 合成类型错误 synthesisType = "..synthesisType)
 		return
 	end
 
 	--目前只有三种碎片能合成
-	if synthesisType ~= SUMMON_SUBTYPE_HERO and  synthesisType ~= SUMMON_SUBTYPE_TALISAM and synthesisType ~= SUMMON_SUBTYPE_RELIC then
+	if synthesisType ~= SUMMON_SUBTYPE_HERO and 
+		synthesisType ~= SUMMON_SUBTYPE_TALISAM and
+		synthesisType ~= SUMMON_SUBTYPE_RELIC and 
+		synthesisType ~= SUMMON_SUBTYPE_ELF then
 		print("[CG_SUIPIAN_SYNTHESIS] 合成类型错误 synthesisType = "..synthesisType)
 		return
 	end
@@ -905,6 +910,8 @@ function CG_SUIPIAN_SYNTHESIS(human, synthesisType)
 		targetSubType = ItemDefine.ITEM_SUBTYPE_SUIPIAN_TALISMAM
 	elseif synthesisType == SUMMON_SUBTYPE_RELIC then
 		targetSubType = ItemDefine.ITEM_SUBTYPE_SUIPIAN_RELIC
+	elseif synthesisType == SUMMON_SUBTYPE_ELF then
+		targetSubType = ItemDefine.ITEM_SUBTYPE_SUIPIAN_ELF
 	end
 
 	for itemID,itemCnt in pairs(human.db.bag) do