Merge branch 'develop' into tr/qa

熊润斐
2 parents 2bbbb010 804a7eaf
Showing 3 changed files with 3 additions and 2 deletions Show diff stats
src/GlobalVar.lua
src/actions/RoleAction.lua
src/csvdata
@@ -69,6 +69,7 @@ ItemType = {
 	FuncOpen					= 15, 	-- 管理功能开放
 	SpeedBox					= 16, 	-- 加速箱子
 	SelectItemBox				= 17, 	-- 自选箱子
+	CommonPaster				= 18, 	-- 万能贴纸
 }
  
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -1236,7 +1236,7 @@ function _M.useSelectItemRpc(agent, data)
 	local count = msg.count
 	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 	local itemData = csvdb["itemCsv"][itemId]
-	if itemData.type ~= ItemType.SelectItemBox then return end
+	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
 	local itemMap = itemData.use_effect:toNumMap()
 	local reward, change = {}
 	for k, v in pairs(itemMap) do
-Subproject commit 4a72b95ffb82eab671c6414aefa23b2e4718646c
+Subproject commit d2c3deaddd4952cd4b05306144cbcdfa09734cd3