Merge branch 'taptap' into player

zhouhaihai
2 parents 733419d0 cb8d5cf0
Showing 2 changed files with 24 additions and 16 deletions Show diff stats
src/actions/HeroAction.lua
src/models/RolePlugin.lua
@@ -846,8 +846,8 @@ function _M.drawHeroRpc(agent, data)
 		local isNewerSSR = btype == 4 and (newerHadSSR == 0 and newerDrawCount >= globalCsv.draw_newer[1]) or false
 		local ssrUp = 0
-		if draw_ssr_up_count_rate then
-			ssrUp = math.min(math.floor(ssrUpCount / draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2], draw_ssr_up_count_rate[3]) / 100
+		if draw_ssr_up_count_rate and ssrUpCount > draw_ssr_up_count_rate[1] then
+			ssrUp = math.min((ssrUpCount - draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2], draw_ssr_up_count_rate[3]) / 100
 		end
 		while not next(resultPool) do
 			if isNewerSSR then
@@ -862,7 +862,7 @@ function _M.drawHeroRpc(agent, data)
 		end
 		-- 引导必送 613 丝路德
-		local itemId = guide and 613 or math.randWeight(resultPool, 1)
+		local itemId = (guide and drawType == 1) and 613 or math.randWeight(resultPool, 1)
 		local itemData = csvdb["itemCsv"][itemId]
 		if itemData.quality == 4 then
 			ssrCount = ssrCount + 1
@@ -67,9 +67,16 @@ function RolePlugin.bind(Role)
 		local itemTypeAward = {
 			[ItemType.Hero] = function()
 				pms.type = itemId - ItemStartId.Hero
-				for _= 1, count do
-					self:addHero(pms)
+				local status = self:addHero(pms)
+				local gcount = 1
+				if not status then
+					gcount = 0
+				end
+				if count - gcount > 0 then
+					local heroData = csvdb["unitCsv"][pms.type]
+					change[pms.type] = (change[pms.type] or 0) + (count - gcount) * globalCsv.draw_unit_tofragment[heroData.rare]
 				end
+				count = gcount
 			end,
 			[ItemType.EquipBase] = function()
 				local typ = math.floor((itemId-7000)/100)
@@ -105,7 +112,7 @@ function RolePlugin.bind(Role)
 			end
 		end
-		return count, change --  count 刷新实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
+		return count, change --  count 实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
 	end
@@ -122,17 +129,18 @@ function RolePlugin.bind(Role)
 		end
 		local reward, allChange = {}, {}
-		for itemId, count in pairs(tgift) do
-			local count, change = _award(self, itemId, count, params)
+		for itemId, rcount in pairs(tgift) do
+			local count, change = _award(self, itemId, rcount, params)
+			if count > 0 then
+				reward[itemId] = (reward[itemId] or 0) + count
+			end
 			if next(change) then
-				local cr, cc = self:award(change, params) -- 内部转换忽略
-				for _id, _ct in pairs(cr) do
-					reward[_id] = (reward[_id] or 0) + _ct
-				end
-				table.insert(allChange, {form = {[itemId] = count}, to = cr})
-			else
-				if count > 0 then
-					reward[itemId] = (reward[itemId] or 0) + count
+				local cr, _ = self:award(change, params) -- 内部转换忽略 防止死循环
+				if next(cr) then
+					for _id, _ct in pairs(cr) do
+						reward[_id] = (reward[_id] or 0) + _ct
+					end
+					table.insert(allChange, {form = {[itemId] = rcount - count}, to = cr})
 				end
 			end
 		end