wasteland / server

Commit 1085e95a164ef426db108a522cc285de236d1a7e

Authored by 熊润斐
2 parents cd183b39 c8c76cda

Merge branch 'bugfix' into tr/publish

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/actions/HeroAction.lua
  Show/Hide comments   View file @1085e95
@@ -996,7 +996,7 @@ function _M.drawHeroRpc(agent, data) @@ -996,7 +996,7 @@ function _M.drawHeroRpc(agent, data)
996 local even = repayHeroMaxCount % 2 996 local even = repayHeroMaxCount % 2
997 local id = 0 997 local id = 0
998 if even == 1 then 998 if even == 1 then
999 - id = math.randWeight(csvdb["build_giftCsv"], "pool_1") 999 + id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
1000 else 1000 else
1001 local giftHeroSet = {} 1001 local giftHeroSet = {}
1002 for gid, cfg in pairs(csvdb["build_giftCsv"]) do 1002 for gid, cfg in pairs(csvdb["build_giftCsv"]) do
@@ -1009,7 +1009,7 @@ function _M.drawHeroRpc(agent, data) @@ -1009,7 +1009,7 @@ function _M.drawHeroRpc(agent, data)
1009 end 1009 end
1010 end 1010 end
1011 if id == 0 then 1011 if id == 0 then
1012 - id = math.randWeight(csvdb["build_giftCsv"], "pool_1") 1012 + id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
1013 end 1013 end
1014 1014
1015 local r,change = {} 1015 local r,change = {}
src/actions/RoleAction.lua
  Show/Hide comments   View file @1085e95
@@ -607,6 +607,8 @@ function _M.openTimeBoxRpc(agent, data) @@ -607,6 +607,8 @@ function _M.openTimeBoxRpc(agent, data)
607 local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2] 607 local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
608 if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end 608 if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
609 role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}}) 609 role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
  610 + else
  611 + stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
610 end 612 end
611 role:pushCancel({type = "box", slot = slot}) 613 role:pushCancel({type = "box", slot = slot})
612 614