diff --git a/Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml b/Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml index 08e5d81..362c226 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml +++ b/Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml @@ -5,7 +5,7 @@ https://artifact.bytedance.com/repository/pangle - + \ No newline at end of file diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.7.0.9.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.7.0.9.aar deleted file mode 100644 index 93a9bd6..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.7.0.9.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.8.0.7.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.8.0.7.aar new file mode 100644 index 0000000..8fe9786 Binary files /dev/null and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.8.0.7.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.55.2-publishRelease-0d9bae78c7.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.8.0.7.aar.meta similarity index 93% rename from Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.55.2-publishRelease-0d9bae78c7.aar.meta rename to Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.8.0.7.aar.meta index ca5339a..e4e86c4 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.55.2-publishRelease-0d9bae78c7.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.8.0.7.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ed183c1450a34a36bbd18e90b1d1d45 +guid: 72c5f7ab43ab2534f91498d7b13d3c3c PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.7.0.9.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.7.0.9.aar deleted file mode 100644 index 633709c..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.7.0.9.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.8.0.7.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.8.0.7.aar new file mode 100644 index 0000000..5460b9b Binary files /dev/null and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.8.0.7.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.7.0.9.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.8.0.7.aar.meta similarity index 93% rename from Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.7.0.9.aar.meta rename to Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.8.0.7.aar.meta index f0160fe..f2f77ea 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/alex_adapter_gromore_mix_5.7.0.9.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.8.0.7.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7cda93ff2df8de942adb752656e6b745 +guid: 033810c6a077710419e0d7062c0d2390 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.551.1421.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.551.1421.aar.meta index 97c8027..a70d8e6 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.551.1421.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.551.1421.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf2adad21d94a4afda604092b0ad7fbc +guid: 1ee21f42a1a7a43a39dbb25be2ab2cc3 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar index 0a17037..a6caeb8 100644 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta index d05dddb..0435870 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04dcdf09869064190a240168665cef1a +guid: 8e1455b7aa64746c8b9f3e6054db6dfb PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta index fa36c51..46c166f 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fef80255b84644777b6f107627e45d41 +guid: 453dd31576b994c3492c54fcf7750eb1 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar index 746421e..1340d54 100644 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta index 0cb61b8..ec057d2 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac2aefe6bc29a48a8bca8c849cb1ce5f +guid: e86cd321b94404f92b07b2426514b866 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.55.2-publishRelease-0d9bae78c7.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.55.2-publishRelease-0d9bae78c7.aar deleted file mode 100644 index 59a7a74..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.55.2-publishRelease-0d9bae78c7.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.57-publishRelease-e7bc3aadc2.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.57-publishRelease-e7bc3aadc2.aar new file mode 100644 index 0000000..48382aa Binary files /dev/null and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.57-publishRelease-e7bc3aadc2.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.24.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.57-publishRelease-e7bc3aadc2.aar.meta similarity index 93% rename from Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.24.aar.meta rename to Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.57-publishRelease-e7bc3aadc2.aar.meta index 7115fc7..c938177 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.24.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.57-publishRelease-e7bc3aadc2.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b77b79e192a1e420c8c540eca87c6f6a +guid: c197c43ada2e54fc4a670a522dc93842 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta index cdaafab..d9395a8 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 073b8009677ec4f20846c384efed8af1 +guid: b942c862531b54da5887a4aa6bc1c1e9 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.24.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.24.aar deleted file mode 100644 index faf5087..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.24.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.25h1.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.25h1.aar new file mode 100644 index 0000000..e9e2dfa Binary files /dev/null and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.25h1.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.7.0.9.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.25h1.aar.meta similarity index 93% rename from Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.7.0.9.aar.meta rename to Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.25h1.aar.meta index 822dcc2..5929d66 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/anythink_network_csj_mix_5.7.0.9.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.25h1.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 65ef937ebdb96e646892dcb76439a910 +guid: 9df4c961fa9384cc8aea7952d253d8ea PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar index 6f2a6e1..7d11b53 100644 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar and b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta index c35e36e..341615e 100644 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta +++ b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 57bb182028d67436a815134c4e109cc4 +guid: 1cd2c80f8f7fa46fc8c053600e333fd4 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml b/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml index 1abbb94..3e71ee7 100644 --- a/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml +++ b/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml @@ -1,5 +1,5 @@ - + diff --git a/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml.meta b/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml.meta index 78c78e6..7b467df 100644 --- a/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml.meta +++ b/Assets/AnyThinkAds/Plugins/iOS/gdt/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71d71e5b4246343d1abb413672e37836 +guid: f21806e689b064f65aa0fd683db0d968 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml b/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml index 87dbd84..3e3927e 100644 --- a/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml +++ b/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml @@ -1,6 +1,6 @@ - + diff --git a/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml.meta b/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml.meta index 572af5f..7be18c3 100644 --- a/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml.meta +++ b/Assets/AnyThinkAds/Plugins/iOS/kuaishou/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c86d3e828bcb4d349eb7327b0761c41 +guid: cd72f2a8b68a442f9a784999739ff3fe TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/AnyThinkPlugin/Resources/Assets/ATPluginSetting.asset b/Assets/AnyThinkPlugin/Resources/Assets/ATPluginSetting.asset index e70081f..d0cfe9c 100644 --- a/Assets/AnyThinkPlugin/Resources/Assets/ATPluginSetting.asset +++ b/Assets/AnyThinkPlugin/Resources/Assets/ATPluginSetting.asset @@ -17,16 +17,16 @@ MonoBehaviour: coreNetwork: Name: Core DisplayName: Core - DownloadUrl: https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity/6.2.81-plugin/China/AnyThinkCore.unitypackage + DownloadUrl: https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity/6.2.93-plugin/China/AnyThinkCore.unitypackage DependenciesFilePath: PluginFileName: AnyThinkCore.unitypackage PluginFilePaths: [] LatestVersions: - Unity: 2.0.2 - Android: 6.2.81 - Ios: 6.2.81 + Unity: 2.0.3 + Android: 6.2.93 + Ios: 6.2.88 CurrentVersions: Unity: 2.0.1 - Android: 6.2.78 - Ios: 6.2.78 + Android: 6.2.81 + Ios: 6.2.81 enableAndroidX: 1 diff --git a/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs index 1db6a6a..5df85ea 100644 --- a/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs +++ b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs @@ -45,6 +45,8 @@ namespace Topon_Adapter.Editor return; } + + // Get the `manifest` element. var elementManifest = manifest.Element ("manifest"); if (elementManifest == null) @@ -59,13 +61,15 @@ namespace Topon_Adapter.Editor ATLog.log ("[BuildAndroidProcess] AndroidManifest.xml is invalid."); return; } - + + ToSingleTop (elementManifest); + var queries = CreateQueries (); - var xManifestElements = elementManifest.Descendants (); - var xApplicationElements = elementApplication.Descendants (); - var useQueries = xManifestElements.Where (element => element.Name.LocalName.Equals ("package")); - XElement tencentElement = GetElementByName (useQueries, "com.tencent.mm"); + var xManifestElements = elementManifest.Descendants (); + var xApplicationElements = elementApplication.Descendants (); + var useQueries = xManifestElements.Where (element => element.Name.LocalName.Equals ("package")); + XElement tencentElement = GetElementByName (useQueries, "com.tencent.mm"); if (tencentElement == null) { elementManifest.Add (queries); @@ -108,7 +112,7 @@ namespace Topon_Adapter.Editor metaData.Add (new XAttribute (AndroidNamespace + "theme", "@android:style/Theme.Translucent.NoTitleBar")); metaData.Add (new XAttribute (AndroidNamespace + "exported", "true")); metaData.Add (new XAttribute (AndroidNamespace + "taskAffinity", Application.identifier)); - metaData.Add (new XAttribute (AndroidNamespace + "launchMode", "singleTask")); + metaData.Add (new XAttribute (AndroidNamespace + "launchMode", "singleTop")); return metaData; } @@ -168,6 +172,17 @@ namespace Topon_Adapter.Editor return providerData; } + public static void ToSingleTop (XElement manifest) + { + + var elements = manifest.Descendants ().Where (element => element.Name.LocalName.Equals ("activity")); + // 如果这个activity已经有了 android:launchMode="singleTask"，则不再添加 + XElement elementByName = GetElementByName (elements , "com.unity3d.player.UnityPlayerActivity"); + //此处将 android:launchMode="singleTask" 改为 android:launchMode="singleTop" + // elementByName.Add (new XAttribute (AndroidNamespace + "launchMode", "singleTop")); + elementByName.Attribute ( AndroidNamespace + "launchMode")?.SetValue ("singleTop"); + } + public int callbackOrder { get; } } }