From aef8ca8713c78ce33f512bbc24e513c460c51266 Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Thu, 27 Feb 2020 15:34:02 +0800 Subject: [PATCH] 两个bug --- src/actions/HeroAction.lua | 8 +++++--- src/adv/AdvBlock.lua | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua index 6b000cf..5e153a9 100644 --- a/src/actions/HeroAction.lua +++ b/src/actions/HeroAction.lua @@ -836,9 +836,11 @@ function _M.drawHeroRpc(agent, data) role:updateProperty({field = "floorHero", value = floorHero}) end - local repayHero = role:getProperty("repayHero") - repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType]) - role:updateProperty({field = "repayHero", value = repayHero}) + if pool == 1 then + local repayHero = role:getProperty("repayHero") + repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType]) + role:updateProperty({field = "repayHero", value = repayHero}) + end role:checkTaskEnter("DrawHero", {pool = pool, count = drawCount[drawType]}) if ssrCount > 0 then diff --git a/src/adv/AdvBlock.lua b/src/adv/AdvBlock.lua index e6884ea..428db9b 100644 --- a/src/adv/AdvBlock.lua +++ b/src/adv/AdvBlock.lua @@ -109,7 +109,7 @@ function Block:randomEvent() local getId = pool[idx][1] local getData = csvdb["event_trader_goodsCsv"][getId] if getData.restrict ~= 0 then - curHad[curId] = (curHad[curId] or 0) + 1 + curHad[getId] = (curHad[getId] or 0) + 1 end if getData.discount ~= "" and needDiscount > 0 then needDiscount = needDiscount - 1 -- libgit2 0.21.2