Commit cd183b3964da6a7e667d9d69da4ad2dd04327d5d
Merge branch 'bugfix' into tr/publish
Showing
2 changed files
with
5 additions
and
2 deletions
Show diff stats
src/actions/HeroAction.lua
| @@ -724,6 +724,9 @@ function _M.drawHeroRpc(agent, data) | @@ -724,6 +724,9 @@ function _M.drawHeroRpc(agent, data) | ||
| 724 | subType = 1 | 724 | subType = 1 |
| 725 | if btype == 4 and role:getProperty("newerDraw") >= 10 then | 725 | if btype == 4 and role:getProperty("newerDraw") >= 10 then |
| 726 | subType = 2 | 726 | subType = 2 |
| 727 | + if(role:getProperty("newerDraw") >= 30) then | ||
| 728 | + return 30 | ||
| 729 | + end | ||
| 727 | end | 730 | end |
| 728 | end | 731 | end |
| 729 | 732 | ||
| @@ -761,7 +764,7 @@ function _M.drawHeroRpc(agent, data) | @@ -761,7 +764,7 @@ function _M.drawHeroRpc(agent, data) | ||
| 761 | local drawCount = {1, 10} -- 抽取次数 | 764 | local drawCount = {1, 10} -- 抽取次数 |
| 762 | if not drawCount[drawType] then return 3 end | 765 | if not drawCount[drawType] then return 3 end |
| 763 | 766 | ||
| 764 | - local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] | 767 | + local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] or 10 |
| 765 | local floorHeroCount = role:getProperty("floorHero")[btype] or 0 | 768 | local floorHeroCount = role:getProperty("floorHero")[btype] or 0 |
| 766 | 769 | ||
| 767 | -- 计算抽卡消耗品 | 770 | -- 计算抽卡消耗品 |