diff --git a/Assets/CHANGELOG.md b/Assets/CHANGELOG.md index 04974b7..b3ee816 100644 --- a/Assets/CHANGELOG.md +++ b/Assets/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.4.13] + +### 修复 + +* 移除包内嵌的 EDM4U 1.2.177,避免消费项目启动导入阶段重复初始化 Google Version Handler 并写入 `ProjectSettings/GvhProjectSettings.xml`。 +* 保留 `Dependencies.xml` 依赖声明,由宿主项目统一安装和管理 EDM4U 版本。 + # [1.4.12] ### 修复 diff --git a/Assets/ExternalDependencyManager.meta b/Assets/ExternalDependencyManager.meta deleted file mode 100644 index d85fd79..0000000 --- a/Assets/ExternalDependencyManager.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 90c597385ff9346a89d38256315fb735 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor.meta b/Assets/ExternalDependencyManager/Editor.meta deleted file mode 100644 index 4cb3cae..0000000 --- a/Assets/ExternalDependencyManager/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 773d3f2446f5440bb892ec25e114d547 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177.meta b/Assets/ExternalDependencyManager/Editor/1.2.177.meta deleted file mode 100644 index a6f462e..0000000 --- a/Assets/ExternalDependencyManager/Editor/1.2.177.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9ee3e98fba8c1468bbdf8cfa0803a7d8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll deleted file mode 100644 index 3854d85..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll and /dev/null differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta deleted file mode 100644 index 5457a30..0000000 --- a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -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: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll deleted file mode 100644 index 4412429..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll and /dev/null differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta deleted file mode 100644 index 2b43bba..0000000 --- a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -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: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll deleted file mode 100644 index 658282c..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll and /dev/null differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta deleted file mode 100644 index 2e94805..0000000 --- a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -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: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll deleted file mode 100644 index f80ebeb..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll and /dev/null differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta deleted file mode 100644 index a6a4454..0000000 --- a/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -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: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll deleted file mode 100644 index 65b099b..0000000 Binary files a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and /dev/null differ diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta deleted file mode 100644 index a35483b..0000000 --- a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -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: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt deleted file mode 100644 index 5aac0e8..0000000 --- a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.mdb -Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.mdb -Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb -Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta deleted file mode 100644 index 2adb22e..0000000 --- a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -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: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/package.json b/Assets/package.json index 11fbfb5..969c721 100644 --- a/Assets/package.json +++ b/Assets/package.json @@ -2,7 +2,7 @@ "name": "com.commercialization.topon", "displayName": "Commercialization.topon", "description": "基于topon的广告sdk封装,依赖基础商业化模块", - "version": "1.4.12", + "version": "1.4.13", "unity": "2021.1", "license": "MIT", "repository": { diff --git a/README.md b/README.md index 277069a..3fc9bf9 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ - 业务项目引用的也是 `Assets/package.json` 对应 tag。 - 本地工程里的 `Packages/manifest.json` 只用于当前源码工程联调,不参与发布。 - 当前发布版本: - - `com.commercialization.topon`:`1.4.10` + - `com.commercialization.topon`:`1.4.13` - `com.foldcc.cc-framework.commercialization`:`1.0.14` ### 2.3 发布前检查 @@ -91,9 +91,11 @@ - `gromoreRes.androidlib`:额外 Android 资源载体 - 多个 `*.DISABLED` 模板文件:当前不作为主流程依赖,保留给手工切换或历史兼容 -### 3.4 `Assets/ExternalDependencyManager` +### 3.4 EDM4U / External Dependency Manager -EDM4U 依赖解析器,负责消费 `Dependencies.xml` 并拉取 Android/iOS 依赖。 +本包不再内嵌 `Assets/ExternalDependencyManager`。`Topon_Adapter` 和 `AnyThinkPlugin` 仍保留 `Dependencies.xml` 依赖声明,由宿主项目统一安装和管理 EDM4U / Google External Dependency Manager 版本。 + +这样可以避免多个 UPM 包重复携带 Google Version Handler,在 Unity 启动和导入阶段反复写入 `ProjectSettings/GvhProjectSettings.xml`。 ## 4. 运行时架构