diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua index 6b1b4b9..f6938ea 100644 --- a/src/actions/ActivityAction.lua +++ b/src/actions/ActivityAction.lua @@ -630,12 +630,15 @@ function _M.startBattleRpc(agent, data) local bi = actData[id] local star = bi["star"] or 0 local award = battleCfg.item_clear:toNumMap() - if getStarCount(battleCfg, star) == 3 then - local aw = battleCfg.perfect_reward:toNumMap() - for k, v in pairs(aw) do - award[k] = (award[k] or 0) + v - end - end + + if battleCfg.rank ~= 0 then + if getStarCount(battleCfg, star) == 3 then + local aw = battleCfg.perfect_reward:toNumMap() + for k, v in pairs(aw) do + award[k] = (award[k] or 0) + v + end + end + end for k, v in pairs(award) do award[k] = v * count end diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index 167b40f..e9c8f71 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -2342,7 +2342,7 @@ function RolePlugin.bind(Role) end local rechargeId = back local rechargeData = csvdb["shop_rechargeCsv"][rechargeId] - if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then + 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 skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s, rmb %s, get %s", params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount )) -- libgit2 0.21.2