diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta new file mode 100644 index 0000000..f614a7b --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9115931d711f214aa6aa79f3faae8d7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta new file mode 100644 index 0000000..973bf34 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 884850fa610017146a55d9579149e619 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu.meta new file mode 100644 index 0000000..058a8c4 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db06d62c9d0894385a59b5fb103ab275 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor.meta new file mode 100644 index 0000000..a0eceb7 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6bea76eddb364121b83ad86a0338601 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor/Dependencies.xml b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor/Dependencies.xml new file mode 100644 index 0000000..509fa2e --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor/Dependencies.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor/Dependencies.xml.meta new file mode 100644 index 0000000..eb4bc8f --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0d8df9936bce14501b0ce7acb8f0e486 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/network_data.json new file mode 100644 index 0000000..9d0634e --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/network_data.json @@ -0,0 +1 @@ +{"name":"baidu","version":"10.050","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/iOS/China/baidu"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/network_data.json.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/network_data.json.meta new file mode 100644 index 0000000..ba4397b --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/baidu/network_data.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c479be6d2cfff5f49b743fd4e7d014f2 +TextScriptImporter: + 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..13fdc3c --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a5a23d591de040028521674fa54d20c +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..50f9608 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8eebe69ca7fb743d2b5665bb700c28db +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..73b95c6 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml @@ -0,0 +1,7 @@ + + + + + + + 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..d857048 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/core/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 50c9dea184d284d84bc7e0822bb870d9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj.meta new file mode 100644 index 0000000..80ec47c --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad0abde879bdd410199166a9164ebc16 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor.meta new file mode 100644 index 0000000..e4ce642 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 965cd469bf04d4cc9a8d2cc8c7daf270 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor/Dependencies.xml b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor/Dependencies.xml new file mode 100644 index 0000000..1852890 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor/Dependencies.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor/Dependencies.xml.meta new file mode 100644 index 0000000..7f15301 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6437e098bd08a44b7885c53c03330621 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/network_data.json new file mode 100644 index 0000000..eea9876 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/network_data.json @@ -0,0 +1 @@ +{"name":"csj","version":"7.5.0.1","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/iOS/China/csj"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/network_data.json.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/network_data.json.meta new file mode 100644 index 0000000..2e609a9 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/csj/network_data.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 32015d391988d1247929856b6469e6f3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt.meta new file mode 100644 index 0000000..912efb2 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b29b0c13c4c4844d4b1be5760b6811f6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor.meta new file mode 100644 index 0000000..163306b --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebeba71cc398047fe879c71be3a53d0d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor/Dependencies.xml b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor/Dependencies.xml new file mode 100644 index 0000000..6344353 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor/Dependencies.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor/Dependencies.xml.meta new file mode 100644 index 0000000..5ec6859 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 215f3a5690c3b4ea3bc7abeec1cd916b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/network_data.json new file mode 100644 index 0000000..5ba6a79 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/network_data.json @@ -0,0 +1 @@ +{"name":"gdt","version":"4.15.80","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/iOS/China/gdt"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/network_data.json.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/network_data.json.meta new file mode 100644 index 0000000..81ffbf4 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/gdt/network_data.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aa206b00090001e4a8ddb3b2a8820f60 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou.meta new file mode 100644 index 0000000..ab9f6e8 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5b213b3361cc47a19e52a0bc28b5927 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor.meta new file mode 100644 index 0000000..c96c3b1 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 871f2af504cd74b97a9fd8253a21aedd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor/Dependencies.xml b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor/Dependencies.xml new file mode 100644 index 0000000..a661a36 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor/Dependencies.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor/Dependencies.xml.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor/Dependencies.xml.meta new file mode 100644 index 0000000..3581997 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 801f4c656a41d4485b9d77ecff1ea8b5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/network_data.json b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/network_data.json new file mode 100644 index 0000000..ae3cd94 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/network_data.json @@ -0,0 +1 @@ +{"name":"kuaishou","version":"4.12.20.3","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/iOS/China/kuaishou"} \ No newline at end of file diff --git a/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/network_data.json.meta b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/network_data.json.meta new file mode 100644 index 0000000..22b3ec6 --- /dev/null +++ b/AnyThinkPlugin/AnyThinkAds/Plugins/iOS/China/kuaishou/network_data.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8de46792959b74b43b6178a1daae3d82 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AnyThinkPlugin/Resources/json/2.1.7/plugin_setting_data.json b/AnyThinkPlugin/Resources/json/2.1.7/plugin_setting_data.json index c011b4a..6ba4f23 100644 --- a/AnyThinkPlugin/Resources/json/2.1.7/plugin_setting_data.json +++ b/AnyThinkPlugin/Resources/json/2.1.7/plugin_setting_data.json @@ -1 +1 @@ -{"curCountry":1,"china":{"android_version":"6.5.73","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 +{"curCountry":1,"china":{"android_version":"6.5.73","ios_version":"6.5.45","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/CHANGELOG.md b/CHANGELOG.md index 7c1937c..7548d89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [1.4.16] + +### 新增 + +* 增加 Taku/AnyThink 中国区 iOS Pod 依赖声明，覆盖 core、CSJ、GDT、百度、快手网络。 +* 同步记录 iOS SDK core 版本 `6.5.45`，让 Integration Manager 能识别当前 iOS 安装状态。 + +### 维护 + +* 发布包依赖的 `com.foldcc.cc-framework.commercialization` 对齐到 `1.0.16`，并切换为当前可解析的 `18650` Git UPM 地址。 +* `TopOn 配置` 构建页签在宿主未安装新版构建窗口 API 时自动跳过编译，避免基础框架版本差异导致编辑器编译失败。 + # [1.4.15] ### 修复 diff --git a/Topon_Adapter/Editor/ToponBuildWindowExtension.cs b/Topon_Adapter/Editor/ToponBuildWindowExtension.cs index 9ef385d..cceb84c 100644 --- a/Topon_Adapter/Editor/ToponBuildWindowExtension.cs +++ b/Topon_Adapter/Editor/ToponBuildWindowExtension.cs @@ -1,3 +1,4 @@ +#if TOPON_HAS_CC_FRAMEWORK_COMMON_BUILD_WINDOW using UnityEditor; using UnityEngine; @@ -158,3 +159,4 @@ namespace Topon_Adapter.Editor } } } +#endif diff --git a/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef b/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef index 776093a..6ea490e 100644 --- a/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef +++ b/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef @@ -16,6 +16,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.foldcc.cc-framework.common", + "expression": "[1.0.5,)", + "define": "TOPON_HAS_CC_FRAMEWORK_COMMON_BUILD_WINDOW" + } + ], "noEngineReferences": false } diff --git a/package.json b/package.json index d56241e..6f32dab 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,12 @@ "name": "com.commercialization.topon", "displayName": "Commercialization.topon", "description": "基于topon的广告sdk封装，依赖基础商业化模块", - "version": "1.4.15", + "version": "1.4.16", "unity": "2021.1", "license": "MIT", "repository": { "type": "git", - "url": "http://private.lightyears.ltd:18640/foldcc/Commercialization.topon" + "url": "http://private.lightyears.ltd:18650/foldcc/Commercialization.topon.git" }, "author": { "name": "foldcc", @@ -16,7 +16,7 @@ }, "dependencies": { - "com.foldcc.cc-framework.commercialization" : "http://private.lightyears.ltd:18640/foldcc/CC-Framework.Commercialization.git#1.0.14" + "com.foldcc.cc-framework.commercialization" : "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.16" }, "samples": [ {