diff --git a/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs b/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs index 8454bf48f4..7040f5a919 100644 --- a/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs +++ b/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs @@ -33,7 +33,7 @@ namespace SDK SDKManager.Instance.CustomEvent(ec[1], ec[2], "1"); SDKManager.Instance.CustomEvent(ec[2], ec[2], "2"); } - else if (pn == "com.tcx.pass") + else if (pn == "com.tcxhw.project"|| pn == "com.jltest.www") { SDKManager.Instance.CustomEvent(ec[1], ec[2], "1"); SDKManager.Instance.CustomEvent(ec[4], ec[2], "2"); diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index a42547e97e..5163ab301a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -25,7 +25,17 @@ function this.Pay(context) payData.Desc = rechargeConfig.Desc payData.Price = rechargeConfig.Price payData.Type = rechargeConfig.Type - payData.RechargeId = rechargeConfig.RechargeId + + -- 判断计费点 + if AppConst.SdkPackageName == "com.tcxazcsb.pass" or AppConst.SdkPackageName == "com.tcxaz.pass" then -- 海外GP 测试+正式 + payData.RechargeId = rechargeConfig.RechargeId + elseif AppConst.SdkPackageName == "com.jltest.www" then -- 海外Ios测试 + payData.RechargeId = rechargeConfig.RechargeId2 + elseif AppConst.SdkPackageName == "com.tcxhw.project" then -- 海外Ios正式 + payData.RechargeId = rechargeConfig.RechargeId3 + else + payData.RechargeId = rechargeConfig.Id + end this.RequestPay(payData) end @@ -53,7 +63,7 @@ function this.RequestPay(context) end end local params = SDK.SDKPayArgs.New() - params.productId = context.Id + params.productId = context.RechargeId params.productName = context.Name or "" params.productDesc = context.Desc or "" params.price = price * 100 -- 以分为单位 @@ -72,7 +82,7 @@ function this.RequestPay(context) params.guildID = PlayerManager.familyId -- 其他 params.payNotifyUrl = "" - params.extension = string.format("%s_%s_%s", PlayerManager.uid, context.Id, VersionManager:GetVersionInfo("subChannel"))--tostring(context.Id) + params.extension = 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) diff --git a/Assets/Scripts/GameInit/GameStart.cs b/Assets/Scripts/GameInit/GameStart.cs index 59e98e0e6e..d359449b56 100644 --- a/Assets/Scripts/GameInit/GameStart.cs +++ b/Assets/Scripts/GameInit/GameStart.cs @@ -62,7 +62,7 @@ public class GameStart : MonoBehaviour Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent(); image2.DOFade(1, 0).OnComplete(() =>{ - image.DOFade(0, 0).SetDelay(2).OnComplete(() =>{ + image2.DOFade(0, 0).SetDelay(2).OnComplete(() =>{ image.color = new Color(image.color.r, image.color.g, image.color.b, 0); image.DOFade(1, 1).OnComplete(() => { image.DOFade(0, 1).SetDelay(2).OnComplete(() => {