diff --git a/Editor/EasySetupOutfit.cs b/Editor/EasySetupOutfit.cs index 4898bb60..28fbe56c 100644 --- a/Editor/EasySetupOutfit.cs +++ b/Editor/EasySetupOutfit.cs @@ -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 // the avdesc object itself) var nearestAvatarTransform = RuntimeUtil.FindAvatarTransformInParents(xform); - if (nearestAvatarTransform == null || nearestAvatarTransform == xform) + if (nearestAvatarTransform == null) { 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; } @@ -320,7 +329,7 @@ namespace nadena.dev.modular_avatar.core.editor { 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; } diff --git a/Editor/Localization/en-us.json b/Editor/Localization/en-us.json index 9735b4bd..8154297f 100644 --- a/Editor/Localization/en-us.json +++ b/Editor/Localization/en-us.json @@ -259,7 +259,8 @@ "setup_outfit.err.header": "Setup Outfit failed to process {0}", "setup_outfit.err.unknown": "Unknown error", "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_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.", diff --git a/Editor/Localization/ja-jp.json b/Editor/Localization/ja-jp.json index 0134b7b8..c5e2c695 100644 --- a/Editor/Localization/ja-jp.json +++ b/Editor/Localization/ja-jp.json @@ -213,7 +213,8 @@ "setup_outfit.err.header": "Setup outfit が「{0}」を処理中に失敗しました。", "setup_outfit.err.unknown": "原因不明のエラーが発生しました。", "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_animator": "アバターにAnimatorコンポーネントがありません。", "setup_outfit.err.no_hips": "アバターにHipsボーンがありません。なお、Setup Outfitはヒューマノイドアバター以外には対応していません。",