wasteland / server

Commit aef8ca8713c78ce33f512bbc24e513c460c51266

Authored by zhouhaihai
1 parent 6a89ff20

两个bug

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/actions/HeroAction.lua
  Show/Hide comments   View file @aef8ca8
... ... @@ -836,9 +836,11 @@ function _M.drawHeroRpc(agent, data)
836 836 role:updateProperty({field = "floorHero", value = floorHero})
837 837 end
838 838  
839   - local repayHero = role:getProperty("repayHero")
840   - repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType])
841   - role:updateProperty({field = "repayHero", value = repayHero})
  839 + if pool == 1 then
  840 + local repayHero = role:getProperty("repayHero")
  841 + repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType])
  842 + role:updateProperty({field = "repayHero", value = repayHero})
  843 + end
842 844  
843 845 role:checkTaskEnter("DrawHero", {pool = pool, count = drawCount[drawType]})
844 846 if ssrCount > 0 then
... ...
src/adv/AdvBlock.lua
  Show/Hide comments   View file @aef8ca8
... ... @@ -109,7 +109,7 @@ function Block:randomEvent()
109 109 local getId = pool[idx][1]
110 110 local getData = csvdb["event_trader_goodsCsv"][getId]
111 111 if getData.restrict ~= 0 then
112   - curHad[curId] = (curHad[curId] or 0) + 1
  112 + curHad[getId] = (curHad[getId] or 0) + 1
113 113 end
114 114 if getData.discount ~= "" and needDiscount > 0 then
115 115 needDiscount = needDiscount - 1
... ...