Commit 16f5fa6861c4e45dd8dfca9faebdcdade9018a9d

Authored by chenyueqi
1 parent 78ab75e4

引导招募的引导改动被回退

Showing 1 changed file with 11 additions and 3 deletions   Show diff stats
src/actions/HeroAction.lua
@@ -698,7 +698,6 @@ function _M.drawHeroRpc(agent, data) @@ -698,7 +698,6 @@ function _M.drawHeroRpc(agent, data)
698 local btype = msg.pool -- 1 2 3 卡池类型 698 local btype = msg.pool -- 1 2 3 卡池类型
699 local subType = msg.subType or 1-- 定向卡池需要传 子类型 699 local subType = msg.subType or 1-- 定向卡池需要传 子类型
700 local drawType = msg.type -- 1 单抽 2 十连 700 local drawType = msg.type -- 1 单抽 2 十连
701 - local guide = msg.guide -- 是否是引导抽的  
702 if btype ~= 1 then 701 if btype ~= 1 then
703 subType = 1 702 subType = 1
704 end 703 end
@@ -804,6 +803,11 @@ function _M.drawHeroRpc(agent, data) @@ -804,6 +803,11 @@ function _M.drawHeroRpc(agent, data)
804 803
805 role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}}) 804 role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
806 805
  806 + local guideHero
  807 + if role:checkOverGuide(11,1) and not role:checkOverGuide(12) then
  808 + guideHero = 613
  809 + end
  810 +
807 local ssrCount = 0 811 local ssrCount = 0
808 local reward = {} 812 local reward = {}
809 for i = 1, drawCount[drawType] do 813 for i = 1, drawCount[drawType] do
@@ -816,8 +820,12 @@ function _M.drawHeroRpc(agent, data) @@ -816,8 +820,12 @@ function _M.drawHeroRpc(agent, data)
816 return 820 return
817 end 821 end
818 822
819 - -- 引导必送 613 丝路德  
820 - local itemId = guide and 613 or math.randWeight(resultPool, 1) 823 + local itemId = math.randWeight(resultPool, 1)
  824 + if guideHero then
  825 + itemId = guideHero
  826 + guideHero = nil
  827 + end
  828 +
821 local itemData = csvdb["itemCsv"][itemId] 829 local itemData = csvdb["itemCsv"][itemId]
822 if itemData.quality == HeroQuality.SSR then 830 if itemData.quality == HeroQuality.SSR then
823 ssrCount = ssrCount + 1 831 ssrCount = ssrCount + 1