diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index fde24fe3f8..602c6ba9df 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -333,28 +333,33 @@ function this.RequestProtos(userId) this.ConfirmImg:SetActive(PlayerPrefs.GetInt("IHaveConfirmProtos") == 1) UrlList[1] = "" UrlList[2] = "" - networkMgr:SendGetHttp(LoginRoot_Url.."jl_loginserver/getAgreement?gamePack=com.jieling.server", function (str) - local json = require 'cjson' - local data = json.decode(str) - if data.parms then - UrlList[1] = data.parms.instructions - UrlList[2] = data.parms.privacy - Log("instructionsUrl:"..tostring(UrlList[1]).." privacyUrl:"..tostring(UrlList[2])) - HaveConfirm = true - else - this.protos:SetActive(false) - Log("用户和隐私协议地址为空") - HaveConfirm = false - return - end - if UrlList[1] ~= "" and UrlList[2] ~="" then - this.protos:SetActive(true) - HaveConfirm = true - else - this.protos:SetActive(false) - HaveConfirm = false - end - end, nil, nil, nil) + local PackageID = PackageManager.GetPackageID() + local serverStr = "" + if PackageID then + serverStr = LoginRoot_Channel.. PackageID + networkMgr:SendGetHttp(LoginRoot_Url.."jl_loginserver/getAgreement?gamePack="..serverStr, function (str) + local json = require 'cjson' + local data = json.decode(str) + if data.parms then + UrlList[1] = data.parms.instructions + UrlList[2] = data.parms.privacy + Log("instructionsUrl:"..tostring(UrlList[1]).." privacyUrl:"..tostring(UrlList[2])) + HaveConfirm = true + else + this.protos:SetActive(false) + Log("用户和隐私协议地址为空") + HaveConfirm = false + return + end + if UrlList[1] ~= "" and UrlList[2] ~="" then + this.protos:SetActive(true) + HaveConfirm = true + else + this.protos:SetActive(false) + HaveConfirm = false + end + end, nil, nil, nil) + end end --界面销毁时调用(用于子类重写)