更新2

script/module/role/NewLogic.lua

@@ -130,12 +130,14 @@ function NewProto(human, type, param)
             -- end
 
             -- 记录融合英雄
-            human.db.mergeInfo.heroId         = sonHeroID
-            human.db.mergeInfo.xLv            = xLv
-            human.db.mergeInfo.heroAttrs      = attrs
+            human.db.mergeInfo.heroInfo.heroID         = sonHeroID
+            human.db.mergeInfo.heroInfo.xLv            = xLv
+            human.db.mergeInfo.heroInfo.heroAttrs      = attrs
             human.db.mergeInfo.mergeStartTime = os.time()
             human.db.mergeInfo.mergeEndTime   = os.time() + getHatchTime(xLv)
             human.db.mergeInfo.mergeTime      = getHatchTime(xLv)
+            human.db.mergeInfo.heroInfo.fatherHeroBagIndex      = fatherHeroBagIndex
+            human.db.mergeInfo.heroInfo.motherHeroBagIndex      = motherHeroBagIndex
 
             Log.write(Log.LOGID_TEST, "human.db.mergeInfo : " .. Json.Encode(human.db.mergeInfo))
 
@@ -276,6 +278,8 @@ function hatchHero(human)
     human.db.mergeInfo.heroInfo           = {}
     human.db.mergeInfo.heroInfo.heroID    = 0
     human.db.mergeInfo.heroInfo.xLv       = 0
+    human.db.mergeInfo.fatherHeroBagIndex      = 0
+    human.db.mergeInfo.motherHeroBagIndex      = 0
     human.db.mergeInfo.heroInfo.heroAttrs = RoleDefine.PANEL_ATTR_KEY
     human.db.heroBag                      = human.db.heroBag or {}
 
@@ -302,6 +306,8 @@ function initMergeInfo(human)
     human.db.mergeInfo.heroInfo = human.db.mergeInfo.heroInfo or {}
     human.db.mergeInfo.heroInfo.heroID = human.db.mergeInfo.heroInfo.heroID or 0
     human.db.mergeInfo.heroInfo.xLv = human.db.mergeInfo.heroInfo.xLv or 0
+    human.db.mergeInfo.heroInfo.fatherHeroBagIndex = human.db.mergeInfo.heroInfo.fatherHeroBagIndex or 0
+    human.db.mergeInfo.heroInfo.motherHeroBagIndex = human.db.mergeInfo.heroInfo.motherHeroBagIndex or 0
     human.db.mergeInfo.heroInfo.heroAttrs = human.db.mergeInfo.heroInfo.heroAttrs or RoleDefine.PANEL_ATTR_KEY
 end