From 4354817134e57bf82f10d16296ab2455ad803389 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sat, 16 Nov 2024 19:45:05 -0800 Subject: [PATCH 1/7] fix: incorrect item name in mesh settings JP docs Closes: #1314 --- .../current/reference/mesh-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mesh-settings.md b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mesh-settings.md index 6d828753..8f8677ec 100644 --- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mesh-settings.md +++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/mesh-settings.md @@ -28,7 +28,7 @@ Mesh Settingsコンポーネントを使用すると、特定のゲームオブ - 継承：このコンポーネントはこの設定に対して何もしません。親のMesh Settingsで設定された値を継承します。 - 設定：このコンポーネントは、そのゲームオブジェクトとその子にあるメッシュの対応する設定を設定します。 - 設定しない：このコンポーネントは、親のMesh Settingsの影響を受けないようにします。メッシュはデフォルトの設定のままです。 -- 親が継承された時は継承、それ以外では設定：親のMesh Settingsが設定モードにある場合、それが使用されます。親のMesh +- 親で指定されている時は継承、それ以外では設定：親のMesh Settingsが設定モードにある場合、それが使用されます。親のMesh Settingsが適用されない場合、 このコンポーネントの設定が使用されます。衣装プレハブなどに、アバター全体の設定が優先されるようにするために便利です。 From 904c66975aecc8ed5921312cf290833629c32569 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 16 Feb 2025 16:02:56 -0800 Subject: [PATCH 2/7] docs: update outdated VHA docs Closes: #1444 --- docs~/docs/reference/visible-head-accessory.md | 12 ++++++++---- .../current/reference/visible-head-accessory.md | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/docs~/docs/reference/visible-head-accessory.md b/docs~/docs/reference/visible-head-accessory.md index e6383ce1..02b24ade 100644 --- a/docs~/docs/reference/visible-head-accessory.md +++ b/docs~/docs/reference/visible-head-accessory.md @@ -14,11 +14,15 @@ This component cannot be used as the child of a PhysBone chain (you can add it i Using this component on _all_ children of the Head can be distracting, as your bangs continually get in the way. -Finally, the processing involved in this component is somewhat heavyweight, and may result in slower build times. - ## Setting up Visible Head Accessory Just attach a Visible Head Accessory component under a child of the Head bone. There are no configuration options to set. -The component will automatically generate a clone of the Head bone, which is connected to the real head bone using a parent constraint. -Only one constraint will be generated, even if multiple Visible Head Accessory components are used. As such, the performance impact of this component is the same whether you use one or dozens. +## How it works + +On VRChat, the component uses VRCHeadChop to make the selected bones visible. The main difference between this and +simply using VRCHeadChop, is that it adjusts the mesh to ensure that triangles don't clip through the player viewpoint. + +This is done by looking for triangles that have some vertices weighted to a visible bone, and some weighted to a hidden +bone, such as the root `Head` bone. The component then adjusts the mesh, adding new proxy bones and switching the weights +over to ensure that the triangle is fully visible. \ No newline at end of file diff --git a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/visible-head-accessory.md b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/visible-head-accessory.md index 8f2d2dcf..b3b57d3d 100644 --- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/visible-head-accessory.md +++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/visible-head-accessory.md @@ -14,11 +14,14 @@ Head以下のすべての子で使うと、前髪が邪魔になることがあるので要注意。 -また、このコンポーネントは処理が若干重いので、ビルド処理が数秒伸びることがあります。 - ## セットアップ方法 Headボーンの子にVisible Head Accessoryコンポーネントを付けるだけです。設定はありません。 -このコンポーネントは自動的にHeadボーンを複製し、Parent Constraintで本物のHeadボーンに追従させます。 -複数のVisible Head Accessoryコンポーネントを使っても、Constraintは一つだけです。なので、複数のボーンを指定しても、その分重くなることはありません。 +## 動作原理 + +VRChatでは、このコンポーネントはVRCHeadChopを使って選択したボーンを表示します。VRCHeadChopを使うのとの主な違いは、メッシュを調整し、 +三角形がプレイヤーの視点を通り抜けることがないようにすることです。 + +この問題を対処するには、一部の頂点が表示されるボーンにウェイトがかかっていて、一部が非表示のボーンにウェイトがかかっている +三角形を探し出し、新しいプロキシボーンを追加して、ウェイトをそちらに切り替えることで三角形が完全に表示されるようにする処理となっています。 From 930d25a4f659b2c0b4f2ccbfea822796e8715fde Mon Sep 17 00:00:00 2001 From: bd_ Date: Wed, 19 Feb 2025 18:26:06 -0800 Subject: [PATCH 3/7] fix: incorrect initial state for inverted Shape Changers (#1457) --- .../ReactiveObjectAnalyzer.LocateReactions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs index 01e12505..44c49297 100644 --- a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs +++ b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs @@ -255,7 +255,7 @@ namespace nadena.dev.modular_avatar.core.editor var action = ObjectRule(key, changer, value); action.Inverted = _computeContext.Observe(changer, c => c.Inverted); - if (changer.gameObject.activeInHierarchy) info.currentState = action.Value; + if (changer.gameObject.activeInHierarchy ^ changer.Inverted) info.currentState = action.Value; if (info.actionGroups.Count == 0) { From 0ee8ec63850bc32f32620c96104a725c4a4c60bb Mon Sep 17 00:00:00 2001 From: bd_ Date: Wed, 19 Feb 2025 18:26:46 -0800 Subject: [PATCH 4/7] 1.11.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f308e022..dbe85c0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nadena.dev.modular-avatar", "displayName": "Modular Avatar", - "version": "1.11.5", + "version": "1.11.6", "unity": "2022.3", "description": "A suite of tools for assembling your avatar out of reusable components", "author": { From 6768f3ef91591337449f3577d5b6baa85aa1612b Mon Sep 17 00:00:00 2001 From: nadena-dev-ci Date: Mon, 3 Mar 2025 10:43:01 +0900 Subject: [PATCH 5/7] New Crowdin updates (#1409) * New translations en-us.json (Chinese Traditional) * New translations en-us.json (Chinese Traditional) * New translations en-us.json (Chinese Simplified) --- Editor/Localization/zh-Hans.json | 8 ++++---- Editor/Localization/zh-Hant.json | 22 +++++++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Editor/Localization/zh-Hans.json b/Editor/Localization/zh-Hans.json index 176e7054..84d92b3e 100644 --- a/Editor/Localization/zh-Hans.json +++ b/Editor/Localization/zh-Hans.json @@ -14,7 +14,7 @@ "menuinstall.menu_icon_too_large": "菜单图标过大，图标应小于 256 像素。", "menuinstall.menu_icon_uncompressed": "菜单图标未设置压缩。", "menuinstall.srcmenu": "要安装的菜单", - "params.syncmode.NotSynced": "仅 Animator（不同步）", + "params.syncmode.NotSynced": "仅 Animator 内部（不同步）", "params.syncmode.Int": "Int", "params.syncmode.Float": "Float", "params.syncmode.Bool": "Bool", @@ -65,7 +65,7 @@ "merge_armature.mangle_names": "避免名称冲突", "merge_armature.mangle_names.tooltip": "通过重命名新添加的骨骼来避免与其他资源发生名称冲突。", "path_mode.Relative": "相对路径（基于当前对象）", - "path_mode.Absolute": "绝对路径（基于 Avatar 的 Root）", + "path_mode.Absolute": "绝对路径（基于 Avatar 的根对象）", "merge_animator.animator": "要合并的 Animator", "merge_animator.layer_type": "Layer 类型", "merge_animator.delete_attached_animator": "删除额外的 Animator", @@ -128,7 +128,7 @@ "mesh_settings.inherit_mode.Inherit": "继承", "mesh_settings.inherit_mode.Set": "指定", "mesh_settings.inherit_mode.DontSet": "不指定（保持原有的设置）", - "mesh_settings.inherit_mode.SetOrInherit": "父级设置优先，否则遵从指定设置", + "mesh_settings.inherit_mode.SetOrInherit": "父级设置优先，否则遵从指定的设置", "pb_blocker.help": "当前对象不会受到附加在父对象的 PhysBones 影响。", "hint.bad_vrcsdk": "检测到不兼容的 VRCSDK 版本。\n\n请尝试升级 VRCSDK；如果这不起作用，请尝试更新到新版本的 Modular Avatar。", "error.stack_trace": "Stack trace（请在报告错误时提供此信息！）", @@ -244,7 +244,7 @@ "setup_outfit.err.multiple_avatar_descriptors": "在 {0} 和其父级中有多个 Avatar descriptor。\n\n你是要制作「混合 Avatar」吗？如果是，请从「内层 Avatar」中移除 Avatar descriptor 组件，然后对其执行 Setup outfit。", "setup_outfit.err.no_avatar_descriptor": "在 {0} 的父级中找不到 VRC Avatar Descriptor。请确认你的服装是否被正确放置在 Avatar 里。", "setup_outfit.err.no_animator": "你的 Avatar 没有 Animator 组件。", - "setup_outfit.err.no_hips": "你的 Avatar 没有 Hips 骨骼。Setup Outfit 只能用于人形(humanoid) 的 Avatar。", + "setup_outfit.err.no_hips": "你的 Avatar 没有 Hips 骨骼。Setup Outfit 只能用于人形 (humanoid) 的 Avatar。", "setup_outfit.err.no_outfit_hips": "无法识别服装的 Hips 骨骼，已尝试搜索包含以下名称的对象：", "move_independently.group-header": "要一起移动的对象", "scale_adjuster.scale": "调整比例", diff --git a/Editor/Localization/zh-Hant.json b/Editor/Localization/zh-Hant.json index bdc8b921..27c13dff 100644 --- a/Editor/Localization/zh-Hant.json +++ b/Editor/Localization/zh-Hant.json @@ -51,6 +51,7 @@ "merge_parameter.ui.add_button": "添加", "merge_parameter.ui.details": "參數設定", "merge_parameter.ui.overrideAnimatorDefaults": "覆蓋 Animator 預設值", + "merge_parameter.ui.importFromAsset": "從 Assets 匯入", "merge_armature.merge_target": "合併目標", "merge_armature.merge_target.tooltip": "當前物件要合併到的骨架（或其子級）", "merge_armature.prefix": "骨骼前綴", @@ -86,6 +87,7 @@ "merge_armature.lockmode.bidirectional.body": "Avatar 骨骼和當前物件的骨骼的位置始終相同。\n此模式對創建基於 Avatar 骨骼的動畫時非常有用。\n啟用此模式要求 Avatar 骨骼和當前物件的骨骼位置完全相同。", "merge_armature.reset_pos": "將位置與 Avatar 進行對齊", "merge_armature.reset_pos.info": "此命令將強制服裝骨骼與 Avatar 骨骼進行對齊，在使用非 Avatar 對應的服裝時可能有幫助。", + "merge_armature.reset_pos.convert_atpose": "轉換 A-Pose/T-Pose 以符合角色", "merge_armature.reset_pos.adjust_rotation": "也對齊旋轉", "merge_armature.reset_pos.adjust_scale": "也對齊縮放", "merge_armature.reset_pos.execute": "執行", @@ -99,6 +101,7 @@ "worldfixed.quest": "此元件未生效，因為它與 Android 環境不相容。", "worldfixed.normal": "當前物件將會固定於世界，除非你使用約束將它綁在 Avatar 內。", "fpvisible.normal": "當前物件將在第一人稱視角中可見。", + "fpvisible.NotUnderHead": "此元件在未放置於 Head 骨骼下時不會生效。\n如果是透過 Bone Proxy 等方式將其放於 Head 骨骼下，則可忽略此警告。", "fpvisible.quest": "此元件未生效，因為它與 Android 環境不相容。", "fpvisible.InPhysBoneChain": "當前物件由 Physics Bone 控制，可能無法在第一人稱視角中可見；請指定 Physics Bone 鏈的起點。", "blendshape.mesh": "網格", @@ -148,6 +151,9 @@ "error.rename_params.default_value_conflict:hint": "為了避免不可預測的行為，請將 MA Parameters 元件中所有預設值留空，只留一個。如果存在多個值，Modular Avatar 將選擇第一個預設值。", "error.replace_object.null_target": "[MA-0008] 未指定要替換的物件", "error.replace_object.null_target:hint": "Replace object 需要知道要替換掉哪個物件。嘗試指定一個。", + "error.replace_object.replacing_replacement": "[MA-0009] 不能在多個 Replace Object 元件中指定相同的目標物件", + "error.replace_object.parent_of_target": "[MA-0010] 目標物件不能是此物件的父級", + "error.singleton": "[MA-0011] 在一個 Avatar 中只允許存在單個 {0} 元件", "validation.blendshape_sync.no_local_renderer": "[MA-1000] 在此物件上找不到 Renderer", "validation.blendshape_sync.no_local_renderer:hint": "Blendshape Sync 作用於所在物件上的 Skinned Mesh Renderer。你是否將它附加到正確的物件上？", "validation.blendshape_sync.no_local_mesh": "[MA-1001] 在此物件的 Renderer 上找不到網格（Mesh）", @@ -187,6 +193,7 @@ "menuitem.prop.value": "參數值", "menuitem.prop.value.tooltip": "設定選單項觸發時的參數值", "menuitem.prop.automatic_value": "自動", + "menuitem.prop.automatic_value.tooltip": "自動將此控制設定為唯一值", "menuitem.prop.parameter": "參數", "menuitem.prop.label": "名稱", "menuitem.prop.submenu_asset": "子選單資源", @@ -238,6 +245,7 @@ "setup_outfit.err.no_avatar_descriptor": "在 {0} 的父級中找不到 VRC Avatar Descriptor。請確保你的服裝放置在 Avatar 裡。", "setup_outfit.err.no_animator": "你的 Avatar 沒有 Animator 元件。", "setup_outfit.err.no_hips": "你的 Avatar 沒有 Hips 骨骼。Setup Outfit 只能用於 humanoid Avatars。", + "setup_outfit.err.no_outfit_hips": "識別不到服裝的 Hips 骨骼，已嘗試搜尋含有以下名稱的骨骼物件（不區分大小寫）：", "move_independently.group-header": "要一起移動的物件", "scale_adjuster.scale": "調整比例", "scale_adjuster.adjust_children": "調整子級的位置", @@ -272,5 +280,17 @@ "ro_sim.effect_group.material.tooltip": "Reactive Component 啟用時，將被設在目標元件上的材質", "ro_sim.effect_group.rule_inverted": "規則的條件已反轉", "ro_sim.effect_group.rule_inverted.tooltip": "這條規則將在未達成其任一條件時套用。", - "ro_sim.effect_group.conditions": "條件" + "ro_sim.effect_group.conditions": "條件", + "menuitem.label.long_name.tooltip": "使用可能含有富文本和換行符號的長名稱。", + "menuitem.label.gameobject_name.tooltip": "使用物件的名稱。", + "remove-vertex-color.mode": "模式", + "remove-vertex-color.mode.Remove": "移除頂點顏色", + "remove-vertex-color.mode.DontRemove": "保留頂點顏色", + "general.vrcsdk-required": "此元件需要 VRCSDK 才能運作。", + "sync-param-sequence.platform": "主平台", + "sync-param-sequence.platform.tooltip": "此平台進行建置時，Modular Avatar 將記錄所有參數，供其他平台使用。", + "sync-param-sequence.parameters": "共用的參數資源", + "sync-param-sequence.parameters.tooltip": "用來儲存共用參數的資源檔。請勿使用已在 Avatar Descriptor 中設定的相同參數。", + "sync-param-sequence.create-asset": "新增", + "sync-param-sequence.create-asset.tooltip": "創建一個新的 Expression Parameters" } From 419f34baaaf8fffa450725a5a1cd28013aa7fd65 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 2 Mar 2025 18:20:18 -0800 Subject: [PATCH 6/7] fix: incorrect initial states for Shape Changer (#1463) --- .../ReactiveObjectAnalyzer.LocateReactions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs index 44c49297..99aa1229 100644 --- a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs +++ b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectAnalyzer.LocateReactions.cs @@ -254,8 +254,8 @@ namespace nadena.dev.modular_avatar.core.editor var action = ObjectRule(key, changer, value); action.Inverted = _computeContext.Observe(changer, c => c.Inverted); - - if (changer.gameObject.activeInHierarchy ^ changer.Inverted) info.currentState = action.Value; + + info.currentState = currentValue; if (info.actionGroups.Count == 0) { From a18a915288ff5d6a65b4c24eef268f45cb1465f4 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sat, 8 Mar 2025 21:27:14 -0800 Subject: [PATCH 7/7] 1.11.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbe85c0c..16e1c198 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nadena.dev.modular-avatar", "displayName": "Modular Avatar", - "version": "1.11.6", + "version": "1.11.7", "unity": "2022.3", "description": "A suite of tools for assembling your avatar out of reusable components", "author": {