From 4c82f2d58cbfd18fc6717e1a6aa47ee376bd3920 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 15 Jun 2022 10:31:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index b3c40cb9a6..79967a4d16 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -441,7 +441,7 @@ function this.EquipInfo() this.treasureDatas[pos].gameObject:SetActive(true) this.treasureDatas[pos].transform:SetAsFirstSibling() -- LogRed(tostring(curEquipData.homeEquipLv[1]).." "..tostring(curEquipData.homeEquipLv[2])) - this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false, 0,nil,curEquipData) + this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false,orginLayer,nil,curEquipData) end local frameBtn = Util.GetGameObject(pos, "mask") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index a814464ad0..9b22810d4b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -547,7 +547,7 @@ function this:SingleDataShow(go,index) -- else -- LogError("无homeEquipLv") -- end - this.equipPreList2[go]:OnOpen(false,{curHeroEquipDatas[index].id,0}, 1, false, false, false, 0,nil,curHeroEquipDatas[index]) + this.equipPreList2[go]:OnOpen(false,{curHeroEquipDatas[index].id,0}, 1, false, false, false, orginLayer,nil,curHeroEquipDatas[index]) if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then -- body Util.GetGameObject(go.transform, "HongMenging"):SetActive(true) @@ -557,7 +557,7 @@ function this:SingleDataShow(go,index) elseif curEquipTreasureDatas[index] then this.equipPreList2[go].gameObject:SetActive(true) mask.gameObject:SetActive(false) - this.equipPreList2[go]:OnOpen(false,{curEquipTreasureDatas[index].id,0}, 1, false, false, false, 0,curEquipTreasureDatas[index].idDyn) + this.equipPreList2[go]:OnOpen(false,{curEquipTreasureDatas[index].id,0}, 1, false, false, false, orginLayer,curEquipTreasureDatas[index].idDyn) --鸿蒙阵 共享数据判断 if HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and curEquipTreasureDatas[index].equipType == 1 then Util.GetGameObject(go.transform, "HongMenging"):SetActive(true) @@ -684,7 +684,7 @@ function this.SingleItemDataShow(_go, _itemData) this.equipPreList[_go].gameObject:SetActive(true) this.equipPreList[_go].transform:SetAsFirstSibling() if itemConfig[_itemData.id].ItemType == ItemType.EquipTreasure then - this.equipPreList[_go]:OnOpen(false,{_itemData.id,0}, 1.1, true, false, false, 0,_itemData.idDyn) + this.equipPreList[_go]:OnOpen(false,{_itemData.id,0}, 1.1, true, false, false, orginLayer,_itemData.idDyn) if curHeroCanUpEquipTreasuresTabs and #curHeroCanUpEquipTreasuresTabs > 0 then local isShow = false for i = 1, #curHeroCanUpEquipTreasuresTabs do @@ -713,7 +713,7 @@ function this.SingleItemDataShow(_go, _itemData) end ) else - this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1, true, false, false, 0) + this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1, true, false, false, orginLayer) if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then local isShow = false for i = 1, #curHeroCanUpEquipTabs do From e7eee5c2c37e4b0c2b92ef45043bb8ac8cc2daa4 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 15 Jun 2022 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E7=A5=9E=E8=A3=85=E5=90=88=E6=88=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Compound/view/CompoundPanel_Equip.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua index f987c3b9de..8423780c4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua @@ -389,7 +389,12 @@ function this.Compound() PopupTipPanel.ShowTip(itemConfig[otherId].Name.."不足") return end - NetManager.ComplexEquipRequest(curIndex,curSelectEquip.Star,compoundNum,function(msg) + local aaa=curIndex + if curIndex==5 then + aaa=curSelectEquip.Position + end + --LogError("curSelectEquip.Name=="..curSelectEquip.Name.." id=="..curSelectEquip.Id.." aaa=="..aaa) + NetManager.ComplexEquipRequest(aaa,curSelectEquip.Star,compoundNum,function(msg) SoundManager.PlaySound(SoundConfig.UI_Duanzao) -- SoundManager.PlaySound(SoundConfig.UI_Baoqi) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()