AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2024-12-29 18:55:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve parameter type conflicts for menu items in params usage … (#1174)

Browse Source 
* fix: resolve parameter type conflicts for menu items in params usage window

* Revert "fix: resolve parameter type conflicts for menu items in params usage window"

This reverts commit 4c6b41de4c.

* fix: expand conflicting parameter types for menu item in introspection

* chore: update NDMF dependency

---------

Co-authored-by: bd_ <bd_@nadena.dev>
This commit is contained in:
nekobako 2024-09-23 10:18:27 +09:00 committed by GitHub
parent a5e716cb3e
commit 2d8f5d764e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ProjectRoot/vpm-manifest-2022.json vendored
View File

@ -19,7 +19,7 @@
"dependencies": {} "dependencies": {}
}, },
"nadena.dev.ndmf": { "nadena.dev.ndmf": {
"version": "1.5.0-rc.7" "version": "1.5.0-rc.8"
} }
} }
} }

1
Editor/ParamsUsage/MAParametersIntrospection.cs
View File

@ -39,6 +39,7 @@ namespace nadena.dev.modular_avatar.core.editor
ParameterNamespace.Animator, ParameterNamespace.Animator,
_component, PluginDefinition.Instance, _component.AnimatorControllerParameterType) _component, PluginDefinition.Instance, _component.AnimatorControllerParameterType)
{ {
ExpandTypeOnConflict = true,
WantSynced = _component.isSynced, WantSynced = _component.isSynced,
IsHidden = hidden, IsHidden = hidden,
DefaultValue = _component.isDefault ? _component.Control.value : null DefaultValue = _component.isDefault ? _component.Control.value : null

2
package.json
View File

@ -16,6 +16,6 @@
}, },
"vpmDependencies": { "vpmDependencies": {
"com.vrchat.avatars": ">=3.7.0", "com.vrchat.avatars": ">=3.7.0",
"nadena.dev.ndmf": ">=1.5.0-rc.7 <2.0.0-a" "nadena.dev.ndmf": ">=1.5.0-rc.8 <2.0.0-a"
} }
} }