From c56a54665c35e9b428deae7ba6a8c0e1f66bf838 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 25 Jul 2020 19:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=8F=90=E5=AE=A1=E6=9C=8D=E5=92=8C=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 7 +++++-- Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index b581b1e226..e05743e525 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -4,6 +4,9 @@ LoginPanel = Inherit(BasePanel) local this = LoginPanel this.LoginWay = { Account = 0, WeChat = 1 } + +local ServerVersion = 1 + local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin local IsDevelopLogin = false @@ -239,8 +242,8 @@ function this.RefreshLoginStatus(loginResp) AppConst.SdkChannel = result[5] AppConst.SdkPackageName = AndroidDeviceInfo.Instance:GetPackageName() -- this.SetSDKExtensionParams(result[4]) - Log(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s", LoginRoot_Url, AppConst.OpenId, LoginRoot_Channel, LoginRoot_SubChannel)) - networkMgr:SendGetHttp(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s", LoginRoot_Url, AppConst.OpenId, LoginRoot_Channel, LoginRoot_SubChannel), + Log(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s", LoginRoot_Url, AppConst.OpenId, LoginRoot_Channel, LoginRoot_SubChannel, ServerVersion)) + networkMgr:SendGetHttp(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s", LoginRoot_Url, AppConst.OpenId, LoginRoot_Channel, LoginRoot_SubChannel, ServerVersion), this.OnReceiveServerList, nil, nil, nil) else this.sdkLoginBtn:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 96c7a37c3c..b3d8bbb4c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -78,7 +78,7 @@ function this.RequestPay(context) params.guildID = PlayerManager.familyId -- 其他 params.payNotifyUrl = "" - params.extension = string.format("%s_%s", PlayerManager.uid, context.Id)--tostring(context.Id) + params.extension = string.format("%s_%s_%s", PlayerManager.uid, context.Id, VersionManager:GetVersionInfo("subChannel"))--tostring(context.Id) --string.format("%s_%s_%s_%s_%s_%s", -- AppConst.OpenId,context.Id,context.Price,PlayerManager.uid, -- PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name)