更新2

script/module/hero/HeroLogic.lua

@@ -66,6 +66,7 @@ local ExclusiveTaskLogic     = require("absAct.ExclusiveTaskLogic")
 local BingshuLogic           = require("fuwen.BingshuLogic")
 local YunYingLogic           = require("yunying.YunYingLogic")
 local BingshuLogic           = require("fuwen.BingshuLogic")
+local Json = require("common.Json")
 
 HERO_MAX_STAR                = 15 -- 目前英雄最大星级
 
@@ -179,6 +180,8 @@ function doCalcHero(grid, attrs)
         RoleAttr.updateValue(v[1], v[2], attrs)
     end
 
+    Log.write(Log.LOGID_TEST, "添加融合英雄属性 HERO_BASE_ATTRS : " .. Json.Encode(HERO_BASE_ATTRS))
+
     lvAdd(grid.lv, attrConfig.up, attrs)
     starAdd(grid.star, attrConfig.atkStarRate, attrConfig.hpStarRate, attrs)
     qualityAdd(heroConfig, grid.quality, attrs)
@@ -416,6 +419,8 @@ function addHero(human, id, star, cnt, logType, noSend)
 
         xLv = human.db.mergeInfo.heroInfo.xLv
         heroAttrs = human.db.mergeInfo.heroInfo.heroAttrs
+
+        Log.write(Log.LOGID_TEST, "添加融合英雄属性 heroAttrs : " .. Json.Encode(heroAttrs))
     end
 
     -- 某些英雄自动分解

script/module/role/NewLogic.lua

@@ -14,6 +14,7 @@ local HeroExcel = require("excel.hero")
 local RoleDefine = require("role.RoleDefine")
 local ObjHuman = require("core.ObjHuman")
 local HeroGrid = require("hero.HeroGrid")
+local Json = require("common.Json")
 
 AD_DRAW_REWARD_TYPE = 10          --观看广告领取召唤券
 QUERY_MERGE_INFO_TYPE = 11        --获取融合信息
@@ -29,6 +30,8 @@ function NewProto(human, type, param)
     -- msgRet.tip = "test data"
     -- Msg.send(msgRet,human.fd)
 
+    local msgRet = Msg.gc.GC_ROLE_CHANGE_BASEINFO
+
     -- 观看广告获取召唤券
     if type == AD_DRAW_REWARD_TYPE then
         human.db.adRewardCnt = human.db.adRewardCnt or 0
@@ -41,15 +44,17 @@ function NewProto(human, type, param)
         --增加今日观看次数
         human.db.adRewardCnt = (human.db.adRewardCnt or 0) + 1
 
+        Log.write(Log.LOGID_TEST, "adRewardCnt: " .. human.db.adRewardCnt)
+
         -- 添加高级召唤卷
         BagLogic.addItem(human, 118, 1, "draw_ad_reward")
 
-        local msgRet = Msg.gc.GC_ROLE_CHANGE_BASEINFO
-        msgRet.ret   = AD_DRAW_REWARD_TYPE
-        msgRet.tip   = Lang.AD_DRAW_REWARD_SUCCESS
+        msgRet.ret = AD_DRAW_REWARD_TYPE
+        msgRet.tip = Lang.AD_DRAW_REWARD_SUCCESS
         Msg.send(msgRet, human.fd)
 
         Broadcast.sendErr(human, Lang.AD_DRAW_REWARD_SUCCESS)
+        return
     end
 
     -- 开始融合
@@ -69,12 +74,12 @@ function NewProto(human, type, param)
                 "开始融合 fatherHeroBagIndex: " .. fatherHeroBagIndex .. "motherHeroBagIndex: " .. motherHeroBagIndex)
 
             local fatherHeroGrid = human.db.heroBag[fatherHeroBagIndex]
-            if not heroGrid then
+            if not fatherHeroGrid then
                 return
             end
 
             local motherHeroGrid = human.db.heroBag[motherHeroBagIndex]
-            if not heroGrid then
+            if not motherHeroGrid then
                 return
             end
 
@@ -144,9 +149,8 @@ function NewProto(human, type, param)
 
             Broadcast.sendErr(human, Lang.MERGE_SUCCESS)
 
