From 064138fee2a7b7a1e3dd2f36336ab9ba06640c48 Mon Sep 17 00:00:00 2001 From: liguanghui Date: Thu, 25 Mar 2021 19:16:30 +0800 Subject: [PATCH] 定制礼包相关bug修复 --- src/models/RolePlugin.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index 672301e..7d18321 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -2035,7 +2035,6 @@ function RolePlugin.bind(Role) if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then return "" end - -- 检查礼包自选奖励合法 if choose and choose ~= "" then if rechargeData.itemgift == "" then return "" end @@ -2043,10 +2042,10 @@ function RolePlugin.bind(Role) local set = choose:toTableArray(true) if slot ~= #set then return "" end local pass = {} - local groups = rechargeData.itemdirect:toTableArray(true) - for _, item in ipairs(set) do + local groups = rechargeData.itemgift:toTableArray(true) + for idx, item in ipairs(set) do for _, group in ipairs(groups) do - if group[2] == item[1] and group[3] == item[2] then + if group[2] == item[1] and group[3] == item[2] and idx == group[1] then pass[group[1]] = 1 break end @@ -2054,7 +2053,6 @@ function RolePlugin.bind(Role) end if #pass ~= slot then return "" end end - --判断是否是活动商品 if rechargeData.activity_id ~= 0 then local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id] @@ -2242,7 +2240,7 @@ function RolePlugin.bind(Role) for itemId, value in pairs(tReward) do reward[itemId] = (reward[itemId] or 0) + value end - for itemId, value in pairs(tChange) do + for itemId, value in pairs(tChange or {}) do reward[itemId] = (reward[itemId] or 0) + value end end -- libgit2 0.21.2