Merge branch 'bugfix' into tr/publish

熊润斐
2 parents cd183b39 c8c76cda
Showing 2 changed files with 4 additions and 2 deletions Show diff stats
src/actions/HeroAction.lua
src/actions/RoleAction.lua
@@ -996,7 +996,7 @@ function _M.drawHeroRpc(agent, data)
 			local even = repayHeroMaxCount % 2
 			local id = 0
 			if even == 1 then
-				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
 			else
 				local giftHeroSet = {}
 				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
@@ -1009,7 +1009,7 @@ function _M.drawHeroRpc(agent, data)
 				end
 			end
 			if id == 0 then
-				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
 			end
  
 			local r,change = {}
@@ -607,6 +607,8 @@ function _M.openTimeBoxRpc(agent, data)
 			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
 			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
+		else
+			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
 		end
 		role:pushCancel({type = "box", slot = slot})