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)