diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua index 5eac34be06..1acdcaa6d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroSkinManager.lua @@ -74,7 +74,7 @@ function this.CaculateSkinProVal(_heroId) local heroSkinAllHeroProVal = {} local heroData = HeroManager.GetSingleHeroData(_heroId) if heroData.skinId ~= 0 then - if this.skinDatas[heroData.skinId].MonomerProperty and #this.skinDatas[heroData.skinId].MonomerProperty > 0 then + if this.skinDatas[heroData.skinId] and this.skinDatas[heroData.skinId].MonomerProperty and #this.skinDatas[heroData.skinId].MonomerProperty > 0 then for _,v in ipairs(this.skinDatas[heroData.skinId].MonomerProperty) do if not heroSkinSingleProVal[v[1]] then heroSkinSingleProVal[v[1]] = 0 @@ -88,7 +88,7 @@ function this.CaculateSkinProVal(_heroId) end for _,v in pairs(this.skinDatas) do if heroData.skinId ~= v.id then - if this.skinDatas[v.id].UnlockProperty and #this.skinDatas[v.id].UnlockProperty > 0 then + if this.skinDatas[v.id] and this.skinDatas[v.id].UnlockProperty and #this.skinDatas[v.id].UnlockProperty > 0 then for _,n in ipairs(this.skinDatas[v.id].UnlockProperty) do if not heroSkinAllHeroProVal[n[1]] then heroSkinAllHeroProVal[n[1]] = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 142e77218f..bfd7ce429c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -75,8 +75,8 @@ function RewardItemSingleShowPopup:BindEvent() elseif itemConfigData.ItemType == ItemType.ChangeName then UIManager.OpenPanel(UIName.CreateNamePopup) elseif itemConfigData.ItemType == ItemType.Skin then - local group = ConfigManager.GetConfigData(ConfigName.RewardGroup,itemConfig[itemSid].ResolveReward).ShowItem - MsgPanel.ShowTwo(string.format("分解后可获得%s个%s,是否继续分解",group[2],itemConfig[group[1]].Name),function() + local group = ConfigManager.GetConfigData(ConfigName.RewardGroup,tonumber(itemConfig[itemSid].ResolveReward)).ShowItem + MsgPanel.ShowTwo(string.format("分解后可获得%s%s,是否继续分解",group[1][2],itemConfig[group[1][1]].Name),function() end, function() local curResolveAllItemList = {} table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1})