Commit feb7d32280c91ea2214b3f87ff4bfc5cdcfe6feb
Merge branch 'develop' into tr/qa
Showing
3 changed files
with
3 additions
and
2 deletions
Show diff stats
src/GlobalVar.lua
| @@ -69,6 +69,7 @@ ItemType = { | @@ -69,6 +69,7 @@ ItemType = { | ||
| 69 | FuncOpen = 15, -- 管理功能开放 | 69 | FuncOpen = 15, -- 管理功能开放 |
| 70 | SpeedBox = 16, -- 加速箱子 | 70 | SpeedBox = 16, -- 加速箱子 |
| 71 | SelectItemBox = 17, -- 自选箱子 | 71 | SelectItemBox = 17, -- 自选箱子 |
| 72 | + CommonPaster = 18, -- 万能贴纸 | ||
| 72 | } | 73 | } |
| 73 | 74 | ||
| 74 | --在这个里面的会记录的是功能开放 对应类型open 而不是 ID | 75 | --在这个里面的会记录的是功能开放 对应类型open 而不是 ID |
src/actions/RoleAction.lua
| @@ -1236,7 +1236,7 @@ function _M.useSelectItemRpc(agent, data) | @@ -1236,7 +1236,7 @@ function _M.useSelectItemRpc(agent, data) | ||
| 1236 | local count = msg.count | 1236 | local count = msg.count |
| 1237 | if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end | 1237 | if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end |
| 1238 | local itemData = csvdb["itemCsv"][itemId] | 1238 | local itemData = csvdb["itemCsv"][itemId] |
| 1239 | - if itemData.type ~= ItemType.SelectItemBox then return end | 1239 | + if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end |
| 1240 | local itemMap = itemData.use_effect:toNumMap() | 1240 | local itemMap = itemData.use_effect:toNumMap() |
| 1241 | local reward, change = {} | 1241 | local reward, change = {} |
| 1242 | for k, v in pairs(itemMap) do | 1242 | for k, v in pairs(itemMap) do |