From aae1e82a1c196a871b43bd5e4482887120b1d137 Mon Sep 17 00:00:00 2001 From: JieLing Date: Wed, 30 Jun 2021 09:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E3=80=91=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=88=97=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E7=9A=84Channel=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86=EF=BC=8C=E5=88=86=E5=BC=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=8C=BA=E5=88=86=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/ServerConfigManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index b5c202dcf3..4234e3ed37 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -19,6 +19,7 @@ ServerConfigManager.SettingConfig = { IS_NO_TALKING = "IS_NO_TALKING", -- 禁言 IS_LOAD_STREAMING = "IS_LOAD_STREAMING", -- 是否加载外部资源 CURVED_TEXT_CODE = "CURVED_TEXT_CODE", -- 是否加载外部资源 + USER_CHANNEL = "USER_CHANNEL", -- 获取登录信息渠道 } diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index e0fab0095a..518f387e4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -21,6 +21,7 @@ local LoginRoot_Channel = ServerConfigManager.GetVersionInfo("channel") local LoginRoot_Version = ServerConfigManager.GetVersionInfo("version") local LoginRoot_PackageVersion = ServerConfigManager.GetVersionInfo("packageVersion") local LoginRoot_NoticeChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.NOTICE_CHANNEL) or "" +local LoginRoot_UserChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.USER_CHANNEL) or "" local orginLayer local timeStamp = Time.realtimeSinceStartup @@ -601,13 +602,14 @@ end function this.RequestHttpLogin() RequestPanel.Show(Language[11144]) local url = "" + local user_channel = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel if IsSDKLogin then url = LoginRoot_Url .. "jl_loginserver/getUserInfo?openId=" .. AppConst.OpenId .. "&serverId=" .. LoginManager.ServerId .. "&token=" .. AppConst.TokenStr .. "&platform=" .. 1 - .. "&channel=" .. LoginRoot_Channel + .. "&channel=" .. user_channel .. "&sub_channel=" .. LoginRoot_SubChannel .. "&pid=" .. AppConst.SdkChannel --LoginManager.pt_pId .. "&gid=" .. AppConst.SdkPackageName --LoginManager.pt_gId @@ -625,7 +627,7 @@ function this.RequestHttpLogin() .. "&serverId=" .. LoginManager.ServerId .. "&token=111" .. "&platform=1" - .. "&channel=" .. LoginRoot_Channel + .. "&channel=" .. user_channel .. "&sub_channel=" .. LoginRoot_SubChannel .. "&admin=d53b3e8ef74bf72d8aafce3a1c8671a0" .. "&version=" .. LoginRoot_PackageVersion @@ -636,7 +638,7 @@ function this.RequestHttpLogin() .. "&serverId=" .. LoginManager.ServerId .. "&token=" .. LoginManager.token .. "&platform=4" - .. "&channel=" .. LoginRoot_Channel + .. "&channel=" .. user_channel .. "&sub_channel=" .. LoginRoot_SubChannel .. "&admin=d53b3e8ef74bf72d8aafce3a1c8671a0" .. "&version=" .. LoginRoot_PackageVersion