diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index f4247b4c9d..702ad1bb4d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -50,17 +50,12 @@ end -- function ServerConfigManager.GetConfigInfo(key) -- 包版本大于启用的版本使用新的配置 - if AppConst.isSDK then - LogError(tostring(AppConst.isSDK)) - LogError(tostring(AndroidDeviceInfo.Instance:GetVersionCode())) - LogError(tostring(_ActiveCode)) - LogError(tostring(AndroidDeviceInfo.Instance:GetVersionCode() >= _ActiveCode)) - end if not AppConst.isSDK or AndroidDeviceInfo.Instance:GetVersionCode() >= _ActiveCode then if not ConfigMgr then ConfigMgr=App.ConfigMgr end local s = ConfigMgr:GetConfigInfo(key) + LogError(key.."|"..tostring(s)) return s end end diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index d586380651..db3bc32027 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -35,7 +35,9 @@ if not AppConst.isSDKLogin then return end end -- 打点事件 function this.SendCustomEvent(event, data,type) - -- SDKMgr:CustomEvent(event,data,type) + if AppConst.isSDKLogin then + SDKMgr:CustomEvent(event,data,type) + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index f0438a9d8e..52fe7f2abc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -28,6 +28,11 @@ function this.onSdkPayResult(id) this.EventTrigger[id](id) this.EventTrigger[id] = nil end + local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, id) + if rechargeConfig then + local Price = tostring(rechargeConfig.Price) + CustomEventManager.SendCustomEvent("mhtPay", Price ,"4") + end end function this.Pay(id, func)