Branch_oumei
zhangjiannan 2025-10-14 19:56:24 +08:00
parent aa6b8d64e1
commit d874431ac6
6 changed files with 249 additions and 12 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: ad4cca9b51a37604093ab253f41aa354
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 673f007bcc04ee748a4467ce690a15a0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 1aa9e38468533ec40b3a1ae212ef1996
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b1943d6af9d4a0b48809da2dc4a17761
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -27,7 +27,7 @@ function RewardEquipSingleShowPopup2:InitComponent()
this.equipProGrid=Util.GetGameObject(self.transform, "bg/Content/proRect/proGrid")
this.mainPro=Util.GetGameObject(self.transform, "bg/Content/mainPro")
this.mainProGrid = Util.GetGameObject(self.transform, "bg/Content/mainPro/bg")
this.mainProItem = Util.GetGameObject(self.transform, "bg/Content/mainPro/bg/proPre")
this.mainProItem = Util.GetGameObject(self.transform, "mainPro/bg/proPre")
this.mainProItem:SetActive(false)
-- this.mainProName=Util.GetGameObject(self.transform, "Content/mainPro/bg/curProName"):GetComponent("Text")

View File

@ -21,6 +21,8 @@ local index = 0
local lv, curNum, maxNum
local heroListData
local isDown = false
local _MainProList = {}
local giftDatas
--初始化组件用于子类重写RoleEquipChangePopup
function RoleGiftPanel:InitComponent()
--this.spLoader = SpriteLoader.New()
@ -40,6 +42,10 @@ function RoleGiftPanel:InitComponent()
end
--effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect")
end
this.mainPro = Util.GetGameObject(self.transform, "mainPro")
this.mainProGrid = Util.GetGameObject(self.transform, "mainPro/bg")
this.mainProItem = Util.GetGameObject(self.transform, "mainPro/bg/proPre")
this.mainProItem:SetActive(false)
this.titleTxt = Util.GetGameObject(self.gameObject, "title"):GetComponent("Text")
this.titleTxt.text = "英雄礼物"
this.selectBtn = Util.GetGameObject(self.gameObject, "selectBtn")
@ -73,7 +79,7 @@ function RoleGiftPanel:InitComponent()
this.UpScrollView.moveTween.MomentumAmount = 1
this.UpScrollView.moveTween.Strength = 1
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = Util.LoadSprite(
"UI_hz_shenjiang_15_zh")
"UI_hz_shenjiang_15_zh")
this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text")
this.itemNumText = Util.GetGameObject(self.transform, "itemNumText"):GetComponent("Text")
this.upLvEffect = Util.GetGameObject(self.transform, "powerBtn/effect")
@ -241,7 +247,7 @@ function this.RefreshWindowData()
this.lvTxt.text = "收集度" .. lv .. ""
--LogError("lv========="..lv.." curnum=="..curNum.." maxNum=="..maxNum)
--maxNum=0
local giftDatas = {}
giftDatas = {}
allUpIds = {}
upSuitId = {}
for i = 1, maxNum do
@ -282,6 +288,7 @@ function this.RefreshWindowData()
local proList = GiftManager.GetHeroGiftAddPro(curHeroData.dynamicId)
table.insert(proList, string.format("英雄潜能等级+%s", GiftManager.GetHeroGiftAddPotencyLv(curHeroData.dynamicId)))
local originalList = GiftManager.GetHeroGiftAddOriginalPro(curHeroData.dynamicId)
LogError("属性:" .. tostring(#proList))
if proList and #proList > 0 then
this.proGrid:SetActive(true)
this.proEmptyObj:SetActive(false)
@ -295,7 +302,7 @@ function this.RefreshWindowData()
len = this.proGrid.transform.childCount
for i = 1, len do
if i <= #proList then
--this.proGrid.transform:GetChild(i-1).gameObject:SetActive(true)
this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true)
--LogError("originalList[i]======================"..originalList[i])
--this.proGrid.transform:GetChild(i-1):GetComponent("Text").text=proList[i]
this.SingleProShowData({ proId = i, proVal = proList[i] },
@ -308,6 +315,57 @@ function this.RefreshWindowData()
this.proGrid:SetActive(false)
this.proEmptyObj:SetActive(true)
end
for _, item in ipairs(_MainProList) do
item:SetActive(false)
end
local props = {}
for _, data in ipairs(giftDatas) do
local equipConfigData = ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(data.id))
LogError("礼物id" .. data.id)
if equipConfigData and equipConfigData.Property then
for index, prop in ipairs(equipConfigData.Property) do
local find = false
for i = 1, #props do
if props[i].id == prop[1] then
props[i].value = props[i].value + prop[2]
find = true
break
end
end
if find == false then
table.insert(props, { id = prop[1], value = prop[2] })
end
end
end
if #props > 0 then
this.mainPro:SetActive(true)
for i = 1, #props do
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, props[i].id)
if proConfigData then
if not _MainProList[i] then
_MainProList[i] = newObjToParent(this.mainProItem, this.mainProGrid)
end
_MainProList[i]:SetActive(true)
Util.GetGameObject(_MainProList[i], "curProName"):GetComponent("Text").text = GetLanguageStrById(
proConfigData.Info)
local vText = Util.GetGameObject(_MainProList[i], "curProVale"):GetComponent("Text")
Util.GetGameObject(_MainProList[i], "curProIcon"):GetComponent("Image").sprite = Util.LoadSprite(
proConfigData.Icon)
-- if prop[2] > 0 then
-- vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
-- else
vText.text = "+" .. GetPropertyFormatStr(proConfigData.Style, props[i].value)
-- end
end
end
else
this.mainPro:SetActive(false)
end
LogError("属性数量:" .. tostring(#props))
end
--this.tipInfo.text=string.format("神将潜能等级+%s",GiftManager.GetHeroGiftAddPotencyLv(curHeroData.dynamicId))
--显示下面可赠送的
this:OnClickTabBtn(1)
@ -320,7 +378,7 @@ function this.SingleProShowData(data, go)
if #data > 1 then
curGo:SetActive(true)
Util.GetGameObject(curGo, "proName"):GetComponent("Text").text = GetLanguageStrById(propertyConfig
[data[i].proId].Info) .. ":"
[data[i].proId].Info) .. ":"
local proVale = Util.GetGameObject(curGo, "proVale"):GetComponent("Text")
if propertyConfig[data[i].proId].Style == 1 then --绝对值
proVale.text = GetPropertyFormatStr(propertyConfig[data[i].proId].Style, data[i].proVal)
@ -334,7 +392,7 @@ function this.SingleProShowData(data, go)
end
end
Util.GetGameObject(curGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(propertyConfig
[data[i].proId].Icon)
[data[i].proId].Icon)
else
curGo:SetActive(false)
end
@ -372,7 +430,7 @@ function this.SingleUpItemShow(_go, data, _index)
end
BagManager.isBagPanel = false
--UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,data,2,false,nil,curHeroData,4)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, data,curHeroData, nil, false, false, true)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this, data, curHeroData, nil, false, false, true)
end
)
else
@ -463,7 +521,7 @@ function this.SingleItemDataShow(_go, _itemData)
local tip = Util.GetGameObject(_go.transform, "tip")
tip:SetActive(_itemData.isUp == 1)
local isHave = CheckListIsContainValue1(allUpIds, _itemData.id) or
CheckListIsContainValue1(upSuitId, equipConfig[_itemData.id].SuiteID)
CheckListIsContainValue1(upSuitId, equipConfig[_itemData.id].SuiteID)
redPoint:SetActive(isHave == false and curNum > #allUpIds)
this.equipPreList[_go].gameObject:SetActive(true)
this.equipPreList[_go].transform:SetAsFirstSibling()
@ -476,10 +534,10 @@ 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,curHeroData, nil, false, false, true)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this, _itemData, curHeroData, nil, false, false, true)
else
--UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,3,false,nil,curHeroData,4)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, _itemData,curHeroData, nil, false, true, false)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this, _itemData, curHeroData, nil, false, true, false)
end
end
)
@ -492,7 +550,10 @@ function this:SetSelectBtn()
this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0)
this.selectBtn.transform:SetSiblingIndex(1)
Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = GetCurLanguage() == 0 and
tableName[indexBtnNum] or "<size=40>" .. tableName[indexBtnNum] .. "</size>" --typeTab[indexBtnNum]
tableName[indexBtnNum] or
"<size=40>" ..
tableName[indexBtnNum] ..
"</size>" --typeTab[indexBtnNum]
end
--选择图片设置父级
@ -510,7 +571,7 @@ end
--界面销毁时调用(用于子类重写)
function RoleGiftPanel:OnDestroy()
_MainProList = {}
end
return RoleGiftPanel