diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png new file mode 100644 index 0000000000..ddcf1173c4 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta new file mode 100644 index 0000000000..7e5c35d8d1 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 78ef5a2e12c7b874ba187ece4e09f331 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4c84bb0de6f3b064cbb1372a3c5aa168 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png new file mode 100644 index 0000000000..1b2e292ab4 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta new file mode 100644 index 0000000000..0919f694bb --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2c65f45305b109444a7da398f28803c5 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b6c4838b4c47f164eb680c2edb74df2e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index c14d825124..b3c149981a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -8,7 +8,7 @@ local isFirstOpen = false local missionIndex = { [1] = {tipText = "免费领取超值豪礼",selectImaRMB = "r_mrcz_18_zh",selectIma = "r_mrcz_18_zh",defaultImaRMB = "r_mrcz_1801_zh",defaultIma = "r_mrcz_1801_zh"}, [2] = {tipText = "免费领取18元,30元两档超级豪礼",selectImaRMB = "r_mrcz_30_zh",selectIma = "r_mrcz_30_zh",defaultImaRMB = "r_mrcz_3001_zh",defaultIma = "r_mrcz_3001_zh"}, - [3] = {tipText = "三重档位超值豪礼尽收囊中",selectImaRMB = "r_mrcz_68_zh",selectIma = "r_mrcz_30_zh",defaultImaRMB = "r_mrcz_6801_zh",defaultIma = "r_mrcz_6801_zh"}, + [3] = {tipText = "三重档位超值豪礼尽收囊中",selectImaRMB = "r_mrcz_98_zh",selectIma = "r_mrcz_98_zh",defaultImaRMB = "r_mrcz_9801_zh",defaultIma = "r_mrcz_9801_zh"}, } function DailyRechargePanel:InitComponent()