Commit 14ca75553b43b302dd1b336d2e094d9f4b9becae
Merge branch 'bugfix' into tr/qa
* bugfix: bug 取消抽卡保底的保底次数默认值，因为有些卡池不需要保底
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
src/actions/HangAction.lua
| @@ -562,7 +562,7 @@ function _M.startBonusBattleRpc(agent, data) | @@ -562,7 +562,7 @@ function _M.startBonusBattleRpc(agent, data) | ||
| 562 | if not bonusData then return 3 end | 562 | if not bonusData then return 3 end |
| 563 | local bonusStar = role:getProperty("bonusStar") | 563 | local bonusStar = role:getProperty("bonusStar") |
| 564 | 564 | ||
| 565 | - if not bonusStar[bonusData.unlock] or bonusStar[bonusData.unlock] == 0 then return 4 end | 565 | + if bonusData.unlock ~= 0 and (not bonusStar[bonusData.unlock] or bonusStar[bonusData.unlock] == 0) then return 4 end |
| 566 | 566 | ||
| 567 | if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then | 567 | if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then |
| 568 | local bonusC = role.dailyData:getProperty("bonusC") | 568 | local bonusC = role.dailyData:getProperty("bonusC") |
src/actions/HeroAction.lua
| @@ -764,7 +764,7 @@ function _M.drawHeroRpc(agent, data) | @@ -764,7 +764,7 @@ function _M.drawHeroRpc(agent, data) | ||
| 764 | local drawCount = {1, 10} -- 抽取次数 | 764 | local drawCount = {1, 10} -- 抽取次数 |
| 765 | if not drawCount[drawType] then return 3 end | 765 | if not drawCount[drawType] then return 3 end |
| 766 | 766 | ||
| 767 | - local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] or 10 | 767 | + local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] |
| 768 | local floorHeroCount = role:getProperty("floorHero")[btype] or 0 | 768 | local floorHeroCount = role:getProperty("floorHero")[btype] or 0 |
| 769 | 769 | ||
| 770 | -- 计算抽卡消耗品 | 770 | -- 计算抽卡消耗品 |