diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/t_tongyong_di_8.png b/Assets/ManagedResources/Atlas/PublicAtlas/t_tongyong_di_8.png new file mode 100644 index 0000000000..f1711abaff Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/t_tongyong_di_8.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/t_tongyong_di_8.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/t_tongyong_di_8.png.meta new file mode 100644 index 0000000000..c094922252 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/t_tongyong_di_8.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 718f49939bc95fa4c817fa3a6f048a26 +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: 2 + 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 0264050eddb1e264f874af7d9b0fcac4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 53ecae2445..34459265a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -1201,7 +1201,7 @@ end --是否有可合成碎片 function this.GetBagRedPointIsCanCompoundDebris() for i, v in pairs(this.bagDatas) do - if v.itemType == ItemType.HeroDebris then + if v.itemType == ItemType.HeroDebris or v.itemType == ItemType.EquipChip or v.itemType == ItemType.likeabilityItemChip then local curExpVal = BagManager.GetItemCountById(v.id) / v.itemConfig.UsePerCount if curExpVal >= 1 then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index 43e5350bda..99d5c56078 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -135,7 +135,8 @@ function BagResolveAnCompoundPanel:BindEvent() Util.AddClick(this.btnCompound, function() if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.ZuoQiChip - or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip then--碎片 + or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip + or itemData.itemConfig.ItemType==ItemType.EquipChip then--碎片 if compoundNum>0 then local item={} item.itemId=itemData.id @@ -306,6 +307,7 @@ function this.OnShowLayout3Data() if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.ZuoQiChip or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip + or itemData.itemConfig.ItemType==ItemType.EquipChip then--碎片 this.chipFrame:SetActive(true) this.chipFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(itemData.itemConfig.Quantity)) @@ -320,7 +322,7 @@ function this.OnShowLayout3Data() this.btnCompoundText.text=Language[10193] local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount) -- - if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip then -- 神将碎片 + if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip or itemData.itemConfig.ItemType==ItemType.EquipChip then -- 神将碎片 compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit, gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())) elseif itemData.itemConfig.ItemType==ItemType.ZuoQiChip then -- 坐骑碎片 compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit) @@ -470,7 +472,8 @@ function this.ShowCompoundNumData(value) this.numText1.text = value if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.ZuoQiChip - or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip then--碎片 + or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip + or itemData.itemConfig.ItemType==ItemType.EquipChip then--碎片 this.numText.text= Language[10198]..value*itemData.itemConfig.UsePerCount..Language[10199]..value..Language[10200].. string.gsub(GetLanguageStrById(itemData.itemConfig.Name),Language[10201],"") elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 this.numText.text= Language[10202]..value..Language[10200]..GetLanguageStrById(itemData.itemConfig.Name).."。"