diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index ae861cadbd..1ba30346a7 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -93,4 +93,8 @@ function PackageManager.UnloadVideo() -- resMgr:UnLoadAsset(this.config.VideoName) end end +end + +function PackageManager.GetCCCode() + return ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.PACKAGE_CC_CODE) or "" end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index c88d7f6800..c129fb6f80 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -44,7 +44,7 @@ function this.LoginRequest(openId, func) data.ip_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetLocalIpAddress() or "" data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or "" data.openId = openId - data.cc_id = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.PACKAGE_CC_CODE) or "" + data.cc_id = PackageManager.GetCCCode() data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid data.platform_s = AppConst.Platform --and "ADR" or "PC" diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 53bebbe290..79fbcdb077 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -119,17 +119,14 @@ function this.RequestPay(context) params.serverID = PlayerManager.serverInfo.server_id params.serverName = PlayerManager.serverInfo.name -- 角色相关 - params.roleID = tostring(PlayerManager.uid).."_"..tostring(context.Id) + params.roleID = tostring(PlayerManager.uid).."_"..tostring(context.Id).."_"..PackageManager.GetCCCode() params.roleName = PlayerManager.nickName params.roleLevel = PlayerManager.level params.vip = tostring(VipManager.GetVipLevel()) params.guildID = PlayerManager.familyId -- 其他 params.payNotifyUrl = "" - params.extension = tostring(PlayerManager.uid).."_"..tostring(context.Id)--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) + params.extension = tostring(PlayerManager.uid).."_"..tostring(context.Id).."_"..PackageManager.GetCCCode() SDKMgr:Pay(params) --