Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

测试
2 parents f3eb34b1 16f5fa68
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)
 	local btype = msg.pool	-- 1 2 3	卡池类型
 	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
 	local drawType = msg.type -- 1 单抽 2 十连
-	local guide = msg.guide -- 是否是引导抽的
 	if btype ~= 1 then
 		subType = 1
 	end
@@ -804,6 +803,11 @@ function _M.drawHeroRpc(agent, data)
 	role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+	local guideHero
+	if role:checkOverGuide(11,1) and not role:checkOverGuide(12) then
+		guideHero = 613
+	end
+
 	local ssrCount = 0
 	local reward = {}
 	for i = 1, drawCount[drawType] do
@@ -816,8 +820,12 @@ function _M.drawHeroRpc(agent, data)
 			return
 		end
-		-- 引导必送 613 丝路德
-		local itemId = guide and 613 or math.randWeight(resultPool, 1)
+		local itemId = math.randWeight(resultPool, 1)
+		if guideHero then
+			itemId = guideHero
+			guideHero = nil
+		end
+
 		local itemData = csvdb["itemCsv"][itemId]
 		if itemData.quality == HeroQuality.SSR then
 			ssrCount = ssrCount + 1