diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png new file mode 100644 index 0000000000..a5dbba5d20 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta new file mode 100644 index 0000000000..6136886f95 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan1.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 8433faecc652d374ab2a8398d559dfcb +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 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 648466f5dd362134c88f9ac9f9eeff56 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png new file mode 100644 index 0000000000..ff4286fa15 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta new file mode 100644 index 0000000000..edda957205 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan2.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: c0e07676b8a5eca4bb06956f73bfe3d2 +TextureImporter: + fileIDToRecycleName: + 21300000: c_czlb_yuan_vi + 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 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: c_czlb_yuan_vi + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 46 + height: 46 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d5d1e8a348694964f832e8100718a150 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4513975ebe66e094fba197a3089d49dc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: lz4/artfont_vi/c_czlb_yuan_vi + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png new file mode 100644 index 0000000000..4080f75a4b Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta new file mode 100644 index 0000000000..7b2d489290 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_yuan3.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 0fd43dce91385d447a30170798eb1543 +TextureImporter: + fileIDToRecycleName: + 21300000: c_czlb_yuan_en + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: c_czlb_yuan_en + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 46 + height: 46 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5298916aeffd9b249863507cd6616dad + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 52a7d0d031ebb9d47b672fa166c2f162 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: lz4/artfont_en/c_czlb_yuan_en + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 3935267eda..d5f6e1350f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -43,6 +43,17 @@ function DailyRechargePanel:InitComponent() local titleText = Util.GetGameObject(parent, "Text"):GetComponent("Text") titleText.text = Language[12109] SetTextVerTial(titleText,Vector3.New(102.07,18.2,0)) + local yuanIma = Util.GetGameObject(self.transform, "frame/bg/descbg/dollar"):GetComponent("Image") + local yuanText = Util.GetGameObject(self.transform, "frame/bg/descbg/value") + if MoneyUtil.MT == MoneyType.RMB then + yuanIma.sprite = Util.LoadSprite("c_czlb_yuan1") + yuanIma.transform.localPosition = Vector3.New(163,10,0) + yuanText.transform.localPosition = Vector3.New(78,21,0) + else + yuanIma.sprite = Util.LoadSprite("c_czlb_yuan2") + yuanIma.transform.localPosition = Vector3.New(75.21,25.8,0) + yuanText.transform.localPosition = Vector3.New(166.34,15.9,0) + end end function DailyRechargePanel:BindEvent()