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

zhouhaihai
2 parents 6b5c9206 5d620aef
Showing 1 changed file with 15 additions and 5 deletions Show diff stats
src/actions/RoleAction.lua
@@ -481,16 +481,26 @@ function _M.openTimeBoxRpc(agent, data)
 		-- 随机奖励
 		local randomGift = randomData.random_gift
 		local randomNum = randomData.random_num
-		if boxL[slot].gem ~= 0 then
-			randomNum = randomData[boxL[slot].gem .. "_gem_num"]
-			randomGift = randomData[boxL[slot].gem .. "_gem_gift"]
-		end
+		local gemId = boxL[slot].gem
 		if randomNum > 0 and randomGift and randomGift ~= "" then
+			local selectGift = {}
 			local pool = {}
 			for _, temp in ipairs(randomGift:toArray()) do
-				table.insert(pool, temp:toArray(true, "="))
+				local set = temp:toArray(true, "=")
+				if gemId == set[1] then
+					table.insert(selectGift, set)
+				else
+					table.insert(pool, set)
+				end
+			end
+
+			if gemId ~= 0 and next(selectGift) then
+				randomNum = randomNum - 1
+				local idx = math.randWeight(pool, 3)
+				reward[pool[idx][1]] = (reward[pool[idx][1]] or 0) + pool[idx][2]
 			end
+
 			local needCount = math.min(#pool, randomNum)
 			for j = 1, needCount do
 				local idx = math.randWeight(pool, 3)