Commit af1ad896539f9119af0e3630e460eeae1a76ed6f
Merge branch 'tr/bugfix' into tr/publish/release
# Conflicts: # src/csvdata
Showing
2 changed files
with
11 additions
and
1 deletions
Show diff stats
src/actions/ActivityAction.lua
| @@ -568,7 +568,10 @@ function _M.endBattleRpc(agent, data) | @@ -568,7 +568,10 @@ function _M.endBattleRpc(agent, data) | ||
| 568 | local isWin = msg.isWin | 568 | local isWin = msg.isWin |
| 569 | local heros = msg.heros | 569 | local heros = msg.heros |
| 570 | local support = msg.support | 570 | local support = msg.support |
| 571 | - if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end | 571 | + if not role.activity:isOpenById(actid, "ChallengeLevel") then |
| 572 | + SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({})) | ||
| 573 | + return true | ||
| 574 | + end | ||
| 572 | 575 | ||
| 573 | if not role.__actBattleCache then return 2 end | 576 | if not role.__actBattleCache then return 2 end |
| 574 | 577 |
src/actions/StoreAction.lua
| @@ -232,6 +232,13 @@ function _M.getFreeChestRpc(agent, data) | @@ -232,6 +232,13 @@ function _M.getFreeChestRpc(agent, data) | ||
| 232 | local config = csvdb["shop_rechargeCsv"][id] | 232 | local config = csvdb["shop_rechargeCsv"][id] |
| 233 | if not config then return end | 233 | if not config then return end |
| 234 | 234 | ||
| 235 | + --判断是否是活动商品 | ||
| 236 | + if config.activity_id ~= 0 then | ||
| 237 | + local actCfg = csvdb["activity_ctrlCsv"][config.activity_id] | ||
| 238 | + if not actCfg then return 2 end | ||
| 239 | + if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end | ||
| 240 | + end | ||
| 241 | + | ||
| 235 | local rechargeRecord = role.storeData:getProperty("payR") | 242 | local rechargeRecord = role.storeData:getProperty("payR") |
| 236 | local getCount = (rechargeRecord[id] or 0) | 243 | local getCount = (rechargeRecord[id] or 0) |
| 237 | if getCount >= config.limit then | 244 | if getCount >= config.limit then |