diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png new file mode 100644 index 0000000000..e1f221888b Binary files /dev/null and b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png differ diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png.meta b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png.meta new file mode 100644 index 0000000000..b3fe549f1f --- /dev/null +++ b/Assets/ManagedResources/Atlas/EightDayAtlas/ArtFont/b_baridenglu_slogan08_zh 1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5781e0ea391fe9e42b940d249e96e16c +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: 6e6e359966ed14647ad3661118516fb3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: EightDayAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/b_baridenglu_slogan08_4geren.png b/Assets/ManagedResources/Atlas/EightDayAtlas/b_baridenglu_slogan08_4geren.png new file mode 100644 index 0000000000..3e902bd997 Binary files /dev/null and b/Assets/ManagedResources/Atlas/EightDayAtlas/b_baridenglu_slogan08_4geren.png differ diff --git a/Assets/ManagedResources/Atlas/EightDayAtlas/b_baridenglu_slogan08_4geren.png.meta b/Assets/ManagedResources/Atlas/EightDayAtlas/b_baridenglu_slogan08_4geren.png.meta new file mode 100644 index 0000000000..f2b4ac1804 --- /dev/null +++ b/Assets/ManagedResources/Atlas/EightDayAtlas/b_baridenglu_slogan08_4geren.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4528569438bc7614e88c1a8f819e698a +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: 43fd582ca81a1544b87b86df973931d4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: EightDayAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab index 984f2980ef..77f318bea3 100644 --- a/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab @@ -336,7 +336,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: $49.99 + m_Text: "\uFFE5328" --- !u!1 &2776762708753556006 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index a09385b641..738e3cbf52 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua @@ -97,6 +97,15 @@ function EightDayGiftPanel:SetBg(i) ren:GetComponent("Image").sprite = Util.LoadSprite(bgName) ren:GetComponent("Image").enabled= true this.btnPreview:SetActive(false) + elseif i > 3 then + ren.transform.localPosition = Vector3.New(-74,350,0) + text = "b_baridenglu_slogan08_zh 1"--文字 + id = day_picture[i][4]--itemviewId + bgName = "b_baridenglu_slogan08_4geren"--动效资源名字 + tip.sprite = Util.LoadSprite(text) + ren:GetComponent("Image").sprite = Util.LoadSprite(bgName) + ren:GetComponent("Image").enabled= true + this.btnPreview:SetActive(false) else this.btnPreview:SetActive(true) text = tostring(day_picture[i][3])--文字 @@ -112,7 +121,7 @@ function EightDayGiftPanel:SetBg(i) end else - if curDay == 3 or curDay ==2 and rewardData.mission[2].state == 1 then + if curDay == 3 or (curDay ==2 and rewardData.mission[2].state == 1) then this.btnPreview:SetActive(false) ren.transform.localPosition = Vector3.New(-74,100,0) text = "b_baridenglu_slogan03_zh"--文字 @@ -121,6 +130,15 @@ function EightDayGiftPanel:SetBg(i) tip.sprite = Util.LoadSprite(text) ren:GetComponent("Image").sprite = Util.LoadSprite(bgName) ren:GetComponent("Image").enabled= true + elseif curDay > 3 or (curDay == 3 and rewardData.mission[3].state == 1) then + this.btnPreview:SetActive(false) + ren.transform.localPosition = Vector3.New(-74,350,0) + text = "b_baridenglu_slogan08_zh 1"--文字 + id = day_picture[3][4]--itemviewId + bgName = "b_baridenglu_slogan08_4geren"--动效资源名字 + tip.sprite = Util.LoadSprite(text) + ren:GetComponent("Image").sprite = Util.LoadSprite(bgName) + ren:GetComponent("Image").enabled= true else this.btnPreview:SetActive(true) if rewardData.mission[curDay].state == 1 and curDay ~= 8 then