From 53912b5384819b69a11c492acd77dd1dbe929e23 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 2 Apr 2021 15:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=8F=E5=B9=95=E9=80=82=E9=85=8D?= =?UTF-8?q?=E3=80=91CanvasScaler=E6=B7=BB=E5=8A=A0=E5=88=B0config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Framework/Manager/ServerConfigManager.lua | 1 + .../~Lua/Framework/Manager/UIManager.lua | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 1f102697f1..7bd86cfb58 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -7,6 +7,7 @@ ServerConfigManager.SettingConfig = { ThinkAnalysis_GetDeviceID = "ThinkAnalysis_GetDeviceID", -- 数数获取DeviceID方法 LayoutBuilderWrap = "LayoutBuilderWrap", -- 强制刷新layout组件大小的方法修改到lua中调用 LanguagePackager = "LanguagePackager", -- 本地化处理 + UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 本地化处理 } diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua index 475b5d3823..bf4819d036 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua @@ -62,7 +62,10 @@ function UIManager.Initialize() gameObj.name = "UIRoot" this.eventSystem = GameObject.Find("EventSystem") this.uiRoot = gameObj - this.canvasScaler = gameObj.transform:Find("UIRoot"):GetComponent("CanvasScaler") + this.isCanvasScaler = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.UI_Layout_CanvasScaler) + if this.isCanvasScaler then + this.canvasScaler = gameObj.transform:Find("UIRoot"):GetComponent("CanvasScaler") + end this.uiNode = gameObj.transform:Find("UIRoot/UINode") this.fullNode = gameObj.transform:Find("UIRoot/FullNode") this.fixedNode = gameObj.transform:Find("UIRoot/FixedNode") @@ -122,8 +125,9 @@ function UIManager.Adapter() -- 屏幕大小 UIManager.width = Screen.width UIManager.height = Screen.height - - this.canvasScaler.matchWidthOrHeight = 0.5 + if this.isCanvasScaler then + this.canvasScaler.matchWidthOrHeight = 0.5 + end -- 计算屏幕比例的比值,用于部分界面进行屏幕适配的缩放 UIManager.adapterScale = (1920/1080)/(Screen.height / Screen.width) @@ -166,7 +170,10 @@ function UIManager.Adapter() elseif n < standard then -- 计算屏幕比例的比值,用于部分界面进行屏幕适配的缩放 UIManager.adapterScale = 1 - this.canvasScaler.matchWidthOrHeight = 1 + + if this.isCanvasScaler then + this.canvasScaler.matchWidthOrHeight = 1 + end -- 实际分辨率 = 屏幕分辨率 / 比例因子