diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi100_zh.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi100_zh.png index b29ff47636..c2689e570b 100644 Binary files a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi100_zh.png and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi100_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi200_zh.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi200_zh.png index 1d0f1a0a1c..f0cf66eae8 100644 Binary files a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi200_zh.png and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi200_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi6_zh.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi6_zh.png index a356774965..d452de01e1 100644 Binary files a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi6_zh.png and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_anniuzi6_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_100.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_100.png new file mode 100644 index 0000000000..69f710a4fb Binary files /dev/null and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_100.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_100.png.meta b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_100.png.meta new file mode 100644 index 0000000000..3661c13e34 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_100.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ab0d722a13f4962408dbed2bbccc69af +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: 5189a93e934daea489de918306746fe8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FirstRechargeAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_200.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_200.png new file mode 100644 index 0000000000..ffab45dd02 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_200.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_200.png.meta b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_200.png.meta new file mode 100644 index 0000000000..166e701954 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_200.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b227c78fabe5d204b998a9d391999ee3 +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: 05b364e30cce8754eb2f093c2e060edf + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FirstRechargeAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_500.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_500.png new file mode 100644 index 0000000000..227944bde3 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_500.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_500.png.meta b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_500.png.meta new file mode 100644 index 0000000000..9c53d1f9c8 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_500.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6fab106cf89a15940b0cce7145669656 +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: b128b756d4f2e654ea7fbb8b9117d238 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FirstRechargeAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_6.png b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_6.png new file mode 100644 index 0000000000..4fe5cd2763 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_6.png differ diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_6.png.meta b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_6.png.meta new file mode 100644 index 0000000000..20352551d2 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FirstRechargeAtlas/r_shouchong_hero_6.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 7284cce420b354742923dd04900c737c +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: acdb08086d586014ea99e28ff6501ee1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FirstRechargeAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png index de6bc69e48..05edb092c6 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index e448c55137..c029f49209 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -5412,7 +5412,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ad4c2ea43e75c4f4ba7f84f241ad7b0f, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index b89046ff15..86e7b6cd32 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -29,6 +29,19 @@ local TipConfig = { [1] = "s_shouchong_$1_zh", [2] = "s_shouchong_15_zh" }, + [MoneyType.RMB] = { + [1] = "s_shouchong_anniuzi6_zh", + [2] = "s_shouchong_anniuzi100_zh", + [3] = "s_shouchong_anniuzi200_zh", + [4] = "s_shouchong_anniuzi500_zh", + }, +} + +local heroImage={ + [1]="r_shouchong_hero_6", + [2]="r_shouchong_hero_100", + [3]="r_shouchong_hero_200", + [4]="r_shouchong_hero_500", } -- local _MoneyDataNum = {} @@ -45,6 +58,7 @@ function FirstRechargePanel:InitComponent() self.stageImage30 = Util.GetGameObject(self.transform, "frame/stageImage/Image2"):GetComponent("Image") self.stageImage100 = Util.GetGameObject(self.transform, "frame/stageImage/Image3"):GetComponent("Image") self.stageImage200 = Util.GetGameObject(self.transform, "frame/stageImage/Image4"):GetComponent("Image") + self.hero = Util.GetGameObject(self.transform, "frame/bg_live/Image (1)"):GetComponent("Image") self.stageImage6.sprite = self.spLoader:LoadSprite(TipConfig[MoneyUtil.MT][1]) self.stageImage30.sprite = self.spLoader:LoadSprite(TipConfig[MoneyUtil.MT][2]) self.stageImage100.sprite = self.spLoader:LoadSprite(TipConfig[MoneyUtil.MT][3]) @@ -232,6 +246,7 @@ function FirstRechargePanel:OnTabClicked(index) end function FirstRechargePanel:OnTabChanged(index) + self.hero.sprite=self.spLoader:LoadSprite(heroImage[index]) for i, select in ipairs(self.selectTabs) do select:SetActive(i == index) end