Commit d4876585e82ce25251213bf19828572115556c78
1 parent
94f99134
神稀活动普通关卡扫荡不给三星奖励,添加充值价格系数
Showing
2 changed files
with
10 additions
and
7 deletions
Show diff stats
src/actions/ActivityAction.lua
@@ -630,12 +630,15 @@ function _M.startBattleRpc(agent, data) | @@ -630,12 +630,15 @@ function _M.startBattleRpc(agent, data) | ||
630 | local bi = actData[id] | 630 | local bi = actData[id] |
631 | local star = bi["star"] or 0 | 631 | local star = bi["star"] or 0 |
632 | local award = battleCfg.item_clear:toNumMap() | 632 | local award = battleCfg.item_clear:toNumMap() |
633 | - if getStarCount(battleCfg, star) == 3 then | ||
634 | - local aw = battleCfg.perfect_reward:toNumMap() | ||
635 | - for k, v in pairs(aw) do | ||
636 | - award[k] = (award[k] or 0) + v | ||
637 | - end | ||
638 | - end | 633 | + |
634 | + if battleCfg.rank ~= 0 then | ||
635 | + if getStarCount(battleCfg, star) == 3 then | ||
636 | + local aw = battleCfg.perfect_reward:toNumMap() | ||
637 | + for k, v in pairs(aw) do | ||
638 | + award[k] = (award[k] or 0) + v | ||
639 | + end | ||
640 | + end | ||
641 | + end | ||
639 | for k, v in pairs(award) do | 642 | for k, v in pairs(award) do |
640 | award[k] = v * count | 643 | award[k] = v * count |
641 | end | 644 | end |
src/models/RolePlugin.lua
@@ -2342,7 +2342,7 @@ function RolePlugin.bind(Role) | @@ -2342,7 +2342,7 @@ function RolePlugin.bind(Role) | ||
2342 | end | 2342 | end |
2343 | local rechargeId = back | 2343 | local rechargeId = back |
2344 | local rechargeData = csvdb["shop_rechargeCsv"][rechargeId] | 2344 | local rechargeData = csvdb["shop_rechargeCsv"][rechargeId] |
2345 | - if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then | 2345 | + if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and ((rechargeData.rmb * 100) / globalCsv.QArecharge) ~= tonumber(params.amount)) then |
2346 | skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s, rmb %s, get %s", | 2346 | skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s, rmb %s, get %s", |
2347 | params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount | 2347 | params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount |
2348 | )) | 2348 | )) |