diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua index be6a85abbb..6d68ef6684 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua @@ -320,7 +320,7 @@ function this.SingleItemDataShow(_go, _itemData) Util.AddOnceClick(Util.GetGameObject(_go.transform, "mask"),function() BagManager.isBagPanel=true if isHave then - UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,0,false,nil,curHeroData,4) + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,6,false,nil,curHeroData,4) else UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,3,false,nil,curHeroData,4) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua index 3b99aa6205..c7ceb25e3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua @@ -371,7 +371,7 @@ function this.SingleItemDataShow(_go, _itemData) Util.AddOnceClick(Util.GetGameObject(_go.transform, "mask"),function() BagManager.isBagPanel=true if isHave then - UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,0,false,nil,curHeroData,4) + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,6,false,nil,curHeroData,4) else UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,3,false,nil,curHeroData,4) end diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index e6a3bf8d29..c772f527bc 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -350,7 +350,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6) self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7) end - elseif _itemData.itemType == 3 then --装备 + elseif _itemData.itemType == 3 or _itemData.itemType == 56 then --装备 --hero self.num:SetActive(false) self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(_itemData.configData.ReadingName),5) @@ -360,6 +360,15 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.proImage.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_itemData.configData.PropertyName)) --self.posImage.sprite = self.spLoader:LoadSprite(GetJobSpriteStrByJobNum(_itemData.configData.Profession)) --self.heroStage.sprite = self.spLoader:LoadSprite(HeroStageSprite[_itemData.configData.HeroStage]) + if _itemData.itemType == 56 then + self.resetLvText.gameObject:SetActive(true) + if _itemData.configData.ItemBaseType==14 then + self.resetLvText.text="主" + elseif _itemData.configData.ItemBaseType==15 then + self.resetLvText.text="将" + end + + end Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RoleGetInfoPopup, true, _itemData.backData) end) @@ -633,7 +642,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true) end) - elseif itemDataConFig.ItemType == ItemType.Equip then + elseif itemDataConFig.ItemType == ItemType.Equip or itemDataConFig.ItemType == ItemType.Gift then --3装备 self.num:SetActive(itemNum and itemNum > 1) self.num:GetComponent("Text").text = PrintWanNum(itemNum and itemNum or 0) @@ -647,6 +656,15 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity1 == 7) self.c_ui_qinyan_duan:SetActive(itemDataConFig.Quantity1 == 8) end + if itemDataConFig.ItemType ==ItemType.Gift then + self.resetLvText.gameObject:SetActive(true) + if itemDataConFig.ItemBaseType==14 then + self.resetLvText.text="主" + elseif itemDataConFig.ItemBaseType==15 then + self.resetLvText.text="将" + end + + end Util.AddOnceClick(self.frameBtn, function() -- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId) local _itemData = {}