fix: incorrect/unclear errors from Setup Outfit (#723)

Closes: #721
This commit is contained in:
bd_ 2024-03-03 00:26:14 -08:00 committed by GitHub
parent 962a75f227
commit a9141a6cfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions

View File

@ -308,10 +308,19 @@ namespace nadena.dev.modular_avatar.core.editor
// refusing to run if we detect multiple avatar descriptors above the current object (or if we're run on // refusing to run if we detect multiple avatar descriptors above the current object (or if we're run on
// the avdesc object itself) // the avdesc object itself)
var nearestAvatarTransform = RuntimeUtil.FindAvatarTransformInParents(xform); var nearestAvatarTransform = RuntimeUtil.FindAvatarTransformInParents(xform);
if (nearestAvatarTransform == null || nearestAvatarTransform == xform) if (nearestAvatarTransform == null)
{ {
errorMessageGroups = new string[] errorMessageGroups = new string[]
{ S_f("setup_outfit.err.multiple_avatar_descriptors", xform.gameObject.name) }; {
S_f("setup_outfit.err.no_avatar_descriptor", xform.gameObject.name)
};
return false;
}
if (nearestAvatarTransform == xform)
{
errorMessageGroups = new string[]
{ S_f("setup_outfit.err.run_on_avatar_itself", xform.gameObject.name) };
return false; return false;
} }
@ -320,7 +329,7 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
errorMessageGroups = new string[] errorMessageGroups = new string[]
{ {
S_f("setup_outfit.err.no_avatar_descriptor", xform.gameObject.name) S_f("setup_outfit.err.multiple_avatar_descriptors", xform.gameObject.name)
}; };
return false; return false;
} }

View File

@ -259,7 +259,8 @@
"setup_outfit.err.header": "Setup Outfit failed to process {0}", "setup_outfit.err.header": "Setup Outfit failed to process {0}",
"setup_outfit.err.unknown": "Unknown error", "setup_outfit.err.unknown": "Unknown error",
"setup_outfit.err.no_selection": "No object selected.", "setup_outfit.err.no_selection": "No object selected.",
"setup_outfit.err.multiple_avatar_descriptors": "Multiple avatar descriptors found in {0} and its parents.", "setup_outfit.err.run_on_avatar_itself": "Setup outfit needs to be run on the outfit object, not on the avatar itself.\n\nAre you trying to make a hybrid avatar? If so, remove the avatar descriptor from the inner avatar, and run setup outfit on that.",
"setup_outfit.err.multiple_avatar_descriptors": "Multiple avatar descriptors found in {0} and its parents.\n\nAre you trying to make a hybrid avatar? If so, remove the avatar descriptor from the inner avatar, and run setup outfit on that.",
"setup_outfit.err.no_avatar_descriptor": "No avatar descriptor found in {0}'s parents. Make sure your outfit is placed inside your avatar.", "setup_outfit.err.no_avatar_descriptor": "No avatar descriptor found in {0}'s parents. Make sure your outfit is placed inside your avatar.",
"setup_outfit.err.no_animator": "Your avatar does not have an Animator component.", "setup_outfit.err.no_animator": "Your avatar does not have an Animator component.",
"setup_outfit.err.no_hips": "Your avatar does not have a Hips bone. Setup Outfit only works on humanoid avatars.", "setup_outfit.err.no_hips": "Your avatar does not have a Hips bone. Setup Outfit only works on humanoid avatars.",

View File

@ -213,7 +213,8 @@
"setup_outfit.err.header": "Setup outfit が「{0}」を処理中に失敗しました。", "setup_outfit.err.header": "Setup outfit が「{0}」を処理中に失敗しました。",
"setup_outfit.err.unknown": "原因不明のエラーが発生しました。", "setup_outfit.err.unknown": "原因不明のエラーが発生しました。",
"setup_outfit.err.no_selection": "オブジェクトが選択されていません。", "setup_outfit.err.no_selection": "オブジェクトが選択されていません。",
"setup_outfit.err.multiple_avatar_descriptors": "「{0}」とその親に、複数のavatar descriptorを発見しました。", "setup_outfit.err.run_on_avatar_itself": "Setup Outfitはアバター自体ではなく、衣装のほうで実行してください。\n\nキメラアバターを作る場合は、中のほうのAvatar Descriptorを消して、衣装として扱ってください。",
"setup_outfit.err.multiple_avatar_descriptors": "「{0}」とその親に、複数のavatar descriptorを発見しました。\n\nキメラアバターを作る場合は、中のほうのAvatar Descriptorを消して、衣装として扱ってください。",
"setup_outfit.err.no_avatar_descriptor": "「{0}」の親に、avatar descriptorが見つかりませんでした。衣装のオブジェクトをアバターの中に配置してください。", "setup_outfit.err.no_avatar_descriptor": "「{0}」の親に、avatar descriptorが見つかりませんでした。衣装のオブジェクトをアバターの中に配置してください。",
"setup_outfit.err.no_animator": "アバターにAnimatorコンポーネントがありません。", "setup_outfit.err.no_animator": "アバターにAnimatorコンポーネントがありません。",
"setup_outfit.err.no_hips": "アバターにHipsボーンがありません。なお、Setup Outfitはヒューマイドアバター以外には対応していません。", "setup_outfit.err.no_hips": "アバターにHipsボーンがありません。なお、Setup Outfitはヒューマイドアバター以外には対応していません。",