From c0a561e75e6e567754960e57dcbc1b5602fb9199 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 22 Jun 2021 17:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E5=91=8A=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=AC=E5=91=8A=E5=9C=A8=E5=88=86=E5=AD=90=E5=8C=85?= =?UTF-8?q?=E6=97=B6=E9=85=8D=E7=BD=AE=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/PackageManager.lua | 6 ++++++ Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index 0ac7bf0c18..5765838a2c 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -36,6 +36,12 @@ function PackageManager.GetPackageID() return this.StreamConfig.PackID end end +-- 获取子渠道包公告配置 +function PackageManager.GetSubNoticeID() + if this.StreamConfig then + return this.StreamConfig.SubNoticeID + end +end -- 获取包名 function PackageManager.GetPackageName() return this.PackageName diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 5316bc42e1..e0fab0095a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -277,9 +277,9 @@ function this.ShowNotice() RequestPanel.Show(Language[11137]) --LogError("LoginRoot_NoticeChannel=="..LoginRoot_NoticeChannel) -- 如果有渠道包配置的id则加上 - local packId = PackageManager.GetPackageID() - if packId then - LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. packId + local subNoticeID = PackageManager.GetSubNoticeID() + if subNoticeID then + LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. subNoticeID end networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..LoginRoot_NoticeChannel,function (str) UIManager.OpenPanel(UIName.NoticePopup,str)