diff --git a/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab b/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab index 4b10332c5..399620c7a 100644 --- a/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab +++ b/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab @@ -12363,7 +12363,7 @@ MonoBehaviour: rubberScale: 1 threshold: 100 lowGrid: 0 - m_Cell: {fileID: 3661587436044585841} + m_Cell: {fileID: 70813078944487029, guid: 1cc947df2fbf59e4a8faf1ac2ace0239, type: 3} m_Content: {fileID: 1561997325118980469} m_Horizontal: 0 m_Vertical: 1 diff --git a/Assets/Lua/UI/UIChat/UIChatView.lua b/Assets/Lua/UI/UIChat/UIChatView.lua index 753cd4d8c..a1078e568 100644 --- a/Assets/Lua/UI/UIChat/UIChatView.lua +++ b/Assets/Lua/UI/UIChat/UIChatView.lua @@ -1,5 +1,6 @@ local UIChatView = require("UIChat/UIChatView_Generate") local UIChatRoot = require("UIChat/UIChatRoot") +local IconItemCtr = require("Common/IconItemCtr") local regexPattern = "%[e%d+%]" local emojiFormat = "[e%s]" @@ -246,17 +247,24 @@ function UIChatView:InitGiftWindow() CommonUtil.LoopGridViewEleCreateNoItem( self, self.chatLayer2.giftWindow.loopVerticalScrollRect, gifts, 0, self, function (owner, go, idx, logicData) - local iconPath = logicData['Icon'] - local name = logicData['Name'] + -- local iconPath = logicData['Icon'] + -- local name = logicData['Name'] + -- local id = logicData['Id'] + -- local uiTrigger = go:GetComponent(Enum.TypeInfo.UIEventTriggerListener) + -- uiTrigger.onClick = function() self:OnSendItem(id) end + -- local iconImage = go.transform:Find("Icon"):GetComponent(Enum.TypeInfo.Image) + -- local title = go.transform:Find("Info/Title"):GetComponent(Enum.TypeInfo.TextMeshProUGUI) + -- title.text = name + -- CommonUtil.LoadIcon(self, iconPath, function(sprite) + -- iconImage.sprite = sprite + -- end) + local id = logicData['Id'] - local uiTrigger = go:GetComponent(Enum.TypeInfo.UIEventTriggerListener) - uiTrigger.onClick = function() self:OnSendItem(id) end - local iconImage = go.transform:Find("Icon"):GetComponent(Enum.TypeInfo.Image) - local title = go.transform:Find("Info/Title"):GetComponent(Enum.TypeInfo.TextMeshProUGUI) - title.text = name - CommonUtil.LoadIcon(self, iconPath, function(sprite) - iconImage.sprite = sprite - end) + local itemId = logicData['ItemId'] + local itemNum = ManagerContainer.DataMgr.BagData:GetItemCountByCfgId(itemId) + local data = {cfgId = itemId, num = itemNum} + local itemLua = CommonUtil.BindGridViewItem2Lua(self, "IconItem", go) + IconItemCtr:SetData(self, itemLua, data, Enum.ItemIEnterType.Bag, self, function() self:OnSendItem(id) end) end ) end