Commit 66e6dc76a6c7e5d3f69ec8b1d2c52ab29295096a
1 parent
54bd82e3
fix: 月卡过期,特刊道具使用应该被拦截
Showing
2 changed files
with
4 additions
and
2 deletions
 
Show diff stats
src/actions/RoleAction.lua
| @@ -1768,6 +1768,8 @@ function _M.itemConvertSpecialRpc(agent, data) | @@ -1768,6 +1768,8 @@ function _M.itemConvertSpecialRpc(agent, data) | ||
| 1768 | local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id) | 1768 | local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id) | 
| 1769 | if tmpreward then | 1769 | if tmpreward then | 
| 1770 | table.rewardMerge(reward, tmpreward) | 1770 | table.rewardMerge(reward, tmpreward) | 
| 1771 | + else | ||
| 1772 | + return 6 | ||
| 1771 | end | 1773 | end | 
| 1772 | end | 1774 | end | 
| 1773 | 1775 | 
src/models/Store.lua
| @@ -378,7 +378,7 @@ function Store:buySMonthCard(id) | @@ -378,7 +378,7 @@ function Store:buySMonthCard(id) | ||
| 378 | --续刊 | 378 | --续刊 | 
| 379 | local card = csvdb["shop_cardCsv"][id] or {} | 379 | local card = csvdb["shop_cardCsv"][id] or {} | 
| 380 | if card["buyLimit"] and card["buyLimit"] ~= "" then | 380 | if card["buyLimit"] and card["buyLimit"] ~= "" then | 
| 381 | - if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then | 381 | + if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then | 
| 382 | skynet.error("不满足购买条件") | 382 | skynet.error("不满足购买条件") | 
| 383 | return false | 383 | return false | 
| 384 | end | 384 | end | 
| @@ -399,7 +399,7 @@ function Store:buySMonthCard(id) | @@ -399,7 +399,7 @@ function Store:buySMonthCard(id) | ||
| 399 | --增刊 | 399 | --增刊 | 
| 400 | local card = csvdb["shop_cardCsv"][id] or {} | 400 | local card = csvdb["shop_cardCsv"][id] or {} | 
| 401 | if card["buyLimit"] and card["buyLimit"] ~= "" then | 401 | if card["buyLimit"] and card["buyLimit"] ~= "" then | 
| 402 | - if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then | 402 | + if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then | 
| 403 | skynet.error("不满足增刊条件") | 403 | skynet.error("不满足增刊条件") | 
| 404 | return false | 404 | return false | 
| 405 | end | 405 | end |