diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.jpg b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.jpg new file mode 100644 index 0000000000..d3369290dc Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.jpg differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.jpg.meta similarity index 93% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.jpg.meta index 918605c8db..53558d30ea 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a16e9bf3b6d5ed47afbe820463dbd45 +guid: 5e1fb525d399713498e544618ad00bac TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 8cc7b9d0c07dedd4688e5e50b4406133 + spriteID: ab5bc4ad4994a4e47b85f6e78c386da5 vertices: [] indices: edges: [] @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/l_mrlb_banner_zh - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png deleted file mode 100644 index 97525acf20..0000000000 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index 1763014bba..46a4216e4f 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -5043,7 +5043,7 @@ RectTransform: m_Children: - {fileID: 2367105735144841237} m_Father: {fileID: 7849088405690101068} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5214,7 +5214,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8252699432383455269} - {fileID: 7410245404359298873} - {fileID: 5847388856942350495} - {fileID: 2252884229931705644} @@ -10734,7 +10733,7 @@ RectTransform: - {fileID: 5847555686718925997} - {fileID: 6362890770084270319} m_Father: {fileID: 7849088405690101068} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -21080,80 +21079,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &6974412338561168170 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8252699432383455269} - - component: {fileID: 651432611527113706} - - component: {fileID: 8408451526431149350} - m_Layer: 5 - m_Name: Tip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8252699432383455269 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6974412338561168170} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7849088405690101068} - 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: -7, y: -113} - m_SizeDelta: {x: 659, y: 59} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &651432611527113706 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6974412338561168170} - m_CullTransparentMesh: 0 ---- !u!114 &8408451526431149350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6974412338561168170} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7069c1e839fa22a47aef174ab0296454, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &7138505660982474824 GameObject: m_ObjectHideFlags: 0 @@ -21308,7 +21233,7 @@ RectTransform: - {fileID: 8737620584903165049} - {fileID: 9069308257944265737} m_Father: {fileID: 7849088405690101068} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -21420,7 +21345,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7849088405690101068} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}