1

2025-10-14 17:48:40 +08:00 · 2025-10-14 17:48:40 +08:00 · a784dea607
parent 657218b1fd
commit a784dea607
5 changed files with 100 additions and 87 deletions
--- 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",
--- 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
--- 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()
    --装备基础信息
--- 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
@ -226,33 +226,11 @@ function RewardEquipSingleShowPopup2:OnShow()
        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 = "<color=#FFFFFF>(" .. 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.ClearChild(this.getTuGrid.transform)
    local curitemData = itemConfig[tonumber(self.equipData.id)]
--- a/Assets/ManagedResources/~Lua/View/ItemView.lua
+++ b/Assets/ManagedResources/~Lua/View/ItemView.lua
@ -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)
@ -182,7 +198,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
            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()
@ -202,7 +219,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
            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
@ -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,14 +253,16 @@ 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()
@ -336,11 +357,15 @@ 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.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))
+        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)

@ -478,7 +503,8 @@ 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)
@ -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,9 +674,11 @@ function ItemView:OnClose()
    -- 修复对象池回收层级没有重置，导致特效穿透的问题
    self:SetEffectLayer(-self.EffectOrginLayerQu)
 end
+
 function ItemView:SetDuiImageShow(isShow)
    self.duiImage:SetActive(isShow)
 end
+
 function ItemView:OnDestroy()
 end