diff --git a/sdk-intergration/Assets/AppsFlyer/AppsFlyer.cs b/sdk-intergration/Assets/AppsFlyer/AppsFlyer.cs index 90c701a..670932a 100644 --- a/sdk-intergration/Assets/AppsFlyer/AppsFlyer.cs +++ b/sdk-intergration/Assets/AppsFlyer/AppsFlyer.cs @@ -1084,4 +1084,4 @@ namespace AppsFlyerSDK EmailCryptTypeSHA256 = 1, } -} +} \ No newline at end of file diff --git a/sdk-intergration/Assets/CoreLib/DebugLib/asap.core.dll b/sdk-intergration/Assets/CoreLib/DebugLib/asap.core.dll index f1ab800..1ac6365 100644 Binary files a/sdk-intergration/Assets/CoreLib/DebugLib/asap.core.dll and b/sdk-intergration/Assets/CoreLib/DebugLib/asap.core.dll differ diff --git a/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll b/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll index dab26cc..8f0984d 100644 Binary files a/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll and b/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll differ diff --git a/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll.meta b/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll.meta index e6b35d1..11b114d 100644 --- a/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll.meta +++ b/sdk-intergration/Assets/CoreLib/ReleaseLib/asap.core.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 03845875206fd43188499b44315ff8b4 +guid: f09db8f4c73f97540a96ebe183df5fd1 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/sdk-intergration/Assets/Editor/ProjectAutoSetting.cs b/sdk-intergration/Assets/Editor/ProjectAutoSetting.cs new file mode 100644 index 0000000..fb09d4c --- /dev/null +++ b/sdk-intergration/Assets/Editor/ProjectAutoSetting.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; +using System.IO; + +[InitializeOnLoad] +public static class ProjectAutoSetting +{ + static ProjectAutoSetting() + { + OnAutoSetting(); + } + + + static void OnAutoSetting() + { + if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android) + { + OnAndroid(); + } + } + + static void OnAndroid() + { + string path = "./KeyStore/android.json"; //自己的路径 + string jsonContent = File.ReadAllText(path); // 读取 JSON 文件内容 + if (!string.IsNullOrEmpty(jsonContent)) + { + AndroidJson dynamicObject = JsonUtility.FromJson(jsonContent); + PlayerSettings.Android.useCustomKeystore = true; + if (dynamicObject != null) + { + PlayerSettings.Android.keystoreName = "./KeyStore/" + dynamicObject.keystoreName; + PlayerSettings.Android.keyaliasName = dynamicObject.keyaliasName; + PlayerSettings.keystorePass = Environment.GetEnvironmentVariable("BAMBOO_PW"); + PlayerSettings.keyaliasPass = Environment.GetEnvironmentVariable("BAMBOO_PW"); + PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, dynamicObject.applicationIdentifier); + PlayerSettings.companyName = dynamicObject.companyName; + PlayerSettings.productName = dynamicObject.productName; + } + } + + string outPath = "./" + PlayerSettings.productName + "_" + System.DateTime.Now.ToString("yyyyMMddHHmm"); + + EditorUserBuildSettings.SetBuildLocation(BuildTarget.Android, outPath); + } + + // static void OnIOS() + // { + // PlayerSettings.applicationIdentifier = "aaa"; + // PlayerSettings.bundleVersion = "1.9.115"; + // PlayerSettings.iOS.applicationDisplayName = "aaa"; + // PlayerSettings.iOS.targetOSVersionString = "8"; + // PlayerSettings.iOS.buildNumber = System.DateTime.Now.ToString("yyyyMMddHHmm"); + // PlayerSettings.iOS.sdkVersion = iOSSdkVersion.DeviceSDK; + // } + private class AndroidJson + { + public string keystoreName; + public string keyaliasName; + public string applicationIdentifier; + public string companyName; + public string productName; + + } +} diff --git a/sdk-intergration/Assets/Editor/ProjectAutoSetting.cs.meta b/sdk-intergration/Assets/Editor/ProjectAutoSetting.cs.meta new file mode 100644 index 0000000..61fea82 --- /dev/null +++ b/sdk-intergration/Assets/Editor/ProjectAutoSetting.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: da7a0905894ef4b849ba4b21a7f8b6dc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdk-intergration/Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml b/sdk-intergration/Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml index 296e058..20dae2f 100644 --- a/sdk-intergration/Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml +++ b/sdk-intergration/Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml @@ -2,9 +2,9 @@ - + - + diff --git a/sdk-intergration/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml b/sdk-intergration/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml index 1c186b7..a0ae3e6 100644 --- a/sdk-intergration/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml +++ b/sdk-intergration/Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml @@ -4,6 +4,6 @@ - + diff --git a/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml b/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml index 4a597e1..0c8cbb2 100644 --- a/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml +++ b/sdk-intergration/Assets/Plugins/Android/AndroidManifest.xml @@ -13,18 +13,21 @@ + + + diff --git a/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle b/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle index 332c297..4c4b996 100644 --- a/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle +++ b/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle @@ -3,8 +3,8 @@ plugins { // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '7.1.2' apply false + id 'com.android.library' version '7.1.2' apply false id 'com.google.gms.google-services' version '4.3.3' apply false **BUILD_SCRIPT_DEPS** } diff --git a/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle.meta b/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle.meta index 07b73cb..b112c0d 100644 --- a/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle.meta +++ b/sdk-intergration/Assets/Plugins/Android/baseProjectTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da5ce0ca5136f4d0bb4aa7c6ba8e94bb +guid: 80a26fd5721f44bc8985483d7d7b6d0e DefaultImporter: externalObjects: {} userData: diff --git a/sdk-intergration/Assets/Plugins/Android/launcherTemplate.gradle.meta b/sdk-intergration/Assets/Plugins/Android/launcherTemplate.gradle.meta index 65c421f..d3d3656 100644 --- a/sdk-intergration/Assets/Plugins/Android/launcherTemplate.gradle.meta +++ b/sdk-intergration/Assets/Plugins/Android/launcherTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 92e3cb9b3082046489d61d8a7ba982be +guid: 456833818c8db458da8d954107b093c0 DefaultImporter: externalObjects: {} userData: diff --git a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle index 861894b..5d94755 100644 --- a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle +++ b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle @@ -44,7 +44,7 @@ dependencies { implementation 'com.android.installreferrer:installreferrer:2.1' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:10 implementation 'com.applovin.mediation:facebook-adapter:[6.18.0.1]' // Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml:8 implementation 'com.applovin.mediation:fyber-adapter:8.3.5.0' // Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml:4 - implementation 'com.applovin.mediation:google-adapter:[23.6.0.2]' // Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml:5 + implementation 'com.applovin.mediation:google-adapter:[23.6.0.1]' // Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml:5 implementation 'com.applovin.mediation:ironsource-adapter:8.6.1.0.0' // Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml:8 implementation 'com.applovin.mediation:unityads-adapter:4.12.3.0' // Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml:4 implementation 'com.applovin.mediation:vungle-adapter:7.4.2.2' // Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml:4 @@ -58,7 +58,6 @@ dependencies { // Android Resolver Exclusions Start android { - namespace "com.unity3d.player" packagingOptions { exclude ('/lib/armeabi/*' + '*') exclude ('/lib/mips/*' + '*') diff --git a/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml b/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml index 6a2c1f7..4816c67 100644 --- a/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml +++ b/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml @@ -3,7 +3,7 @@ com.android.installreferrer:installreferrer:2.1 com.applovin.mediation:facebook-adapter:[6.18.0.1] com.applovin.mediation:fyber-adapter:8.3.5.0 - com.applovin.mediation:google-adapter:[23.6.0.2] + com.applovin.mediation:google-adapter:[23.6.0.1] com.applovin.mediation:ironsource-adapter:8.6.1.0.0 com.applovin.mediation:unityads-adapter:4.12.3.0 com.applovin.mediation:vungle-adapter:7.4.2.2 diff --git a/sdk-intergration/keystore/android.json b/sdk-intergration/keystore/android.json new file mode 100644 index 0000000..4bd2279 --- /dev/null +++ b/sdk-intergration/keystore/android.json @@ -0,0 +1,7 @@ +{ + "keystoreName": "bamboogame.keystore", + "keyaliasName": "fishing", + "applicationIdentifier":"com.arkgame.ft", + "companyName":"Ark Game Limited (香港)", + "productName":"Fishing Travel" +} diff --git a/sdk-intergration/keystore/user.keystore b/sdk-intergration/keystore/user.keystore new file mode 100644 index 0000000..9b767f1 Binary files /dev/null and b/sdk-intergration/keystore/user.keystore differ