diff --git a/src/actions/StoreAction.lua b/src/actions/StoreAction.lua index 766e1ed..8c820a1 100644 --- a/src/actions/StoreAction.lua +++ b/src/actions/StoreAction.lua @@ -232,6 +232,13 @@ function _M.getFreeChestRpc(agent, data) local config = csvdb["shop_rechargeCsv"][id] if not config then return end + --判断是否是活动商品 + if config.activity_id ~= 0 then + local actCfg = csvdb["activity_ctrlCsv"][config.activity_id] + if not actCfg then return 2 end + if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end + end + local rechargeRecord = role.storeData:getProperty("payR") local getCount = (rechargeRecord[id] or 0) if getCount >= config.limit then diff --git a/src/csvdata b/src/csvdata index 516f9d3..c820a58 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 516f9d34ccb5dfc9a5fd40c251f3229e5a4651e6 +Subproject commit c820a5807bf24a342c40fcbb5def8a31899cc664 -- libgit2 0.21.2