From 959d7d2cced5ea2d28a1bf4d55578756da294911 Mon Sep 17 00:00:00 2001 From: tech Date: Fri, 30 Aug 2024 10:12:40 +0800 Subject: [PATCH] [M] sync from n3-world --- .../Assets/Plugins/Android/AndroidManifest.xml.meta | 2 +- .../Assets/Plugins/Android/gradleTemplate.properties | 11 ++++++++--- .../Plugins/Android/gradleTemplate.properties.meta | 2 +- .../Assets/Plugins/Android/mainTemplate.gradle.meta | 2 +- .../Plugins/Android/settingsTemplate.gradle.meta | 2 +- .../Packages/tysdk/Plugins/Android/SDKManager.java | 6 ------ .../Packages/tysdk/Runtime/TYSdkFacade.cs | 4 ++-- .../Packages/tysdk/Runtime/TYSdkFacade_Pay.cs | 4 ++-- .../Packages/tysdk/Runtime/UnityBridgeFunc.cs | 1 - 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml.meta b/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml.meta index 544dbed..38957fa 100644 --- a/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml.meta +++ b/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 339beab439a427b4b9e96b2accf2e146 +guid: f7bdbdeda604c424a973aa7041e3c26b TextScriptImporter: externalObjects: {} userData: diff --git a/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties b/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties index e8f66b5..a016918 100644 --- a/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties +++ b/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties @@ -1,5 +1,10 @@ -unityStreamingAssets=.unity3d**STREAMING_ASSETS** +org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M +org.gradle.parallel=true +unityStreamingAssets=**STREAMING_ASSETS** android.useAndroidX=true android.enableJetifier=true -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -android.suppressUnsupportedCompileSdk=33 +# Android Resolver Properties Start +android.useAndroidX=true +android.enableJetifier=true +# Android Resolver Properties End +**ADDITIONAL_PROPERTIES** diff --git a/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties.meta b/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties.meta index 8d18021..aa41322 100644 --- a/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties.meta +++ b/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86d31d9e59f392d4b8538e7dcf812ec3 +guid: 912dbed58f935174cb6d176108ee38ac DefaultImporter: externalObjects: {} userData: diff --git a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle.meta b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle.meta index 4dd0559..8fef003 100644 --- a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle.meta +++ b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: edc76530d8406f74787197e56949feb3 +guid: 5d767120510450d4486a11ec20e9fa78 DefaultImporter: externalObjects: {} userData: diff --git a/sdk-intergration/Assets/Plugins/Android/settingsTemplate.gradle.meta b/sdk-intergration/Assets/Plugins/Android/settingsTemplate.gradle.meta index 458d615..120c83a 100644 --- a/sdk-intergration/Assets/Plugins/Android/settingsTemplate.gradle.meta +++ b/sdk-intergration/Assets/Plugins/Android/settingsTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2f880703e7cd08469817aea47e80830 +guid: 6799ef31c0d9547429f7d9f65e728c3a DefaultImporter: externalObjects: {} userData: diff --git a/sdk-intergration/Packages/tysdk/Plugins/Android/SDKManager.java b/sdk-intergration/Packages/tysdk/Plugins/Android/SDKManager.java index 963b921..dcd18b9 100644 --- a/sdk-intergration/Packages/tysdk/Plugins/Android/SDKManager.java +++ b/sdk-intergration/Packages/tysdk/Plugins/Android/SDKManager.java @@ -245,8 +245,6 @@ public class SDKManager { public static void UnityKnowNew(String productId, String productPrice, String productName, String productCount, String prodorderId, String appInfo, String ptype) { - Log.e(TAG,"开始支付-----"+ "productId:" + productId+" "+ "productPrice:" + productPrice+" "+ "productName:" + productName +" "+ "prodorderId:" + prodorderId +" "+ "appInfo:" + appInfo +" "+ "ptype:" + ptype); - PayEventData.PayData payData = new PayEventData.PayData(); final PayEventData.PayReq mPayReq = new PayEventData.PayReq(); mPayReq.prodId = productId; @@ -334,14 +332,10 @@ public class SDKManager { public static void GAReportParams(int type, String eventstr, String paramstr) { - Log.e(TAG,"GAReportParams : " + type + " \n" + eventstr + " \n" + paramstr); - - SDKLog.i("GAReportParams : " + type + " \n" + eventstr + " \n" + paramstr); ParamsBuilder paramsBuilder = ParamsBuilder.newInstance(); Gson gson = new Gson(); Map map = gson.fromJson(paramstr, new TypeToken>(){}.getType()); for (String key : map.keySet()) { - System.out.println("Key = " + key + ", Value = " + map.get(key)); if(!TextUtils.isEmpty(key) && map.get(key) != null){ paramsBuilder.append(key, map.get(key).toString()); } diff --git a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs index f1922eb..950e7a5 100644 --- a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs +++ b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs @@ -146,7 +146,7 @@ namespace tysdk public void Logout() { UnityEngine.Debug.Log("Logout"); - if(_accountInfo != null) return; + if(_accountInfo != null) { UnityBridgeFunc.UnityLogOutByChannel(_accountInfo.channel); } @@ -396,7 +396,7 @@ namespace tysdk string tycs = tyurl == defaultTyurl ? - "https://hwcsh.tygameworld.com /template/appCancel/note.html" + "https://hwcsh.tygameworld.com/template/appCancel/note.html" : "https://customermanage-feature-test-web-test.tuyougame.cn/appCancel/note.html"; diff --git a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade_Pay.cs b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade_Pay.cs index 224c74f..256ad92 100644 --- a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade_Pay.cs +++ b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade_Pay.cs @@ -19,7 +19,7 @@ namespace tysdk =================================================*/ //public async Task Pay(string prodId, string prodPrice, string prodName, int count, string pType, string price_amount_micros =null) - public async Task Pay(SKUDetail prod, int count) + public async Task Pay(SKUDetail prod, int count, float usdprice) { if (!IsLoggedIn) return new PaymentInfo() { code = "-1", msg = "未登录" }; @@ -35,7 +35,7 @@ namespace tysdk //to base64 extraInfo = System.Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(extraInfo)); var prodId = prod.ProdID; - var prodPrice = prod.price; + var prodPrice = usdprice.ToString(); var prodName = prod.title; var pType = "googleiab.global.app"; diff --git a/sdk-intergration/Packages/tysdk/Runtime/UnityBridgeFunc.cs b/sdk-intergration/Packages/tysdk/Runtime/UnityBridgeFunc.cs index 459595d..65f43fd 100644 --- a/sdk-intergration/Packages/tysdk/Runtime/UnityBridgeFunc.cs +++ b/sdk-intergration/Packages/tysdk/Runtime/UnityBridgeFunc.cs @@ -137,7 +137,6 @@ namespace tysdk public static void UnityKnowNew(string productId, string productPrice, string productName, string productCount, string prodorderId, string appInfo,string pType) { - Debug.LogError("[UnityKnowNew] pType:" + pType); using(var sdkManager = new AndroidJavaClass(SDK_CLASS)) { sdkManager.CallStatic("UnityKnowNew", productId, productPrice, productName,