diff --git a/.vpm/build.js b/.vpm/build.js index 7753015..78f66dc 100644 --- a/.vpm/build.js +++ b/.vpm/build.js @@ -135,6 +135,12 @@ for (const { name, version, internal } of dependencies) { ])); } Object.assign(manifest, namePartialManifestPairs[name]); + if (manifest.name === 'com.vrmc.gltf' && semver.gte(manifest.version, '0.125.0')) { + // UniGLTF-0.125.0かそれ以上のバージョンなら + // VRMShardersが統合されているため + manifest.legacyPackages = (manifest.legacyPackages ?? [ ]).concat([ 'com.vrmc.vrmshaders' ]); + Object.assign(manifest.legacyFolders, namePartialManifestPairs['com.vrmc.vrmshaders'].legacyFolders); + } manifest.url = packageURLPrefix + packageFileName; await fs.writeFile(manifestPath, JSON.stringify(manifest, null, '\t')); diff --git a/Editor/Esperecyan.Unity.VRMConverterForVRChat.Editor.asmdef b/Editor/Esperecyan.Unity.VRMConverterForVRChat.Editor.asmdef index aaf72a8..c146888 100644 --- a/Editor/Esperecyan.Unity.VRMConverterForVRChat.Editor.asmdef +++ b/Editor/Esperecyan.Unity.VRMConverterForVRChat.Editor.asmdef @@ -1,13 +1,13 @@ { "name": "Esperecyan.Unity.VRMConverterForVRChat.Editor", + "rootNamespace": "", "references": [ "GUID:05dd262a0c0a2f841b8252c8c3815582", "GUID:8d76e605759c3f64a957d63ef96ada7c", "GUID:5f875fdc81c40184c8333b9d63c6ddd5", "GUID:b7aa47b240b57de44a4b2021c143c9bf", "GUID:f7b2dd4e5e1e7264089dc065c45db910", - "GUID:ab550019837c3d44fb7a418b8b18e24a", - "GUID:7ca0cd6f6537b414dabc7f1fa4740ea4" + "GUID:ab550019837c3d44fb7a418b8b18e24a" ], "includePlatforms": [ "Editor" diff --git a/package.json b/package.json index 22af998..6edf632 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "licensesUrl": "https://pokemori.booth.pm/items/1025226", "dependencies": { "com.vrchat.avatars": "3.5.0", - "com.vrmc.univrm": "0.121.0", - "jp.pokemori.univrm-extensions": "10.1.0" + "com.vrmc.univrm": "0.125.0", + "jp.pokemori.univrm-extensions": "10.2.0" }, "author": { "name": "100の人",