AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-01-01 20:25:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Restore a couple of passes lost in the merge

Browse Source
This commit is contained in:
bd_ 2023-09-17 22:21:04 +09:00
parent 370804a829
commit 2f27b13dc0
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/nadena.dev.modular-avatar/Editor/Animation.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 0985d0cf1a434879b3ec7e80a90bc598 guid: 9aeea331419795c41a97112c489b1632
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

2
Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs.meta
View File

@ -1,3 +1,3 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e0ef93cb5a6c4e46bb3318ae8116de77 guid: af583e8ac3104fa4f8466741614219a0
timeCreated: 1691238553 timeCreated: 1691238553

2
Packages/nadena.dev.modular-avatar/Editor/Animation/AnimatorCombiner.cs.meta
View File

@ -1,3 +1,3 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5a3369cd20964957920c3fe8b54df521 guid: 00241ec2d86cdae4bb5076af0699b33a
timeCreated: 1691238359 timeCreated: 1691238359

2
Packages/nadena.dev.modular-avatar/Editor/Animation/IOnCommitObjectRenames.cs.meta
View File

@ -1,3 +1,3 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 17002a48bb4b4ea79993e0549faf2d0e guid: 6a66f552b8b334a45a986bfcf6767200
timeCreated: 1692511752 timeCreated: 1692511752

2
Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs.meta
View File

@ -1,3 +1,3 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: deb8a666d3af40b0be0ac616cf98a05b guid: f60ee78d127fda546a84d5396edfc8b2
timeCreated: 1691237971 timeCreated: 1691237971

19
Packages/nadena.dev.modular-avatar/Editor/PluginDefinition/PluginDefinition.cs
View File

@ -38,7 +38,24 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
}); });
seq.Run(BlendshapeSyncAnimationPluginPass.Instance); seq.Run(BlendshapeSyncAnimationPluginPass.Instance);
seq.Run(PhysbonesBlockerPluginPass.Instance); seq.Run(PhysbonesBlockerPluginPass.Instance);
; seq.Run("Fixup Expressions Menu", ctx =>
{
var maContext = ctx.Extension<ModularAvatarContext>().BuildContext;
FixupExpressionsMenuPass.FixupExpressionsMenu(maContext);
});
seq.Run("Rebind humanoid avatar", ctx =>
{
// workaround problem with avatar matching
// https://github.com/bdunderscore/modular-avatar/issues/430
var animator = ctx.AvatarRootObject.GetComponent<Animator>();
if (animator)
{
var avatar = animator.avatar;
animator.avatar = null;
// ReSharper disable once Unity.InefficientPropertyAccess
animator.avatar = avatar;
}
});
}); });
InPhase(BuildPhase.Optimizing) InPhase(BuildPhase.Optimizing)

15
Packages/packages-lock.json
View File

@ -129,6 +129,13 @@
"com.unity.modules.imgui": "1.0.0" "com.unity.modules.imgui": "1.0.0"
} }
}, },
"com.unity.xr.oculus.android": {
"version": "2.38.6",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.xr.oculus.standalone": { "com.unity.xr.oculus.standalone": {
"version": "2.38.4", "version": "2.38.4",
"depth": 0, "depth": 0,
@ -159,14 +166,6 @@
"com.unity.nuget.newtonsoft-json": "2.0.2" "com.unity.nuget.newtonsoft-json": "2.0.2"
} }
}, },
"com.vrchat.core.vpm-resolver": {
"version": "file:com.vrchat.core.vpm-resolver",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "2.0.2"
}
},
"de.thryrallo.vrc.avatar-performance-tools": { "de.thryrallo.vrc.avatar-performance-tools": {
"version": "https://github.com/Thryrallo/VRC-Avatar-Performance-Tools.git", "version": "https://github.com/Thryrallo/VRC-Avatar-Performance-Tools.git",
"depth": 0, "depth": 0,