diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index c54f94c97e..b2853801aa 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -839,7 +839,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8996595556620474117 RectTransform: m_ObjectHideFlags: 0 @@ -5054,10 +5054,10 @@ RectTransform: m_Father: {fileID: 2077706981486909814} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 770, y: -90} - m_SizeDelta: {x: 420, y: 90} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8440280213579013307 CanvasRenderer: @@ -13968,10 +13968,10 @@ RectTransform: m_Father: {fileID: 2077706981486909814} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 310, y: -90} - m_SizeDelta: {x: 420, y: 90} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1028344318468334643 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 77ac73f228..52b46cc99f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -6,7 +6,7 @@ this.LoginWay = { Account = 0, WeChat = 1 } SERVER_VERSION = tonumber(ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.ServerVersion) or 0) local ServerVersion = SERVER_VERSION -local IsShowNotice = false -- 正式服显示公告 +local IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin local IsDevelopLogin = true