diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta index 4940b3dd18..e3f59a8eac 100644 --- a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_fx.png.meta @@ -69,6 +69,17 @@ 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: [] diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta index 1f3667cbcf..68af9040dc 100644 --- a/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_Activity8/t_tianxiangjiren_shenjiang_jmm.png.meta @@ -69,6 +69,17 @@ 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: [] diff --git a/Assets/ManagedResources/BG/UI/UpGradePackage/w_xianshizhekou_juese.png b/Assets/ManagedResources/BG/UI/UpGradePackage/w_xianshizhekou_juese.png index 8066d7f04a..08b815393a 100644 Binary files a/Assets/ManagedResources/BG/UI/UpGradePackage/w_xianshizhekou_juese.png and b/Assets/ManagedResources/BG/UI/UpGradePackage/w_xianshizhekou_juese.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png index b61f705198..82fd72ac0b 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png index 5877b0c266..1a503bf7b6 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png index decb19377c..580bb614ee 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png index 508dab6a21..e19bb70040 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png index b126df33c8..d1ddf09217 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png index 1c1cbb3897..c63f8a3614 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/lingjijuyuan.png b/Assets/ManagedResources/DynamicAtlas/lingjijuyuan.png index fab9dbac0e..973989a542 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/lingjijuyuan.png and b/Assets/ManagedResources/DynamicAtlas/lingjijuyuan.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/m_syjm_0026_png.png b/Assets/ManagedResources/DynamicAtlas/m_syjm_0026_png.png index 2a5fc1cb1b..0ac4d5ba66 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/m_syjm_0026_png.png and b/Assets/ManagedResources/DynamicAtlas/m_syjm_0026_png.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/shixueguimo.png b/Assets/ManagedResources/DynamicAtlas/shixueguimo.png index 34b1e5c943..f63f18ae2f 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/shixueguimo.png and b/Assets/ManagedResources/DynamicAtlas/shixueguimo.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/w_wd_boss.png b/Assets/ManagedResources/DynamicAtlas/w_wd_boss.png index 119ea78826..4f13d4dac5 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/w_wd_boss.png and b/Assets/ManagedResources/DynamicAtlas/w_wd_boss.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab index 5de66beb39..29fe7431bd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab @@ -10046,10 +10046,10 @@ RectTransform: m_Father: {fileID: 2446092371378317743} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 149, y: -6.33} - m_SizeDelta: {x: 740, y: 393} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320830795291865921 CanvasRenderer: @@ -10079,7 +10079,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: 4a113cfcb8a88314d9ff385628f91c78, type: 3} + m_Sprite: {fileID: 21300000, guid: b9bce0f27372ced4d9b8bfb12d6edd6c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15507,10 +15507,10 @@ RectTransform: m_Father: {fileID: 7912888359326409945} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 149, y: 13} - m_SizeDelta: {x: 1024, y: 1145} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6451737078576014230 CanvasRenderer: @@ -15540,7 +15540,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: 27902c70c475c96459f6c00d87a1e441, type: 3} + m_Sprite: {fileID: 21300000, guid: 27ac6faf33c19e74fb250cbded1cd3db, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20665,10 +20665,10 @@ RectTransform: m_Father: {fileID: 7709482234995581048} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 149, y: 13} - m_SizeDelta: {x: 1024, y: 1145} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7933083477942549309 CanvasRenderer: @@ -20698,7 +20698,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: 27902c70c475c96459f6c00d87a1e441, type: 3} + m_Sprite: {fileID: 21300000, guid: 9c10041664791df4a9a9247d658e86ae, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -25738,10 +25738,10 @@ RectTransform: m_Father: {fileID: 4256510347403179104} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 149, y: 13} - m_SizeDelta: {x: 1024, y: 1145} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4987689455791440949 CanvasRenderer: @@ -25771,7 +25771,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: 27902c70c475c96459f6c00d87a1e441, type: 3} + m_Sprite: {fileID: 21300000, guid: 1e76bcbdbe2a5db44bb225544273cb65, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1