diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index cea2415a69..3a7a047b7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -39316,7 +39316,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3994331577905171257} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -129193,7 +129193,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 0} m_Children: [] m_Father: {fileID: 3994331577905171257} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -180850,9 +180850,9 @@ RectTransform: m_LocalScale: {x: 1.3, y: 1.3, z: 0} m_Children: - {fileID: 4685898274264155040} - - {fileID: 463885800620499347} - {fileID: 2669814021149086866} - {fileID: 3431436836403605798} + - {fileID: 463885800620499347} m_Father: {fileID: 8285412012016129936} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -198179,7 +198179,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &463885800620499347 RectTransform: m_ObjectHideFlags: 0 @@ -198192,12 +198192,12 @@ RectTransform: m_LocalScale: {x: 0.8, y: 0.8, z: 0.88} m_Children: [] m_Father: {fileID: 3994331577905171257} - m_RootOrder: 1 + 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} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 90, y: 90} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4342973248072344321 CanvasRenderer: @@ -198227,7 +198227,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: 7b0528d4bfc775b409624efa721e2ed9, type: 3} + m_Sprite: {fileID: 21300000, guid: 6a38a976ddb2e4b40a8b9e1b8645b865, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 891919a72a..afe1b62fb4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -605,7 +605,7 @@ function this.ShowGuide(id) if GuideConfig[id].Desc then local str = GetLanguageStrById(GuideConfig[id].Desc) - str = string.gsub(str, "{", "") + str = string.gsub(str, "{", "") str = string.gsub(str, "}", "") this.desc.text = str end