From 3a952c67533f32c5d49e3432c31457a97c7f641d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 15 Nov 2022 15:57:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=9F=B9=E5=85=BB=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 2 +- .../~Lua/Modules/Bag/BagManager.lua | 13 +++++++++++++ .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 11 ++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 936293e3e6..b7c9a84ab8 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -616,7 +616,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot -- horizonta = starGrid:AddComponent(typeof(UnityEngine.UI.HorizontalLayoutGroup)) -- horizonta.childAlignment = "LowerLeft" -- end - LogError("star====="..star) + --LogError("star====="..star) if star>11 then type=3 end diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 980f92e092..2fb836ab94 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -363,6 +363,19 @@ function this.GetItemDataByItemType(_itemType) return items end +--通过物品类型获得物品list +function this.GetItemDataByTimeIsGold(_id) + --LogError("_itemType ".._itemType) + + for i, v in pairs(this.bagDatas) do + if v.itemConfig.ItemType == ItemType.TimeIsGold and v.num > 0 and v.itemConfig.UseGain and v.itemConfig.UseGain[1][1]==_id then + return v + end + end + return nil +end + + --通过物品类型获得物品list function this.GetDataByItemType(_itemType) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 585c416d8c..de7e7dd741 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -974,8 +974,17 @@ function RoleInfoLayout:ShowCostNotEnoughTip() else PopupTipPanel.ShowTip(BagManager.GetItemNameById(costId).."不足无法升级") end + + local item=BagManager.GetItemDataByTimeIsGold(costId) + if item then + UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4,item) + else + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,costId) + end + local _itemData = BagManager.bagDatas[itemSid] + --if costId==4 then - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,costId) + --end end