diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_01.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_01.png new file mode 100644 index 0000000000..f64077f78e Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_01.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_01.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_01.png.meta new file mode 100644 index 0000000000..e4229551c4 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_01.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0145dc1ea23df9a44871809648a89062 +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: 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: 0080b1d3c96bff74dbcaa9b13c96225e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagButtonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_02.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_02.png new file mode 100644 index 0000000000..c7643ccfdd Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_02.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_02.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_02.png.meta new file mode 100644 index 0000000000..92e5279017 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/r_shop_yuanshen_02.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 708b6a68818be2244986dff2c2db0bc3 +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: 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: eee37f64b31b30b47833cc1f7aead10d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagButtonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 8bdc8ee656..fe73dc50ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -34,8 +34,7 @@ local _ShopPage = { rpType = RedPointType.Shop_Page_Roam, }, [SHOP_PAGE.YUANSHEN] = { -- 元神 - default = "r_shop_yunyou_01", lock = "r_shop_yunyou_01", select = "r_shop_yunyou_02", - rpType = RedPointType.Shop_Page_Roam, + default = "r_shop_yuanshen_01", lock = "r_shop_yuanshen_01", select = "r_shop_yuanshen_02", }, }