diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 49b7c79105..cd78cc4813 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1990,4 +1990,15 @@ function encodeURI(s) end s = string.gsub(s, "([^%w%.%- ])", function(c) return string.format("%%%02X", string.byte(c)) end) return string.gsub(s, " ", "+") +end + +-- 通过浏览器打开网页 +function OpenWeb(url) + if url then + if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.INNER_WEB_CONTROL) then + SDKMgr:OpenWeb(url) + else + UnityEngine.Application.OpenURL(url) + end + end end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index a89f4bf593..68f191b250 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -23,6 +23,7 @@ ServerConfigManager.SettingConfig = { USER_CHANNEL = "USER_CHANNEL", -- 获取登录信息渠道 USER_PROTO = "USER_PROTO", -- 用户协议功能是否开启 IS_NO_NOTICE = "IS_NO_NOTICE", -- 是否禁用公告 + INNER_WEB_CONTROL = "INNER_WEB_CONTROL", -- 是否使用内置浏览器 } diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua index 80ff9080fb..4371431aaa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua @@ -68,7 +68,7 @@ function TaiChuMiJuanPanel:OnShow(...) this.itemPres[i].bg.sprite = this.data[i].sprite this.itemPres[i].bg:SetNativeSize() Util.AddOnceClick(this.itemPres[i].go,function() - SDKMgr:OpenWeb(this.data[i].linkAddress) + OpenWeb(this.data[i].linkAddress) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 2c5357d3f5..fa6d5caf0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -192,10 +192,10 @@ function this:BindEvent() --用户隐私协议 Util.AddClick(this.instructionsBtn, function() - SDKMgr:OpenWeb(UrlList[1]) + OpenWeb(UrlList[1]) end) Util.AddClick(this.privacyBtn, function() - SDKMgr:OpenWeb(UrlList[2]) + OpenWeb(UrlList[2]) end) Util.AddClick(this.ConfirmBtn, function() local confirm = PlayerPrefs.GetInt("IHaveConfirmProtos")