From e85055d67acc8ece08fd533fd7d8635793d157cf Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 16 Aug 2023 11:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E3=80=81=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E6=A1=86=E9=81=93=E5=85=B7=E8=A7=A3=E9=94=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/item/item_const.lua | 2 ++ lua/app/userdata/player/player_data.lua | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index e809c7df..bdb09876 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -26,6 +26,8 @@ ItemConst.ITEM_TYPE = { WEIGHT_FRAGMENT = 6, RANDOM_BOX_ITEM = 7, FIXED_BOX_ITEM = 8, + AVATAR = 9, + FRAME = 10, EPIC_HERO_FRAMENT = 11, SKIN = 12 } diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 37450f1a..c79671b0 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -390,7 +390,7 @@ function PlayerData:getCanUnlockAvatarIds(checkData) if type(checkData) == "table" then -- 判断items解锁 for index, reward in ipairs(checkData) do - if reward.type == GConst.REWARD_TYPE.ITEM then + if reward.type == GConst.REWARD_TYPE.ITEM and ConfigManager:getConfig("item")[reward.item.id].type == GConst.ItemConst.ITEM_TYPE.AVATAR then for id, data in pairs(ConfigManager:getConfig("avatar")) do if not self:isAvatarUnlock(id) and data.item == reward.item.id then table.insert(ids, id) @@ -540,7 +540,7 @@ function PlayerData:getCanUnlockFrameIds(checkData) if type(checkData) == "table" then -- 判断items解锁 for index, reward in ipairs(checkData) do - if reward.type == GConst.REWARD_TYPE.ITEM then + if reward.type == GConst.REWARD_TYPE.ITEM and ConfigManager:getConfig("item")[reward.item.id].type == GConst.ItemConst.ITEM_TYPE.FRAME then for id, data in pairs(ConfigManager:getConfig("avatar_frame")) do if not self:isFrameUnlock(id) and data.item == reward.item.id then table.insert(ids, id)