|
|
@@ -177,9 +177,21 @@ function NewProto(human, type, param)
|
|
|
local mergeInfo = {}
|
|
|
local heroSimple = {}
|
|
|
local xLv = getxLv(fatherHeroGrid, motherHeroGrid)
|
|
|
+ local cnt = math.floor(xLv / 2) + 1
|
|
|
local isHatch = 2
|
|
|
+ local mergeItem = {}
|
|
|
+ local itemId = 178
|
|
|
+
|
|
|
+ for k = 1, 1 do
|
|
|
+ mergeItem[k] = mergeItem[k] or {}
|
|
|
+ mergeItem[k].getway = mergeItem[k].getway or {}
|
|
|
+ mergeItem[k].suipian = mergeItem[k].suipian or {}
|
|
|
+ mergeItem[k].equip = mergeItem[k].equip or {}
|
|
|
+ mergeItem[k].fuwen = mergeItem[k].fuwen or {}
|
|
|
+ Grid.makeItem(mergeItem[k], itemId, cnt)
|
|
|
+ end
|
|
|
|
|
|
- local sonHeroID = mergeHero(fatherHeroGrid.id, motherHeroGrid.id)
|
|
|
+ local sonHeroID = mergeHero(fatherHeroGrid.id, motherHeroGrid.id)
|
|
|
if sonHeroID <= 0 then
|
|
|
return
|
|
|
end
|
|
|
@@ -188,6 +200,7 @@ function NewProto(human, type, param)
|
|
|
heroSimple.name = cf and cf.name or ""
|
|
|
mergeInfo.mergeTime = 0
|
|
|
mergeInfo.xLv = xLv
|
|
|
+ mergeInfo.mergeItem = mergeItem
|
|
|
mergeInfo.heroData = heroSimple
|
|
|
mergeInfo.isHatch = isHatch
|
|
|
|