From a784dea6074a29030d48b15dc1bde56013533143 Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Tue, 14 Oct 2025 17:48:40 +0800 Subject: [PATCH] 1 --- .../~Lua/Common/GlobalDefine.lua | 1 + .../Compound/view/CompoundPanel_Gift.lua | 4 +- .../Popup/RewardEquipSingleShowPopup.lua | 1 + .../Popup/RewardEquipSingleShowPopup2.lua | 34 +--- .../ManagedResources/~Lua/View/ItemView.lua | 147 +++++++++++------- 5 files changed, 100 insertions(+), 87 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index ef4381744..536471aa1 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1269,6 +1269,7 @@ ItemType = { medal = 22, --芯片 Gene = 24, --基因 ItemDebris = 31, --道具碎片 + Gift = 56 --礼物 } YaoHunFrame = { --[6] = "r_tongyong_yaohunkuang002", diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua index a8ab11c92..adea7ef6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua @@ -62,7 +62,7 @@ function this:BindEvent() Util.AddClick(this.compoundSoulPrintBtn, function() --UIManager.OpenPanel(UIName.SoulPrintPopUp,0,nil,curSelectSoulPrint.Id,nil,nil) --UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,{id=curSelectSoulPrint.Id,num=0},0,false,nil,nil,4) - UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,{id=curSelectSoulPrint.Id,num=0}) + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,{id=curSelectSoulPrint.Id,num=0}) end) end @@ -373,7 +373,7 @@ function this:OnClose() end function this:OnDestroy() - this.spLoader:Destroy() + --this.spLoader:Destroy() allGo = {} funcList={} end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua index 68f61fe6e..7c3034b04 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup.lua @@ -116,6 +116,7 @@ function RewardEquipSingleShowPopup:OnOpen(_equipData, _func,_isRewardItemPop,_i func = _func isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false isShowfenjie = not not (_isShowfenjie or false) + LogError("dddddddddddddddd") end function RewardEquipSingleShowPopup:OnShow() --装备基础信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index d70cb3a92..fe399499d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -170,7 +170,7 @@ function RewardEquipSingleShowPopup2:OnShow() -- --this.downLockImage:SetActive(curEquipData.isLocked == 0) -- end -- this.equipQuaText.text = GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality)) --n1 - + --LogError("xxxxxxxxxxxxxxx"..tostring(self.equipData.id)) this.eqiopName.text = GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name)) --if equipConfigData.IfClear == 0 then @@ -225,34 +225,12 @@ function RewardEquipSingleShowPopup2:OnShow() else this.mainPro:SetActive(false) end - + + --套装属性 - if equipConfigData.SuiteID and equipConfigData.SuiteID > 0 then - Util.GetGameObject(self.transform, "Content/proRect"):SetActive(true) - local curSuitConFig = ConfigManager.GetConfigData(ConfigName.EquipSuiteConfig,equipConfigData.SuiteID) - if curSuitConFig then - for i = 1, math.max(#curSuitConFig.SuiteValue, #curSuitProGo) do - local go = curSuitProGo[i] - if not go then - go = newObject(this.equipOtherProPre) - go.transform:SetParent(this.equipProGrid.transform) - go.transform.localScale = Vector3.one - go.transform.localPosition = Vector3.zero - curSuitProGo[i] = go - end - go.gameObject:SetActive(false) - end - for i = 1, #curSuitConFig.SuiteValue do - local go = curSuitProGo[i] - go.gameObject:SetActive(true) - Util.GetGameObject(go.transform, "proName"):GetComponent("Text").text = GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info) .." +"..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]) - Util.GetGameObject(go.transform, "proVale"):GetComponent("Text").text = "(" .. curSuitConFig.SuiteValue[i][1] .. GetLanguageStrById(11095) - Util.GetGameObject(go.transform, "curProIcon"):GetComponent("Image").sprite = Util.LoadSprite(propertyConfig[curSuitConFig.SuiteValue[i][2]].Icon) - end - end - else - Util.GetGameObject(self.transform, "Content/proRect"):SetActive(false) - end + Util.GetGameObject(self.transform, "Content/proRect"):SetActive(false) + + --装备获得途径 Util.ClearChild(this.getTuGrid.transform) local curitemData = itemConfig[tonumber(self.equipData.id)] diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index dcb00b610..a3af6d570 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -74,7 +74,7 @@ function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, i effectLayer = effectLayer or 0 self.EffectOrginLayerQu = effectLayer - self.num.font = poolManager:LoadAsset(GetFont(), PoolManager.AssetType.Other) + self.num.font = poolManager:LoadAsset(GetFont(), PoolManager.AssetType.Other) self.upName.gameObject:SetActive(isShowName) self.downName.gameObject:SetActive(false) self.add:SetActive(isShowAddImage) @@ -135,7 +135,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) Reward = 6, Medal = 7, Gene = 8, - Title = 9, --称号 + Title = 9, --称号 } if _itemData.itemType == itemType.NoType or _itemData.itemType == itemType.NoType_1 then @@ -146,20 +146,36 @@ function ItemView:GetRewardShow(_itemData, effectLayer) if _itemData.configData.ItemType == ItemType.HeroDebris then self.frameMask:SetActive(true) self.pro.gameObject:SetActive(true) - self.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(_itemData.configData.Quantity)) + self.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(_itemData + .configData.Quantity)) self.pro.sprite = Util.LoadSprite(GetQuantityProBgImageByquality(_itemData.configData.Quantity)) self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(_itemData.configData.PropertyName)) - + Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId, nil, + self.isRewardItemPop) end) elseif _itemData.configData.ItemType == ItemType.Pokemon then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId, nil, + self.isRewardItemPop) end) elseif _itemData.configData.ItemType == ItemType.TalentItem then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId, nil, + self.isRewardItemPop) + end) + elseif _itemData.configData.ItemType == ItemType.Gift then + Util.AddOnceClick(self.btn, function() + --local equipConfigData = ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(_itemData.backData.itemId)) + --LogError("cccccccccccccc"..tostring(_itemData.backData.itemId)) + --ogError("cccccccccccccc"..tostring(equipConfigData.Id)) + local data = {} + data.type = 1 + data.qua = 0 + data.id = _itemData.backData.itemId + data.isRed = false + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this, data) end) elseif _itemData.configData.ItemType == ItemType.Equip then self.num.gameObject:SetActive(_itemData.num > 1) @@ -171,22 +187,23 @@ function ItemView:GetRewardShow(_itemData, effectLayer) Util.AddOnceClick(self.btn, function() _itemData.id = _itemData.configData.Id - UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData, nil, self.isRewardItemPop) end) elseif _itemData.configData.ItemType == ItemType.Blueprint then local lanTuData = WorkShopManager.GetLanTuIsOpenLock(_itemData.backData.itemId) if lanTuData then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.WorkShopArmorOnePanel,3,3, lanTuData[2]) + UIManager.OpenPanel(UIName.WorkShopArmorOnePanel, 3, 3, lanTuData[2]) end) end elseif _itemData.configData.ItemType == ItemType.HunYin then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId, nil, + self.isRewardItemPop) end) elseif _itemData.configData.itemType == ItemType.CombatPlan then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id, nil, self.isRewardItemPop) end) elseif _itemData.configData.itemType == ItemType.medal then self.starGrid:SetActive(true) @@ -198,11 +215,12 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[_itemData.configData.Id].ResourceID)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id, nil, self.isRewardItemPop) end) else Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId, nil, + self.isRewardItemPop) end) end elseif _itemData.itemType == itemType.Equip then @@ -213,7 +231,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.upName.text = GetLanguageStrById(_itemData.configData.Name) EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData, nil, self.isRewardItemPop) end) elseif _itemData.itemType == itemType.Hero then self.pro.gameObject:SetActive(true) @@ -221,7 +239,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.starGrid:SetActive(true) self.upName:GetComponent("Text").text = GetLanguageStrById(_itemData.configData.ReadingName) - self.pro.sprite = Util.LoadSprite(GetQuantityProBgImageByquality(_itemData.configData.Quality, _itemData.configData.Star)) + self.pro.sprite = Util.LoadSprite(GetQuantityProBgImageByquality(_itemData.configData.Quality, + _itemData.configData.Star)) self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(_itemData.configData.PropertyName)) SetHeroStars(self.starGrid, _itemData.backData.star) Util.AddOnceClick(self.btn, function() @@ -234,18 +253,20 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.upName:GetComponent("Text").text = GetLanguageStrById(_itemData.name) SetHeroStars(self.starGrid, _itemData.backData.rebuildLevel) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,_itemData.backData.id,_itemData.backData.equipId,_itemData.backData.exp,_itemData.backData.rebuildLevel) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 2, _itemData.backData.id, + _itemData.backData.equipId, _itemData.backData.exp, _itemData.backData.rebuildLevel) end) elseif _itemData.itemType == itemType.Jewel then self.num.gameObject:SetActive(false) - + self.upName:GetComponent("Text").text = GetLanguageStrById(_itemData.name) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.backData.id,_itemData.backData.equipId, 0,0) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.backData.id, + _itemData.backData.equipId, 0, 0) end) elseif _itemData.itemType == itemType.Reward then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id, nil, self.isRewardItemPop) end) elseif _itemData.itemType == itemType.Medal then if _itemData.configData.ItemType == ItemType.medal then @@ -259,7 +280,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[_itemData.configData.Id].ResourceID)) end Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.configData.Id, nil, self.isRewardItemPop) end) elseif _itemData.itemType == itemType.Title then Util.AddOnceClick(self.btn, function() @@ -311,20 +332,20 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) local heroConfigData = ConfigManager.GetConfigData(ConfigName.HeroConfig, itemConfig[itemSId].HeroStar[1]) self.num.text = PrintWanNum(itemNum) - local star = _reward[4] or itemConfig[itemSId].HeroStar[2] --获取星级 + local star = _reward[4] or itemConfig[itemSId].HeroStar[2] --获取星级 SetHeroStars(self.starGrid, star) self.frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(itemConfig[itemSId].Quantity)) - if itemSId == 20000 then --高级回溯背景问题 - self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(nil,star)) + if itemSId == 20000 then --高级回溯背景问题 + self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(nil, star)) end - + self.icon.sprite = Util.LoadSprite(GetResourcePath(heroConfigData.Icon)) self.upName:GetComponent("Text").text = GetLanguageStrById(heroConfigData.ReadingName) self.pro.sprite = Util.LoadSprite(GetQuantityProBgImageByquality(itemConfig[itemSId].Quantity)) self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfigData.PropertyName)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id,star) + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id, star) end) elseif itemDataConFig.ItemType == ItemType.HeroDebris then self.frameMask:SetActive(true) @@ -336,16 +357,20 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.pro.gameObject:SetActive(true) end - self.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[itemSId].Quantity)) - self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) - self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) - self.pro.sprite = Util.LoadSprite(GetQuantityProBgImageByquality(itemConfig[itemSId].Quantity)) - self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[itemSId].PropertyName)) - local star = itemConfig[itemSId].Quantity + self.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig + [itemSId].Quantity)) + self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId] + .Quantity)) + self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) + self.pro.sprite = Util.LoadSprite(GetQuantityProBgImageByquality(itemConfig[itemSId] + .Quantity)) + self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[itemSId] + .PropertyName)) + local star = itemConfig[itemSId].Quantity SetHeroStars(self.starGrid, star) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop) end) elseif itemDataConFig.ItemType == ItemType.Equip then self.starGrid:SetActive(true) @@ -354,17 +379,17 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.num.text = PrintWanNum(itemNum and itemNum or 0) self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) - EquipManager.SetEquipStarShow(self.starGrid,itemSId) + EquipManager.SetEquipStarShow(self.starGrid, itemSId) Util.AddOnceClick(self.btn, function() UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId) end) elseif itemDataConFig.ItemType == ItemType.Pokemon then self.frame.sprite = Util.LoadSprite(YaoHunFrame[itemConfig[itemSId].Quantity]) - self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) + self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop) end) elseif itemDataConFig.ItemType == ItemType.Blueprint then self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) @@ -373,7 +398,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemSId) if lanTuData then Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.WorkShopArmorOnePanel,3,3, lanTuData[2]) + UIManager.OpenPanel(UIName.WorkShopArmorOnePanel, 3, 3, lanTuData[2]) end) end elseif itemDataConFig.ItemType == ItemType.TalentItem then @@ -381,7 +406,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop) end) elseif itemDataConFig.ItemType == ItemType.Talisman then self.num.gameObject:SetActive(false) @@ -392,28 +417,28 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) SetHeroStars(self.starGrid, TalismanManager.AllTalismanStartStar[itemSId]) Util.AddOnceClick(self.frameBtn, function() - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 2, "", itemSId, 0, 0) end) elseif itemDataConFig.ItemType == ItemType.HunYin then self.num.gameObject:SetActive(true) self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.SoulPrintPopUp,0,nil,itemSId,nil,nil) + UIManager.OpenPanel(UIName.SoulPrintPopUp, 0, nil, itemSId, nil, nil) end) elseif itemDataConFig.ItemType == ItemType.EquipTreasure then self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 2, "", itemSId, 0, 0) end) elseif itemDataConFig.ItemType == ItemType.CombatPlan then self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop) end) elseif itemDataConFig.ItemType == ItemType.medal then self.starGrid:SetActive(true) @@ -424,14 +449,14 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.btn, function() - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop) end) elseif itemDataConFig.ItemType == ItemType.SelfBox then self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) Util.AddOnceClick(self.btn, function() - local data = {["itemConfig"] = itemConfig[itemSId],["id"] = 10} - UIManager.OpenPanel(UIName.RewardBoxPanel, data,function () + local data = { ["itemConfig"] = itemConfig[itemSId], ["id"] = 10 } + UIManager.OpenPanel(UIName.RewardBoxPanel, data, function() UIManager.ClosePanel(UIName.RewardBoxPanel) end) end) @@ -478,24 +503,25 @@ end function ItemView:OnBtnCkickEvent(itemSId) local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId) if itemDataConFig.ItemType == ItemType.Hero then - local heroConfigData = ConfigManager.GetConfigData(ConfigName.HeroConfig, itemConfig[itemDataConFig.Id].HeroStar[1]) + local heroConfigData = ConfigManager.GetConfigData(ConfigName.HeroConfig, + itemConfig[itemDataConFig.Id].HeroStar[1]) UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id, itemConfig[itemDataConFig.Id].HeroStar[2]) elseif itemDataConFig.ItemType == ItemType.Equip then UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id) elseif itemDataConFig.ItemType == ItemType.Blueprint then local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemDataConFig.Id) if lanTuData then - UIManager.OpenPanel(UIName.WorkShopArmorOnePanel,3,3, lanTuData[2]) + UIManager.OpenPanel(UIName.WorkShopArmorOnePanel, 3, 3, lanTuData[2]) end else - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id, nil, self.isRewardItemPop) end end --显示扫光特效 function ItemView:OnShowUIeffectItemViewSaoguang() if not self.effect_saoguang then - self.effect_saoguang = poolManager:LoadAsset("UI_effect_ItemView_saoguang",PoolManager.AssetType.GameObject) + self.effect_saoguang = poolManager:LoadAsset("UI_effect_ItemView_saoguang", PoolManager.AssetType.GameObject) self.effect_saoguang.transform:SetParent(self.effects.transform) self.effect_saoguang.transform.localScale = Vector3.one self.effect_saoguang.transform.localPosition = Vector3.New(0, 0, 0) @@ -509,7 +535,7 @@ end --设置特效 function ItemView:SetEffect(str, quantity) - local effect = Util.GetGameObject(self.effects, str.."(Clone)") + local effect = Util.GetGameObject(self.effects, str .. "(Clone)") if effect then effect:SetActive(false) if _Quantity == quantity then @@ -518,7 +544,7 @@ function ItemView:SetEffect(str, quantity) end else if _Quantity == quantity then - effect = poolManager:LoadAsset(str,PoolManager.AssetType.GameObject) + effect = poolManager:LoadAsset(str, PoolManager.AssetType.GameObject) effect.transform:SetParent(self.effects.transform) effect.transform.localScale = Vector3.one effect.transform.localPosition = Vector3.New(0, 0, 0) @@ -534,7 +560,7 @@ end --该方法可有可无 不调用时走默认的赋值 调用时根据自定义的设置赋值 --_reward为数据 便于物品类型与传入的type类型相匹配 --settings为表类型 传入的参数需要与自定义配置相对应 -function ItemView:Reset(_reward,type,settings) +function ItemView:Reset(_reward, type, settings) local itemSId = tonumber(_reward[1]) local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId) if type == itemDataConFig.ItemType then @@ -551,7 +577,7 @@ function ItemView:ResetNameColor(v4) end --设置名字大小位置 -function ItemView:ResetNameSize(v2,v3) +function ItemView:ResetNameSize(v2, v3) self.upName.gameObject:GetComponent("RectTransform").anchoredPosition3D = v2 self.upName.gameObject:GetComponent("RectTransform").localScale = v3 end @@ -560,6 +586,7 @@ end function ItemView:ShowNum(isShow) self.num.gameObject:SetActive(isShow) end + --设置图片框 function ItemView:SetKuangSprite(resName) self.frame.sprite = Util.LoadSprite(resName) @@ -584,14 +611,16 @@ end function ItemView:SetCorner(type, isShow, arg) if type == 1 then if isShow then - Util.GetGameObject(self.Corner, "CornerModel/Image"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont("X1_fuhuazhizhan_shoutong")) + Util.GetGameObject(self.Corner, "CornerModel/Image"):GetComponent("Image").sprite = Util.LoadSprite( + GetPictureFont("X1_fuhuazhizhan_shoutong")) end Util.GetGameObject(self.Corner, "CornerModel"):SetActive(isShow) elseif type == 2 then Util.GetGameObject(self.Corner, "Lock"):SetActive(isShow) elseif type == 3 then if isShow then - Util.GetGameObject(self.Corner, "ProbabilityGet"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont("X1_gonghui_gailvhuode")) + Util.GetGameObject(self.Corner, "ProbabilityGet"):GetComponent("Image").sprite = Util.LoadSprite( + GetPictureFont("X1_gonghui_gailvhuode")) end Util.GetGameObject(self.Corner, "ProbabilityGet"):SetActive(isShow) elseif type == 4 then @@ -600,13 +629,15 @@ function ItemView:SetCorner(type, isShow, arg) Util.GetGameObject(self.Corner, "Effect"):SetActive(isShow) elseif type == 6 then Util.GetGameObject(self.Corner, "Lv"):SetActive(isShow) - Util.GetGameObject(self.Corner, "Lv"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByqualityHexagon(nil, arg.star)) + Util.GetGameObject(self.Corner, "Lv"):GetComponent("Image").sprite = Util.LoadSprite( + GetQuantityImageByqualityHexagon(nil, arg.star)) Util.GetGameObject(self.Corner, "Lv/Text"):GetComponent("Text").text = arg.lv self.frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(nil, arg.star)) SetHeroStars(self.starGrid, arg.star) elseif type == 7 then Util.GetGameObject(self.Corner, "geneLv"):SetActive(isShow) - Util.GetGameObject(self.Corner, "geneLv"):GetComponent("Image").sprite = Util.LoadSprite(AircraftCarrierManager.GetSkillLvImgForId(arg.id).lvImg) + Util.GetGameObject(self.Corner, "geneLv"):GetComponent("Image").sprite = Util.LoadSprite(AircraftCarrierManager + .GetSkillLvImgForId(arg.id).lvImg) end end @@ -643,10 +674,12 @@ function ItemView:OnClose() -- 修复对象池回收层级没有重置，导致特效穿透的问题 self:SetEffectLayer(-self.EffectOrginLayerQu) end + function ItemView:SetDuiImageShow(isShow) self.duiImage:SetActive(isShow) end + function ItemView:OnDestroy() end -return ItemView \ No newline at end of file +return ItemView