diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml.meta index 687b2f7..acf0686 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 01309b887f3fe4ece979fbb48275d06e +guid: 74cd7d129c09b466a86bfa11ed6b16d1 TextScriptImporter: externalObjects: {} userData: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar index efe6eb2..85d4218 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar.meta index c0b742a..0f897fb 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_banner.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 290f0c123bbf64a6984427544e80839a +guid: da98890a900e14accaef685984a61bd5 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar index 5ba3404..5981c79 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar.meta index 4c7e0f3..2effafa 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_china_core.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c1cfce36f43447f9b2d114d262760e9 +guid: a3135f78bef1e464b80a119102c73984 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar index d4a005b..80980cd 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar.meta index 040f4ab..a3bdf33 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_core.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc179ab55b7104f63a5ab4f284361fce +guid: 0054580ab849d45198549eac7a372bc9 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar index 9b984ea..87b034c 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar.meta index 4730c9b..edb75c7 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_interstitial.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 348edf87b5e4d4c648b81168c52d4c35 +guid: 41fd5ba357e7340aebe1ca236589f66a PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar index 635969b..3c9b957 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar.meta index 935993d..9329578 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_native.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e1cd9f70cc444bda95630821b2db72b +guid: f0b382f66e3504619885af1ed69ee1c1 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar index eb4d993..978431e 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar.meta index d78e456..cb8e129 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_rewardvideo.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8defdf313c8954dbaa7ae6682d8f1a65 +guid: 7311500925e7344788fb99a2ef9e2e96 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar index 1457785..90326ce 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar.meta index 0039858..84d4651 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/anythink_splash.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3f3e2852ae7946e5b9daf2e27fa1011 +guid: 950e2794885244e8798ebc0ed47f8874 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar index b9ca920..4e77bf9 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar.meta index bcf347d..b8be775 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/tramini_sdk.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ada836c19e1cb412e894751fbc3669d5 +guid: 31b5cf97768a140e298ddc29fc51435b PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.575.1445.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.575.1445.aar new file mode 100644 index 0000000..4d4ae63 Binary files /dev/null and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.575.1445.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.575.1445.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.575.1445.aar.meta new file mode 100644 index 0000000..2b785ba --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.575.1445.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: bd689cb07089a4ad58f9ea68d471251f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar index f3cc69a..8f6a53b 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta index 42789d7..b7e52f7 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/anythink_network_unity_gdt.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d64ad1973dd54983b91cb1678c6d478 +guid: c58e18614454a415d8e2ad27964c04bf PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/network_data.json index 37adf2e..684f5ec 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/network_data.json +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/network_data.json @@ -1 +1 @@ -{"name":"gdt","version":"4.562.1432","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/gdt"} \ No newline at end of file +{"name":"gdt","version":"4.575.1445","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/gdt"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta index 0f49966..211011c 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3ba469b8da3d46898a264b6e8b8b008 +guid: 7addf8b7f1033463d9a2909737833d5c TextScriptImporter: externalObjects: {} userData: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar index b47ca40..99fb8f9 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta index 147d6b6..d5f95b8 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 45adbb2b2963347a989988cda4eab3e9 +guid: b56a274238fee48dcaa1ccae9a622dd7 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.63-publishRelease-8b45b0e4e6.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.63-publishRelease-8b45b0e4e6.aar new file mode 100644 index 0000000..81bc0eb Binary files /dev/null and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.63-publishRelease-8b45b0e4e6.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.63-publishRelease-8b45b0e4e6.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.63-publishRelease-8b45b0e4e6.aar.meta new file mode 100644 index 0000000..e09a757 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.63-publishRelease-8b45b0e4e6.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: d0e07b66260fa418884f4cc8e5a63bc5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json index 88ae52e..cd5cf1f 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json @@ -1 +1 @@ -{"name":"kuaishou","version":"3.3.59.1","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"} \ No newline at end of file +{"name":"kuaishou","version":"3.3.63","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta index 9d7e73b..562f08f 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38c1b7b371ecd45ba89127e91bee66ef +guid: 0c8bdb20bc2814919a0fb316325ec587 TextScriptImporter: externalObjects: {} userData: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.29.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.29.aar new file mode 100644 index 0000000..752371c Binary files /dev/null and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.29.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.29.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.29.aar.meta new file mode 100644 index 0000000..aadc886 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.29.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 9dfc970c236d443c69c49bd7dd1a5049 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar index 83d9f97..5fec4d8 100644 Binary files a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar and b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar differ diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta index bb977bf..c34421c 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/anythink_network_unity_tap.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af127e4ac3ee34f078cd4bb6d5163b24 +guid: 40954ebb3cfd04c9296425304103941e PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/network_data.json index 98ebe89..e8b038e 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/network_data.json +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/network_data.json @@ -1 +1 @@ -{"name":"tap","version":"3.16.3.25","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/tap"} \ No newline at end of file +{"name":"tap","version":"3.16.3.29","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/tap"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/gson-2.8.4.jar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/gson-2.8.4.jar.meta index 1360c1f..381b9c0 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/gson-2.8.4.jar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/gson-2.8.4.jar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f8fbe67e9b4f64586b86daf28d4a8fff +guid: 92a9540d6c4824102995e4688aea7989 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/miui_sys_splash_1.0.aar.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/miui_sys_splash_1.0.aar.meta index 72c3ef3..eaef39d 100644 --- a/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/miui_sys_splash_1.0.aar.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation_plugin/miui_sys_splash_1.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d12c55ddf05c24abd92b59cdaa090ab1 +guid: 6adb84ef6af8641e4b5a8d959f44d9d5 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AnyThinkPlugin/Resources/json/2.1.0.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta similarity index 77% rename from AnyThinkPlugin/Resources/json/2.1.0.meta rename to AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta index bbefe59..4c83aa7 100644 --- a/AnyThinkPlugin/Resources/json/2.1.0.meta +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dcb708d6d45d0f7419d7667d7ad9feba +guid: 668ce08287b77354d9d17d91dc8e7399 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta new file mode 100644 index 0000000..7aee864 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76dff0eaddf7c9e4db54ac483d4bd10c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core.meta new file mode 100644 index 0000000..f21219f --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76e1496423e6d4d039d9f0d051cc195d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor.meta new file mode 100644 index 0000000..f0a7a8b --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1908b40a4f31848efb84232ead290fca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml new file mode 100644 index 0000000..5fffea0 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml.meta new file mode 100644 index 0000000..e873eb0 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: daf8b225bea19489bb7a89ca105900f9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/Resources/json/2.1.0/plugin_setting_data.json b/AnyThinkPlugin/Resources/json/2.1.0/plugin_setting_data.json deleted file mode 100644 index 1ba1078..0000000 --- a/AnyThinkPlugin/Resources/json/2.1.0/plugin_setting_data.json +++ /dev/null @@ -1 +0,0 @@ -{"curCountry":1,"china":{"android_version":"6.2.98","ios_version":"","enableAndroidX":true,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"","ios_version":"","enableAndroidX":true,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}} \ No newline at end of file diff --git a/AnyThinkPlugin/Resources/json/2.1.1.meta b/AnyThinkPlugin/Resources/json/2.1.1.meta new file mode 100644 index 0000000..9fb48b6 --- /dev/null +++ b/AnyThinkPlugin/Resources/json/2.1.1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f5d23b57baa75d4b851f776033a2b2a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/Resources/json/2.1.1/plugin_setting_data.json b/AnyThinkPlugin/Resources/json/2.1.1/plugin_setting_data.json new file mode 100644 index 0000000..da004eb --- /dev/null +++ b/AnyThinkPlugin/Resources/json/2.1.1/plugin_setting_data.json @@ -0,0 +1 @@ +{"curCountry":1,"china":{"android_version":"6.3.50","ios_version":"","androidXSetting":1,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"","ios_version":"","androidXSetting":0,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}} \ No newline at end of file diff --git a/AnyThinkPlugin/Resources/json/2.1.0/plugin_setting_data.json.meta b/AnyThinkPlugin/Resources/json/2.1.1/plugin_setting_data.json.meta similarity index 75% rename from AnyThinkPlugin/Resources/json/2.1.0/plugin_setting_data.json.meta rename to AnyThinkPlugin/Resources/json/2.1.1/plugin_setting_data.json.meta index 379162a..5055d55 100644 --- a/AnyThinkPlugin/Resources/json/2.1.0/plugin_setting_data.json.meta +++ b/AnyThinkPlugin/Resources/json/2.1.1/plugin_setting_data.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebfbacc2a04216f4b8a3f359ee7db1df +guid: 26d597193f8ac94428601791309d24ed TextScriptImporter: externalObjects: {} userData: diff --git a/AnyThinkPlugin/Script/Editor/ATPostProcessBuildAndroid.cs b/AnyThinkPlugin/Script/Editor/ATPostProcessBuildAndroid.cs index c5a86cc..b56f6a3 100644 --- a/AnyThinkPlugin/Script/Editor/ATPostProcessBuildAndroid.cs +++ b/AnyThinkPlugin/Script/Editor/ATPostProcessBuildAndroid.cs @@ -35,8 +35,9 @@ namespace AnyThink.Scripts.Editor #else var gradlePropertiesPath = Path.Combine(path, "gradle.properties"); #endif - - processGradleProperties(gradlePropertiesPath); + if (!ATConfig.isDefaultAndroidX()) { + processGradleProperties(gradlePropertiesPath); + } processAndroidManifest(path); processNetworkConfigXml(path); ATProcessBuildGradleAndroid.processBuildGradle(path); diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATConfig.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATConfig.cs index 5ee984e..427ff06 100644 --- a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATConfig.cs +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATConfig.cs @@ -16,7 +16,7 @@ namespace AnyThink.Scripts.IntegrationManager.Editor public class ATConfig { -public static string PLUGIN_VERSION = "2.1.0"; +public static string PLUGIN_VERSION = "2.1.1"; public static bool isDebug = false; public static int OS_ANDROID = 1; @@ -45,8 +45,8 @@ public static bool isDebug = false; //network json文件名 public static string network_data_file_name = "network_data.json"; //插件设置的数据 - private static string plugin_setting_data_path = $"{RootPath}/Resources/json/" + PLUGIN_VERSION; - private static string plugin_setting_data_file_name = "plugin_setting_data.json"; + public static string plugin_setting_data_path = $"{RootPath}/Resources/json/" + PLUGIN_VERSION; + public static string plugin_setting_data_file_name = "plugin_setting_data.json"; private static string _rootPath; @@ -175,6 +175,7 @@ public static bool isDebug = false; //Android if (!string.IsNullOrEmpty(android_version)) { var networkPath = getAndroidNetworkPath(network); + Directory.CreateDirectory(networkPath); ATLog.log("saveInstalledNetworkVersion() >>> android networkPath: " + networkPath + " exist: " + Directory.Exists(networkPath)); if (Directory.Exists(networkPath)) { string fullPath = Path.Combine(networkPath, networkDataFileName); @@ -192,7 +193,8 @@ public static bool isDebug = false; var ios_version = installedVersions.Ios; if (!string.IsNullOrEmpty(ios_version)) { var networkPath = getIosNetworkPath(network); - ATLog.log("saveInstalledNetworkVersion() >>> ios networkPath: " + networkPath); + Directory.CreateDirectory(networkPath); + ATLog.log("saveInstalledNetworkVersion() >>> ios networkPath: " + networkPath); if (Directory.Exists(networkPath)) { string fullPath = Path.Combine(networkPath, networkDataFileName); var networkData = new NetworkLocalData(); @@ -332,7 +334,12 @@ public static bool isDebug = false; public static bool enableAndroidX() { var pluginSettingData = getPluginSettingData(); - return pluginSettingData.getCountrySettingData().enableAndroidX; + return pluginSettingData.getCountrySettingData().androidXSetting == 1; + } + + public static bool isDefaultAndroidX() { + var pluginSettingData = getPluginSettingData(); + return pluginSettingData.getCountrySettingData().androidXSetting == 0; } //获取默认选中的地区 diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManager.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManager.cs index f301008..adea8f4 100644 --- a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManager.cs +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManager.cs @@ -297,7 +297,7 @@ namespace AnyThink.Scripts.IntegrationManager.Editor network.CurrentVersions = versions; // await Task.Delay(1000); - Thread.Sleep(1000); + // Thread.Sleep(1000); //下面的逻辑会延迟一秒后执行，确保unitypackage先解压到本地 ATConfig.saveInstalledNetworkVersion(network, os); ATLog.log("UpdateCurrentVersions() >>> AndroidVersion: " + versions.Android); @@ -339,25 +339,24 @@ namespace AnyThink.Scripts.IntegrationManager.Editor } //获取AndroidX开关状态 - public bool enableAndroidX(PluginData pluginData) { + public int getAndroidXSetting(PluginData pluginData) { if (pluginData == null) { - return false; + return 0; } var pluginSettingData = pluginData.pluginSettingData; if (pluginSettingData == null) { - return false; + return 0; } CountrySettingData countrySettingData = pluginSettingData.getCountrySettingData(); - - return countrySettingData.enableAndroidX; + return countrySettingData.androidXSetting; } //设置并保存AndroidX开关状态 - public void saveAndroidXSetting(PluginData pluginData, bool enable) { - ATLog.log("saveAndroidXSetting() >>> enable: " + enable); + public void saveAndroidXSetting(PluginData pluginData, int androidXSetting) { + ATLog.log("saveAndroidXSetting() >>> androidXSetting: " + androidXSetting); var pluginSettingData = pluginData.pluginSettingData; CountrySettingData countrySettingData = pluginSettingData.getCountrySettingData(); - countrySettingData.enableAndroidX = enable; + countrySettingData.androidXSetting = androidXSetting; ATConfig.savePluginSettingData(pluginSettingData); } diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManagerWindow.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManagerWindow.cs index 07a9c0c..b8008d2 100644 --- a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManagerWindow.cs +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntegrationManagerWindow.cs @@ -126,6 +126,8 @@ namespace AnyThink.Scripts.IntegrationManager.Editor warningIcon.LoadImage(warningIconData); loadPluginData(); + //热更新 + ATIntegrationHotFix.Instance.loadHotFixData(); } //这个方法在插件启动时会调用，然后脚本重新加载时也会重新调用，所以加载数据放在Awake中 @@ -359,27 +361,30 @@ namespace AnyThink.Scripts.IntegrationManager.Editor private void DrawAndroidXUI() { - if (!ATConfig.isSelectedChina()) { - return; - } - + bool isChina = ATConfig.isSelectedChina(); + // if (!ATConfig.isSelectedChina()) { + // return; + // } EditorGUILayout.LabelField("AndroidX (Only for Android)", titleLabelStyle); GUILayout.Space(4); using (new EditorGUILayout.HorizontalScope("box")) { GUILayout.Space(5); - bool enableAndroidX = ATIntegrationManager.Instance.enableAndroidX(pluginData); - string[] options = new string[] { "Disable", "Enable" }; + int androidXSetting = ATIntegrationManager.Instance.getAndroidXSetting(pluginData); + string[] options = new string[] { "Default", "Enable", "Disable" }; + if (!isChina) { + options = new string[] { "Default", "Enable" }; + } // 创建Dropdown组件 - int lastDropdownIndex = enableAndroidX ? 1 : 0; + int lastDropdownIndex = androidXSetting; int curDropdownIndex = EditorGUILayout.Popup("Enable AndroidX:", lastDropdownIndex, options); //变化才设置 if (curDropdownIndex != lastDropdownIndex) { ATLog.log("DrawAndroidXUI() >>> curDropdownIndex: " + curDropdownIndex + " lastDropdownIndex: " + lastDropdownIndex); - ATIntegrationManager.Instance.saveAndroidXSetting(pluginData, curDropdownIndex == 1); + ATIntegrationManager.Instance.saveAndroidXSetting(pluginData, curDropdownIndex); } GUILayout.Space(5); } diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntergrationHotFix.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntergrationHotFix.cs new file mode 100644 index 0000000..6cede7e --- /dev/null +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntergrationHotFix.cs @@ -0,0 +1,164 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using UnityEditor; +using UnityEngine; +using UnityEngine.Networking; +using UnityEditor.PackageManager.Requests; +using UnityEditor.PackageManager; +using System.Threading.Tasks; +using System.Threading; + +namespace AnyThink.Scripts.IntegrationManager.Editor +{ + public class ATIntegrationHotFix { + public static ATIntegrationHotFix Instance = new ATIntegrationHotFix(); + + private ATIntegrationHotFix() + { + + } + + private static string plugin_hot_fix_data_file_name = "plugin_hot_fix_data.json"; + + public void loadHotFixData() + { + var downloadUrl = ATNetInfo.getHotfixPluginDownloadUrl(ATConfig.PLUGIN_VERSION); + ATLog.log("loadHotFixData() >>> downloadUrl: " + downloadUrl); + ATEditorCoroutine.startCoroutine(loadHotFixDataWithIEnumerator(downloadUrl)); + } + + private IEnumerator loadHotFixDataWithIEnumerator(string url) { + var hotFixDataRequest = UnityWebRequest.Get(url); + var webRequest = hotFixDataRequest.SendWebRequest(); + while (!webRequest.isDone) + { + yield return new WaitForSeconds(0.1f); + } + +#if UNITY_2020_1_OR_NEWER + if (hotFixDataRequest.result != UnityWebRequest.Result.Success) +#elif UNITY_2017_2_OR_NEWER + if (hotFixDataRequest.isNetworkError || hotFixDataRequest.isHttpError) +#else + if (hotFixDataRequest.isError) +#endif + { + // Debug.Log("loadPluginData failed."); + // callback(null); + ATLog.log("load hotfix data failed."); + } + else + { + //解析热修复的数据 + try { + string hotFixData = hotFixDataRequest.downloadHandler.text; + var hotFixDataObj = JsonUtility.FromJson(hotFixData); + ATLog.log("loadHotFixDataWithIEnumerator() >>> hotFixData: " + hotFixData); + //判断status是否需要进行热更新 + if (hotFixDataObj.status != 1) { + ATLog.log("loadHotFixDataWithIEnumerator() >>> 热更新被禁止"); + } else { + var localHotFixDataObj = getHotfixPluginData(); + if (localHotFixDataObj == null) { + //本地未曾下载过热更新 + ATLog.log("loadHotFixDataWithIEnumerator() >>> 本地未曾下载过热更新"); + ATEditorCoroutine.startCoroutine(loadHotFixPlugin(hotFixDataObj)); + } else { + var compareVersionResult = ATDataUtil.CompareVersions(localHotFixDataObj.hot_fix_version, hotFixDataObj.hot_fix_version); + ATLog.log("loadHotFixDataWithIEnumerator() >>> compareVersionResult: " + compareVersionResult); + //本地版本比远端版本低，则需要更新 + if (compareVersionResult == VersionComparisonResult.Lesser) { + ATEditorCoroutine.startCoroutine(loadHotFixPlugin(hotFixDataObj)); + } else { + //不需要热更新 + saveHotfixData(hotFixData); + } + } + } + } catch(Exception e) { + ATLog.logError("parseNetworksJson() >>> failed: " + e); + } + } + } + + private IEnumerator loadHotFixPlugin(HotfixPluginData hotFixDataObj) { + var path = Path.Combine(Application.temporaryCachePath, hotFixDataObj.file_name); + ATLog.log("downloadPluginWithEnumerator() >>> path: " + path); +#if UNITY_2017_2_OR_NEWER + var downloadHandler = new DownloadHandlerFile(path); +#else + var downloadHandler = new ATDownloadHandler(path); +#endif + var downloadUrl = hotFixDataObj.download_url; + UnityWebRequest downloadPluginRequest = new UnityWebRequest(downloadUrl) + { method = UnityWebRequest.kHttpVerbGET, + downloadHandler = downloadHandler + }; + +#if UNITY_2017_2_OR_NEWER + var operation = downloadPluginRequest.SendWebRequest(); +#else + var operation = downloadPluginRequest.Send(); +#endif + while (!operation.isDone) + { + yield return new WaitForSeconds(0.1f); // Just wait till downloadPluginRequest is completed. Our coroutine is pretty rudimentary. + if (operation.progress != 1 && operation.isDone) + { + + } + } + +#if UNITY_2020_1_OR_NEWER + if (downloadPluginRequest.result != UnityWebRequest.Result.Success) +#elif UNITY_2017_2_OR_NEWER + if (downloadPluginRequest.isNetworkError || downloadPluginRequest.isHttpError) +#else + if (downloadPluginRequest.isError) +#endif + { + ATLog.log(downloadPluginRequest.error); + } + else + { + AssetDatabase.ImportPackage(path, false); + AssetDatabase.Refresh(); + + string hotFixData = JsonUtility.ToJson(hotFixDataObj); + saveHotfixData(hotFixData); + } + downloadPluginRequest.Dispose(); + downloadPluginRequest = null; + } + + + private void saveHotfixData(string hotfixPluginData) { + var directoryPath = ATConfig.plugin_setting_data_path; + // 确保目标文件夹存在 + if (!Directory.Exists(directoryPath)) + { + // 如果目录不存在，则创建它 + Directory.CreateDirectory(directoryPath); + } + string fullPath = Path.Combine(directoryPath, plugin_hot_fix_data_file_name); + ATLog.log("saveHotfixData() >>> fullPath: " + fullPath + " hotfixPluginData: " + hotfixPluginData); + File.WriteAllText(fullPath, hotfixPluginData); + } + + private HotfixPluginData getHotfixPluginData() { + string fullPath = Path.Combine(ATConfig.plugin_setting_data_path, plugin_hot_fix_data_file_name); + if (!File.Exists(fullPath)) { + return null; + } + string json = File.ReadAllText(fullPath); + if(json == "") { + return null; + } + return JsonUtility.FromJson(json); + } + } +} \ No newline at end of file diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntergrationHotFix.cs.meta b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntergrationHotFix.cs.meta new file mode 100644 index 0000000..dad1fba --- /dev/null +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATIntergrationHotFix.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bad9077d375594a889ee0fbf3bf84b2a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATMenuItems.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATMenuItems.cs index ad30beb..b4bc8f3 100644 --- a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATMenuItems.cs +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATMenuItems.cs @@ -1,8 +1,6 @@ //菜单栏 - using UnityEditor; using UnityEngine; - // using DownloadManager; namespace AnyThink.Scripts.IntegrationManager.Editor @@ -12,28 +10,29 @@ namespace AnyThink.Scripts.IntegrationManager.Editor #if AnyThinkSDKEditor /** * The special characters at the end represent a shortcut for this action. - * + * * % - ctrl on Windows, cmd on macOS * # - shift * & - alt - * + * * So, (shift + cmd/ctrl + t) will launch the integration manager */ - [MenuItem ("AnyThink/SDK Manager %#t")] - private static void IntegrationManager () + [MenuItem("AnyThink/SDK Manager %#t")] + private static void IntegrationManager() { - ATIntegrationManagerWindow.ShowManager (); + + ATIntegrationManagerWindow.ShowManager(); } - [MenuItem ("AnyThink/Documentation")] - public static void Documentation () + [MenuItem("AnyThink/Documentation")] + public static void Documentation() { // if (ATConfig.isSelectedChina()) { // Application.OpenURL("https://newdocs.toponad.com/docs/lgfbO4"); // } else { // Application.OpenURL("https://docs.toponad.com/#/en-us/unity/unity_doc/unity_access_doc_new?id=_3-integration"); // } - Application.OpenURL ("https://newdocs.toponad.com/docs/lgfbO4"); + Application.OpenURL("https://newdocs.toponad.com/docs/lgfbO4"); } #endif } diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATNetInfo.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATNetInfo.cs index d50ec16..7612871 100644 --- a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATNetInfo.cs +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATNetInfo.cs @@ -29,6 +29,11 @@ namespace AnyThink.Scripts.IntegrationManager.Editor { return "https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity_Release/plugin/" + pluginVersion + "/" + getPluginFileName(pluginVersion); } + + public static string getHotfixPluginDownloadUrl(string pluginVersion) + { + return "https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity_Release/plugin/" + pluginVersion + "/hotfix/hotfix_config.json"; + } } } diff --git a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATPluginLocalDataModel.cs b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATPluginLocalDataModel.cs index 34b408b..95489ec 100644 --- a/AnyThinkPlugin/Script/IntegrationManager/Editor/ATPluginLocalDataModel.cs +++ b/AnyThinkPlugin/Script/IntegrationManager/Editor/ATPluginLocalDataModel.cs @@ -171,7 +171,7 @@ namespace AnyThink.Scripts.IntegrationManager.Editor public string ios_version; //当前已安装的iOS sdk的版本号 - public bool enableAndroidX = false; //当前的AndroidX设置 + public int androidXSetting = 0; //当前的AndroidX设置,0=default; 1=修改为AndroidX；2=修改为非AndroidX public int country; @@ -180,9 +180,6 @@ namespace AnyThink.Scripts.IntegrationManager.Editor public CountrySettingData(int country) { this.country = country; - if (country == ATConfig.NONCHINA_COUNTRY) { - this.enableAndroidX = true; - } } public string getAdmobAppId(int os) { @@ -210,4 +207,14 @@ namespace AnyThink.Scripts.IntegrationManager.Editor public int country; public string path; } + + [Serializable] + public class HotfixPluginData + { + public string plugin_version; + public string hot_fix_version; + public string download_url; + public int status; + public string file_name; + } } \ No newline at end of file diff --git a/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta b/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta index 3e4f117..5457a30 100644 --- a/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta +++ b/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta @@ -1,18 +1,21 @@ fileFormatVersion: 2 -guid: cdbad4cb68f85450db4d76d94f7e32a8 +guid: 5552c54c11d94016bcfe740f27df44a6 +labels: +- gvh +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll +- gvhp_targets-editor +timeCreated: 1480838400 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - first: - Any: + Any: second: enabled: 0 settings: {} @@ -28,6 +31,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta b/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta index 60a662b..2b43bba 100644 --- a/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta +++ b/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta @@ -1,18 +1,21 @@ fileFormatVersion: 2 -guid: 6825d727c7fc54515a67f5c88a893763 +guid: 1f4f113972f04c3695341dfb3ba48d3b +labels: +- gvh +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll +- gvhp_targets-editor +timeCreated: 1480838400 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - first: - Any: + Any: second: enabled: 0 settings: {} @@ -28,6 +31,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta b/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta index c67d7cf..2e94805 100644 --- a/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta +++ b/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta @@ -1,18 +1,21 @@ fileFormatVersion: 2 -guid: eaa3f3ba5fb074092a8dc2523a55ee6e +guid: 413ed4abd14645c38ebbd8c5ff26e9de +labels: +- gvh +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll +- gvhp_targets-editor +timeCreated: 1480838400 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - first: - Any: + Any: second: enabled: 0 settings: {} @@ -28,6 +31,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta b/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta index 47bdcf7..a6a4454 100644 --- a/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta +++ b/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta @@ -1,18 +1,21 @@ fileFormatVersion: 2 -guid: 6cb6437754caa42a7b6e62ef2c63d2e1 +guid: 38d0b40a7b2d44c6a6a2362599bfc41e +labels: +- gvh +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll +- gvhp_targets-editor +timeCreated: 1480838400 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - first: - Any: + Any: second: enabled: 0 settings: {} @@ -28,6 +31,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index f8a5668..a35483b 100644 --- a/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,18 +1,21 @@ fileFormatVersion: 2 -guid: 8c409ab99e4f4317b2bec2f54be2a2fc +guid: 86460262ea60447dbb6a62d21167790f +labels: +- gvh +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll +- gvhp_targets-editor +timeCreated: 1480838400 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - first: - Any: + Any: second: enabled: 0 settings: {} @@ -28,6 +31,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta b/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta index 026ae30..2adb22e 100644 --- a/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta +++ b/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta @@ -1,7 +1,15 @@ fileFormatVersion: 2 -guid: 36bce0d90658a447380074e3b9958ed0 +guid: 2764c5ea3b354f3cb7ca80028fd08da2 +labels: +- gvh +- gvh_manifest +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt +- gvhp_manifestname-0External Dependency Manager +- gvhp_manifestname-play-services-resolver +timeCreated: 1474401009 +licenseType: Pro TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: