diff --git a/Assets/LuaFramework/Scripts/Utility/Util.cs b/Assets/LuaFramework/Scripts/Utility/Util.cs index 604c16ed24..6601b6be72 100644 --- a/Assets/LuaFramework/Scripts/Utility/Util.cs +++ b/Assets/LuaFramework/Scripts/Utility/Util.cs @@ -1125,8 +1125,11 @@ namespace GameLogic { spriteStr = spriteName.Remove(spriteName.Length - 2) + "vi"; } - } - return App.ResMgr.LoadAsset(spriteStr); + } + if (App.ResMgr.LoadAsset(spriteStr) == null) + return App.ResMgr.LoadAsset(spriteName); + else + return App.ResMgr.LoadAsset(spriteStr); } public static void LoadSpriteAsync(string spriteName, Image image) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index ead2ff25a2..5a403b693a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -8257,7 +8257,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: 57887231ae107c949be3c516782932c6, type: 3} + m_Sprite: {fileID: 21300000, guid: 0e02f1785918fa84389fd9b68b84b64f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23314,10 +23314,10 @@ RectTransform: m_Father: {fileID: 2608772048199405974} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 354, y: 0} - m_SizeDelta: {x: 0, y: 69.49} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 354, y: -35} + m_SizeDelta: {x: 52, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5851873919727852505 CanvasRenderer: @@ -24889,7 +24889,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -68.899994, y: 18.7} - m_SizeDelta: {x: 0, y: 70} + m_SizeDelta: {x: 380, y: 70} m_Pivot: {x: 1, y: 0} --- !u!114 &4265614787782436714 MonoBehaviour: @@ -37376,7 +37376,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1174661642300151069 RectTransform: m_ObjectHideFlags: 0 @@ -71932,10 +71932,10 @@ RectTransform: m_Father: {fileID: 2608772048199405974} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 300.5, y: 0} - m_SizeDelta: {x: 0, y: 68.95} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300.5, y: -35} + m_SizeDelta: {x: 55, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4888453323599395195 CanvasRenderer: @@ -101889,10 +101889,10 @@ RectTransform: m_Father: {fileID: 2608772048199405974} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 158, y: 0} - m_SizeDelta: {x: 0, y: 68.95} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 158, y: -35} + m_SizeDelta: {x: 230, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6388664606995184780 CanvasRenderer: