更新星降

script/excel/ssecy/item.lua

@@ -95,8 +95,8 @@
 [175]={mainType=1,subType=1,isShow=1,name=[[神庙符文]],icon=175,effects=0,order=0,rare=4,desc1=[[货币]],desc2=[[击败神庙护卫获的战利品，用于神庙商店中兑换物品]],price={},getway={},panelID=0,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},
 [176]={mainType=1,subType=1,isShow=0,name=[[复活药水]],icon=557,effects=0,order=0,rare=5,desc1=[[道具]],desc2=[[恢复生命复活英雄的神秘药剂，只能在失落神庙使用]],price={},getway={2002},panelID=2901,cond={},get={},fullCnt=0,cmd={"lostRevice"},material={},dot={},effect=0},
 [177]={mainType=1,subType=1,isShow=0,name=[[战意碎片]],icon=542,effects=0,order=9,rare=5,desc1=[[材料]],desc2=[[蕴含着微弱的战意之力，可用于升级战意技能等级]],price={},getway={},panelID=0,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},
-[178]={mainType=1,subType=0,isShow=0,name=[[生命雨露]],icon=178,effects=0,order=0,rare=5,desc1=[[材料]],desc2=[[蕴含生命起源的力量，英雄融合必需的道具]],price={},getway={},panelID=0,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},
-[179]={mainType=1,subType=0,isShow=0,name=[[加速卡]],icon=179,effects=0,order=0,rare=5,desc1=[[道具]],desc2=[[在各种加速设置中可抵消5分钟的时间消耗]],price={},getway={},panelID=0,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},
+[178]={mainType=1,subType=1,isShow=0,name=[[生命雨露]],icon=178,effects=0,order=0,rare=5,desc1=[[材料]],desc2=[[蕴含生命起源的力量，英雄融合必需的道具]],price={},getway={},panelID=0,cond={},get={},fullCnt=0,cmd={"mergeHero",1},material={},dot={},effect=0},
+[179]={mainType=1,subType=1,isShow=0,name=[[加速卡]],icon=179,effects=0,order=0,rare=5,desc1=[[道具]],desc2=[[在各种加速设置中可抵消5分钟的时间消耗]],price={},getway={},panelID=0,cond={},get={},fullCnt=0,cmd={},material={"hatchMerge",1},dot={},effect=0},
 [301]={mainType=1,subType=1,isShow=0,name=[[狂暴战意]],icon=301,effects=0,order=1,rare=5,desc1=[[道具]],desc2=[[用于激活或升级（狂暴）战意技能。狂暴：暴击率提高5%；英雄将在6星时开启战意领悟]],price={177,1000},getway={},panelID=1101,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},
 [302]={mainType=1,subType=1,isShow=0,name=[[战意战意]],icon=302,effects=0,order=1,rare=5,desc1=[[道具]],desc2=[[用于激活或升级（战意）战意技能。战意：生命值每降低1%，伤害提高0.1%；英雄将在6星时开启战意领悟]],price={177,1000},getway={},panelID=1101,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},
 [303]={mainType=1,subType=1,isShow=0,name=[[回音战意]],icon=303,effects=0,order=1,rare=5,desc1=[[道具]],desc2=[[用于激活或升级（遁走）战意技能。遁走：复活后闪避率提高5%，持续2回合；英雄将在6星时开启战意领悟]],price={177,1000},getway={},panelID=1101,cond={},get={},fullCnt=0,cmd={},material={},dot={},effect=0},

script/excel/ssecy/mergeConfig.lua

@@ -19,7 +19,7 @@
 {2,1,104002}, -- 1	铁扇公主	=	妖族	+	人族
 {2,4,104003}, -- 1	虞姬	=	妖族	+	仙族
 {2,5,105004}, -- 1	小乔	=	妖族	+	魔族
-{2,5,104002}, -- 1	铁扇公主	=	妖族	+	兽族
+{2,3,104002}, -- 1	铁扇公主	=	妖族	+	兽族
 {3,3,304001}, -- 1	猪八戒	=	兽族	+	兽族
 {3,1,304002}, -- 1	兔熙熙	=	兽族	+	人族
 {3,4,304003}, -- 1	黄忠	=	兽族	+	仙族

script/module/bag/ItemLogic.lua

@@ -334,6 +334,14 @@ function cmd.lostRevice(data, human, value)
 
    return true
 end
+
+function cmd.mergeHero(data, human, value)
+    return true
+ end
+
+ function cmd.hatchMerge(data, human, value)
+    return true
+ end
 -----------------------------------------------------------------------------
 
 -- 仅使用道具，不扣道具

script/module/role/NewLogic.lua

@@ -68,6 +68,7 @@ function NewProto(human, type, param)
         local hatchTime = human.db.mergeInfo.endTime - nowTime
 
         info.zuanshi    = doCalcNeedZuanshi(hatchTime)
+        info.isTip      = getTodayIsTip(human)
 
         msgRet.ret      = QUERY_QUICK_HATCH_ZUANSHI
         msgRet.tip      = Json.Encode(info)
@@ -115,15 +116,12 @@ function NewProto(human, type, param)
             end
 
             local sonHeroID = mergeHero(fatherHeroGrid.id, motherHeroGrid.id)
-            if sonHeroID <= 0 then
-                return
-            end
-
-            local cf                   = sonHeroID and HeroExcel.hero[sonHeroID]
-            heroSimple.name            = cf and cf.name or ""
-            if cf.grade >= 6 then 
+            local cf        = sonHeroID and HeroExcel.hero[sonHeroID]
+            heroSimple.name = cf and cf.name or ""
+            if cf.grade >= 6 then
                 heroSimple.name = "?????"
             end
+
             mergeInfo.mergeTime        = 0
             mergeInfo.xLv              = xLv
             mergeInfo.mergeItem        = mergeItem
@@ -212,11 +210,9 @@ function NewProto(human, type, param)
             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))
-
-            local cf                   = sonHeroID and HeroExcel.hero[sonHeroID]
-            heroSimple.name            = cf and cf.name or ""
-            if cf.grade >= 6 then 
+            local cf                                       = sonHeroID and HeroExcel.hero[sonHeroID]
+            heroSimple.name                                = cf and cf.name or ""
+            if cf.grade >= 6 then
                 heroSimple.name = "?????"
             end
             mergeInfo.mergeTime        = human.db.mergeInfo.hatchTime
@@ -269,12 +265,13 @@ function NewProto(human, type, param)
             mergeTime = 0
             isHatch = 3
         else
-            local cf        = sonHeroID and HeroExcel.hero[sonHeroID]
-            heroSimple.name = cf and cf.name or ""
-            if cf.grade >= 6 then 
-                heroSimple.name = "?????"
-            end
-            isHatch         = 1
+            isHatch = 1
+        end
+
+        local cf        = sonHeroID and HeroExcel.hero[sonHeroID]
+        heroSimple.name = cf and cf.name or ""
+        if cf.grade >= 6 then
+            heroSimple.name = "?????"
         end
 
         mergeInfo.mergeTime        = mergeTime
@@ -306,20 +303,19 @@ function NewProto(human, type, param)
         if hatchTime <= 0 then
             -- 孵化成功
             hatchTime = 0
-            isHatch = 3
             heroIndex = hatchHero(human)
             local heroGrid = human.db.heroBag[heroIndex]
             if not heroGrid then return end
             heroSimple.general = heroSimple.general or {}
-            HeroGrid.makeHeroSimple(heroSimple, heroGrid, nil, human)
+            HeroGrid.makeHeroSimple(heroSimple, heroGrid, heroIndex, human)
         else
             local cf        = sonHeroID and HeroExcel.hero[sonHeroID]
             heroSimple.name = cf and cf.name or ""
-            if cf.grade >= 6 then 
+            if cf.grade >= 6 then
                 heroSimple.name = "?????"
             end
-            isHatch         = 1
-            msgTyep         = QUERY_MERGE_INFO_TYPE
+            isHatch = 1
+            msgTyep = QUERY_MERGE_INFO_TYPE
         end
 
         mergeInfo.mergeTime        = hatchTime
@@ -425,8 +421,15 @@ function NewProto(human, type, param)
                 isHatch = 3
             end
 
-            local mergeInfo            = {}
-            local heroSimple           = {}
+            local mergeInfo  = {}
+            local heroSimple = {}
+            local sonHeroID  = human.db.mergeInfo.heroInfo.heroID or 0
+            local cf         = sonHeroID and HeroExcel.hero[sonHeroID]
+            heroSimple.name  = cf and cf.name or ""
+            if cf.grade >= 6 then
+                heroSimple.name = "?????"
+            end
+
             mergeInfo.mergeTime        = hatchTime
             mergeInfo.heroData         = heroSimple
             mergeInfo.xLv              = human.db.mergeInfo.heroInfo.xLv
@@ -468,6 +471,8 @@ function hatchHero(human)
     human.db.mergeInfo.heroInfo.motherHeroBagIndex = 0
     human.db.mergeInfo.heroInfo.heroAttrs          = attrs
 
+    Log.write(Log.LOGID_TEST, "孵化重置 mergeInfo: " .. Json.Encode(human.db.mergeInfo))
+
     return heroIndex
 end