From b6ce191bff423a59bacf7cf75a06e85447b7c959 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 17 Nov 2021 12:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E6=97=A0=E6=B3=95=E5=8D=B8=E4=B8=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Popup/RewardEquipSingleShowPopup2.lua | 8 ++++---- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index dd1dc06577..c17435a998 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -133,10 +133,10 @@ function RewardEquipSingleShowPopup2:BindEvent() local equipIdList={} local equipDataList={} table.insert(equipIdList,tostring(self.equipData.id)) - table.insert(equipDataList,self.nextEquip) + table.insert(equipDataList,self.equipData) NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList ,1, function () self:ClosePanel() - self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.equipData,self.position) + self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.nextEquip,self.position) end) end) end @@ -173,7 +173,7 @@ end function RewardEquipSingleShowPopup2:SetBtns() local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id)) - self.btnSure:SetActive(itemConfigData.IfResolve==1) + self.btnSure:SetActive(itemConfigData.IfResolve==1 and BagManager.isBagPanel) self.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel) self.btnWear:SetActive(self.openType == 3) self.btnDown:SetActive(self.openType == 2) @@ -202,7 +202,7 @@ function RewardEquipSingleShowPopup2:OnShow() self.powerNumUpDown.gameObject:SetActive(true) local Power = EquipManager.CalculateWarForce(self.equipData.id) local Power2 = EquipManager.CalculateWarForce(self.nextEquip.id) - LogGreen("Id:"..tostring(self.equipData.id).."Power:"..tostring(Power).." Id2:"..tostring(self.equipData.id).."Power2:"..tostring(Power2)) + -- LogGreen("Id:"..tostring(self.equipData.id).." Power:"..tostring(Power).." Id2:"..tostring(self.equipData.id).." Power2:"..tostring(Power2)) if(Power > Power2) then self.powerNumUpDown.sprite = self.spLoader:LoadSprite(PowerChangeIconDef[1]) elseif(Power < Power2)then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 1c5dd7e1ff..ce4ef6baaa 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -846,6 +846,7 @@ function this.SingleItemDataShow(_go, _itemData) if curHeroData.harmonyGongMing then this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position) else + -- Log("当前装备:"..tostring(nextEquipData.id).." 准备替换装备:"..tostring(_itemData.id)) UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,_itemData,4,false,nil, curHeroData,equipConfig[_itemData.id].Position,nextEquipData) end else @@ -857,6 +858,12 @@ function this.SingleItemDataShow(_go, _itemData) end --刷新当前英雄装备坑位的信息 function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataList, _oldSelectEquip, position) --type + -- if _selectEquipDataList then + -- LogYellow("_type:"..tostring(_type).." 新装备:"..tostring(_selectEquipDataList[1].id)) + -- end + -- if _oldSelectEquip then + -- LogYellow("旧装备:"..tostring(_oldSelectEquip.id)) + -- end --1 穿单件装备 2 卸单件装备 3 替换单件装备 4 一键穿装备 5一键脱装备 if _type == 1 then effectList[position]:SetActive(false) @@ -920,11 +927,11 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi end --英雄替换新选择装备 - if curHeroEquipDatas[curSelectEquipData.equipConfig.Position] then + if curHeroEquipDatas[equipConfig[curSelectEquipData.id].Position] then for i = 1, #curHeroData.equipIdList do if tonumber(curHeroData.equipIdList[i]) == - tonumber(curHeroEquipDatas[curSelectEquipData.equipConfig.Position].id) + tonumber(curHeroEquipDatas[equipConfig[curSelectEquipData.id].Position].id) then curHeroData.equipIdList[i] = curSelectEquipData.id break