-            local msgRet = Msg.gc.GC_ROLE_CHANGE_BASEINFO
-            msgRet.ret   = MERGE_HERO_TYPE
-            msgRet.tip   = Json.Encode(mergeInfo)
+            msgRet.ret = MERGE_HERO_TYPE
+            msgRet.tip = Json.Encode(mergeInfo)
             Msg.send(msgRet, human.fd)
         end
         return
@@ -165,12 +169,12 @@ function NewProto(human, type, param)
             local motherHeroBagIndex = tonumber(tb[2]) or 0
 
             local fatherHeroGrid     = human.db.heroBag[fatherHeroBagIndex]
-            if not heroGrid then
+            if not fatherHeroGrid then
                 return
             end
 
             local motherHeroGrid = human.db.heroBag[motherHeroBagIndex]
-            if not heroGrid then
+            if not motherHeroGrid then
                 return
             end
 
@@ -206,9 +210,8 @@ function NewProto(human, type, param)
 
             Log.write(Log.LOGID_TEST, "mergeInfo: " .. Json.Encode(mergeInfo))
 
-            local msgRet = Msg.gc.QUERY_MERGE_BEFORE_INFO_TYPE
-            msgRet.ret   = QUERY_MERGE_INFO_TYPE
-            msgRet.tip   = Json.Encode(mergeInfo)
+            msgRet.ret = QUERY_MERGE_BEFORE_INFO_TYPE
+            msgRet.tip = Json.Encode(mergeInfo)
             Msg.send(msgRet, human.fd)
         end
         return
@@ -251,7 +254,7 @@ function NewProto(human, type, param)
 
         if heroIndex ~= 0 then
             local heroGrid = human.db.heroBag[heroIndex]
-            if type(heroGrid) ~= "table" then return end
+            if not heroGrid then return end
             heroSimple.general = heroSimple.general or {}
             HeroGrid.makeHeroSimple(heroSimple, heroGrid, nil, human)
         else
@@ -266,9 +269,8 @@ function NewProto(human, type, param)
         mergeInfo.isHatch   = isHatch
         Log.write(Log.LOGID_TEST, "mergeInfo: " .. Json.Encode(mergeInfo))
 
-        local msgRet = Msg.gc.GC_ROLE_CHANGE_BASEINFO
-        msgRet.ret   = QUERY_MERGE_INFO_TYPE
-        msgRet.tip   = Json.Encode(mergeInfo)
+        msgRet.ret = QUERY_MERGE_INFO_TYPE
+        msgRet.tip = Json.Encode(mergeInfo)
         Msg.send(msgRet, human.fd)
         return
     end
@@ -345,7 +347,6 @@ function NewProto(human, type, param)
 
             local mergeInfo     = {}
             local heroSimple    = {}
-            local msgRet        = Msg.gc.GC_ROLE_CHANGE_BASEINFO
             mergeInfo.mergeTime = hatchTime
             mergeInfo.heroData  = heroSimple
             mergeInfo.xLv       = human.db.mergeInfo.heroInfo.xLv
@@ -426,7 +427,9 @@ end
 
 -- 获取xlv
 function getxLv(fatherHeroGrid, motherHeroGrid)
-    local params1 = math.max(fatherHeroGrid.xLv, motherHeroGrid.xLv)
+    local fatherHeroXLv = fatherHeroGrid.xLv or 0
+    local motherHeroXLv = motherHeroGrid.xLv or 0
+    local params1 = math.max(fatherHeroXLv, motherHeroXLv)
     local params2 = math.floor((fatherHeroGrid.lv + motherHeroGrid.lv) / 200) + 1
 
     return params1 + params2

script/module/role/RoleAttr.lua

@@ -37,6 +37,8 @@ local ItemDefine = require("bag.ItemDefine")
 local EquipLogic = require("equip.EquipLogic")
 local CombatPosLogic = require("combat.CombatPosLogic")
 local CombatDefine = require("combat.CombatDefine")
+local Json = require("common.Json")
+local Log                    = require("common.Log")
 
 -- 计算人数属性
 function doCalc(human)
@@ -131,6 +133,8 @@ function calcHeroGrid(heroGrid, index, human,heroAttrs)
         for key, value in pairs(heroAttrs) do
             HERO_BASE_ATTRS[key] = value
         end
+
+        Log.write(Log.LOGID_TEST, "添加融合英雄属性 HERO_BASE_ATTRS : " .. Json.Encode(HERO_BASE_ATTRS))
     else
         --默认
         HERO_BASE_ATTRS[RoleDefine.INIT_MP] = 50