[M] sync from n3-world

2024-08-30 10:12:40 +08:00
parent d449fee825
commit 959d7d2cce
9 changed files with 16 additions and 18 deletions
--- 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: 
--- 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**
--- 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: 
--- 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: 
--- 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: