From f3943ff8d55c2147759de3a3314c0e67183e83d9 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 20 Nov 2024 12:07:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...jsxgq_biaoti.png => j_jsxgq_biaoti_zh.png} | Bin ...ti.png.meta => j_jsxgq_biaoti_zh.png.meta} | 26 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) rename Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/{j_jsxgq_biaoti.png => j_jsxgq_biaoti_zh.png} (100%) rename Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/{j_jsxgq_biaoti.png.meta => j_jsxgq_biaoti_zh.png.meta} (96%) diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png b/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png rename to Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti_zh.png diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png.meta rename to Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti_zh.png.meta index 32141a0692..929c55d875 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/ArtFont/j_jsxgq_biaoti_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 50fa84af15f8fb3439b90b6455a12bdb +guid: ce0a492d340313d40bc0df236485f7c0 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -69,17 +69,6 @@ TextureImporter: 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 - serializedVersion: 2 buildTarget: iPhone maxTextureSize: 2048 @@ -91,13 +80,24 @@ TextureImporter: 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: ee526294cca4f0c4e9edcf705671439f + spriteID: c423d1f267c852e44a75aeb29737a00d vertices: [] indices: edges: [] From a8f795f9e8170316fda52361c6c840e18eab7e29 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 20 Nov 2024 13:12:06 +0800 Subject: [PATCH 2/2] 1 --- .../ArtFont_en/gm_xuChongSong_en.png | Bin 0 -> 15206 bytes .../ArtFont_en/gm_xuChongSong_en.png.meta | 110 ++++++++++++++++++ .../UI/EightDayGift/EightDayGiftPanel.prefab | 2 +- .../FightLevelOpenChapterPopup.prefab | 2 +- 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png create mode 100644 Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png.meta diff --git a/Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png b/Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png new file mode 100644 index 0000000000000000000000000000000000000000..390e2092ab73973f18c8f8085fdf420cefec97c8 GIT binary patch literal 15206 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png.meta b/Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png.meta new file mode 100644 index 0000000000..b0c6030e6e --- /dev/null +++ b/Assets/ManagedResources/ArtFont_en/gm_xuChongSong_en.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 77da32438771dc2408ff6b2ebb12045d +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: 33167327515e54a4fa0a58cd6e4699e1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab index 15470e5cb9..996cc03991 100644 --- a/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab @@ -21358,7 +21358,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 8.857498, y: 47.7} - m_SizeDelta: {x: 367.28, y: 49.32} + m_SizeDelta: {x: 367.28, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6150216360578148273 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelOpenChapterPopup.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelOpenChapterPopup.prefab index 684e6e2570..e8d3cc4251 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelOpenChapterPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelOpenChapterPopup.prefab @@ -76913,7 +76913,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: 50fa84af15f8fb3439b90b6455a12bdb, type: 3} + m_Sprite: {fileID: 21300000, guid: ce0a492d340313d40bc0df236485f7c0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1