From 6b7eb4b559fa495365f8b0a1c2904f8addb4d859 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 16:41:47 +0900
Subject: [PATCH 1/8] feat: add option to avoid name conflict in MergeBone

---
 Editor/Processors/MergeBoneProcessor.cs | 21 +++++++++++++++++----
 Localization/en.po                      |  6 ++++++
 Localization/ja.po                      |  6 ++++++
 Runtime/MergeBone.cs                    |  7 ++++++-
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/Editor/Processors/MergeBoneProcessor.cs b/Editor/Processors/MergeBoneProcessor.cs
index 9099f71f5..fe6a12c44 100644
--- a/Editor/Processors/MergeBoneProcessor.cs
+++ b/Editor/Processors/MergeBoneProcessor.cs
@@ -70,19 +70,24 @@ public void Process(OptimizerSession session)
                     DoBoneMap2(meshInfo2, mergeMapping);
             });
 
+            var counter = 0;
+
             foreach (var pair in mergeMapping)
             {
                 var mapping = pair.Key;
                 var mapped = pair.Value;
+                var avoidNameConflict = mapping.GetComponent<MergeBone>().avoidNameConflict;
                 // if intermediate objects are inactive, moved bone should be initially inactive
                 // animations are not performed correctly but if bones activity is animated, automatic 
                 // merge bone doesn't merge such bone so ignore that for manual merge bone.
-                var activeSelf = ActiveSelfForNow(mapping, mapped);
+                var (activeSelf, namePrefix) = ActiveSelfAndNamePrefix(mapping, mapped);
                 foreach (var child in mapping.DirectChildrenEnumerable().ToArray())
                 {
                     if (mergeMapping.ContainsKey(child)) continue;
                     child.parent = mapped;
                     if (!activeSelf) child.gameObject.SetActive(false);
+                    if (avoidNameConflict)
+                        child.name = namePrefix + "$" + child.name + "$" + (counter++);
                 }
             }
 
@@ -90,11 +95,19 @@ public void Process(OptimizerSession session)
                 if (pair)
                     Object.DestroyImmediate(pair.gameObject);
 
-            bool ActiveSelfForNow(Transform transform, Transform parent)
+            (bool activeSelf, string namePrefix) ActiveSelfAndNamePrefix(Transform transform, Transform parent)
             {
+                var segments = new List<string>();
+                var activeSelf = true;
                 for (; transform != parent; transform = transform.parent)
-                    if (!transform.gameObject.activeSelf) return false;
-                return true;
+                {
+                    segments.Add(transform.name);
+                    activeSelf &= transform.gameObject.activeSelf;
+                }
+
+                segments.Reverse();
+
+                return (activeSelf, string.Join("$", segments));
             }
         }
 
diff --git a/Localization/en.po b/Localization/en.po
index 1d66050df..87d58fa17 100644
--- a/Localization/en.po
+++ b/Localization/en.po
@@ -88,6 +88,12 @@ msgstr "Execute Early doesn't support Animation Remapping. Make sure you made an
 msgid "MergeBone:description"
 msgstr "You will remove this GameObject and merge bone to parent"
 
+msgid "MergeBone:prop:avoidNameConflict"
+msgstr "Avoid Name Conflict"
+
+msgid "MergeBone:tooltip:avoidNameConflict"
+msgstr "By changing names of children GameObjects, avoid GameObject name conflict"
+
 msgid "MergeBone:validation:thereAreComponent"
 msgstr "There are some components other than Transform. This is not supported."
 
diff --git a/Localization/ja.po b/Localization/ja.po
index 9a7b26104..f4dcc7c78 100644
--- a/Localization/ja.po
+++ b/Localization/ja.po
@@ -91,6 +91,12 @@ msgstr "'早期に実行する'はアニメーションのパス修正が動き
 msgid "MergeBone:description"
 msgstr "このGameObjectを削除して親に統合する。"
 
+msgid "MergeBone:prop:avoidNameConflict"
+msgstr "名前の競合を避ける"
+
+msgid "MergeBone:tooltip:avoidNameConflict"
+msgstr "子GameObjectの名前を少し変更することで、ゲームオブジェクト名の競合を回避します"
+
 msgid "MergeBone:validation:thereAreComponent"
 msgstr "Transform以外のコンポーネントがあります。これはサポートされていません。"
 
diff --git a/Runtime/MergeBone.cs b/Runtime/MergeBone.cs
index d51725508..094faa088 100644
--- a/Runtime/MergeBone.cs
+++ b/Runtime/MergeBone.cs
@@ -1,4 +1,5 @@
 using Anatawa12.AvatarOptimizer.ErrorReporting;
+using CustomLocalization4EditorExtension;
 using UnityEngine;
 
 namespace Anatawa12.AvatarOptimizer
@@ -7,5 +8,9 @@ namespace Anatawa12.AvatarOptimizer
     [DisallowMultipleComponent]
     [HelpURL("https://vpm.anatawa12.com/avatar-optimizer/ja/docs/reference/merge-bone/")]
     internal class MergeBone : AvatarTagComponent, IStaticValidated
-    { }
+    {
+        [CL4EELocalized("MergeBone:prop:avoidNameConflict", "MergeBone:tooltip:avoidNameConflict")]
+        [ToggleLeft]
+        public bool avoidNameConflict;
+    }
 }

From 46eb676f3f39a6fc124c71cdf997a3d667a32d46 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 16:44:31 +0900
Subject: [PATCH 2/8] chore: use avoidNameConflict in automatic merge bone

---
 .../Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs b/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs
index 7378d170d..fa3835d1a 100644
--- a/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs
+++ b/Editor/Processors/TraceAndOptimize/FindUnusedObjectsProcessor.cs
@@ -336,7 +336,8 @@ bool ConfigureRecursive(Transform transform, ImmutableModificationsContainer mod
                     }
                 }
 
-                transform.gameObject.GetOrAddComponent<MergeBone>();
+                if (!transform.gameObject.GetComponent<MergeBone>())
+                    transform.gameObject.AddComponent<MergeBone>().avoidNameConflict = true;
 
                 return true;
             }

From 9c22f58a8a09b8fc22a0b7c0d393a58b215651ef Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 17:01:11 +0900
Subject: [PATCH 3/8] docs(merge-bone): add about Avoid Name Conflict

---
 .../docs/reference/merge-bone/component.png   | Bin 7797 -> 7873 bytes
 .../docs/reference/merge-bone/index.ja.md     |   4 +++-
 .../docs/reference/merge-bone/index.md        |   4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.docs/content/docs/reference/merge-bone/component.png b/.docs/content/docs/reference/merge-bone/component.png
index 98f5a1471eda2a78f92423cab6d183242e3338e0..d2c7f5aea87acb0e40b4aeb925d640bd7fe1a015 100644
GIT binary patch
literal 7873
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

literal 7797
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
NhKi1IsiH;5{{uE#e4zjU

diff --git a/.docs/content/docs/reference/merge-bone/index.ja.md b/.docs/content/docs/reference/merge-bone/index.ja.md
index 652ac9711..8890ebf6f 100644
--- a/.docs/content/docs/reference/merge-bone/index.ja.md
+++ b/.docs/content/docs/reference/merge-bone/index.ja.md
@@ -11,6 +11,8 @@ weight: 100
 
 このコンポーネントが付いているGameObjectの全ての子GameObjectは、その親GameObjectの子になります。
 
-今のところ、このコンポーネントに設定項目はありません。
+## 設定 {#settings}
 
 ![component.png](component.png)
+
+- `名前の競合を避ける` この設定をオンにするとマージされたあとに子ボーンの名前がかぶることによってアニメーションが正しく動かなくなる問題を回避します。
diff --git a/.docs/content/docs/reference/merge-bone/index.md b/.docs/content/docs/reference/merge-bone/index.md
index 97a9afa1c..8d1d05371 100644
--- a/.docs/content/docs/reference/merge-bone/index.md
+++ b/.docs/content/docs/reference/merge-bone/index.md
@@ -13,4 +13,8 @@ All children of GameObject this component is applied to will belongs to parent o
 
 This Component doesn't have any configuration for now.
 
+## Settings
+
 ![component.png](component.png)
+
+- `Avoid Name Conflict` Avoids animation problems with name conflict by renaming child GameObjects

From fc6daf5e2082c5361dadfe7d8e3571fb3f967734 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 17:01:57 +0900
Subject: [PATCH 4/8] chore(merge-bone): avoidNameConflict by default for newly
 created MergeBone

---
 Runtime/MergeBone.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Runtime/MergeBone.cs b/Runtime/MergeBone.cs
index 094faa088..50ebbca12 100644
--- a/Runtime/MergeBone.cs
+++ b/Runtime/MergeBone.cs
@@ -12,5 +12,10 @@ internal class MergeBone : AvatarTagComponent, IStaticValidated
         [CL4EELocalized("MergeBone:prop:avoidNameConflict", "MergeBone:tooltip:avoidNameConflict")]
         [ToggleLeft]
         public bool avoidNameConflict;
+
+        private void Reset()
+        {
+            avoidNameConflict = true;
+        }
     }
 }

From 011026369658ef8b0dcdff58c962afa5d286d3e1 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 17:06:55 +0900
Subject: [PATCH 5/8] docs(changelog): Avoid Name Conflict in MergeBone and use
 it in Automatic

---
 CHANGELOG-PRERELEASE.md | 2 ++
 CHANGELOG.md            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
index ce5b3842b..adb2cf4e1 100644
--- a/CHANGELOG-PRERELEASE.md
+++ b/CHANGELOG-PRERELEASE.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Avoid Name Conflict in MergeBone `#467`
 
 ### Changed
 
@@ -17,6 +18,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - Light disappears `#466`
+- Automatic MergeBone may break Animation by conflictng GameObject name `#467`
 
 ### Security
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5935c8e5..1b103c943 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog].
   - Moved `Use Advanced Animator Parser` to there
   - Added `Exclusions` for exclude some GameObjects from optimization
   - In this section, there are for debugging GC Objects `#464`
+- Avoid Name Conflict in MergeBone `#467`
 
 ### Changed
 - Improved 'Remove Unused Objects' `#401`

From 0d119ddc4c6f91f41efd70f4b2985f3e456ff234 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 23:35:13 +0900
Subject: [PATCH 6/8] chore(localization): Apply suggestions from code review

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 Localization/en.po | 2 +-
 Localization/ja.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Localization/en.po b/Localization/en.po
index 87d58fa17..f2bfaf1fc 100644
--- a/Localization/en.po
+++ b/Localization/en.po
@@ -92,7 +92,7 @@ msgid "MergeBone:prop:avoidNameConflict"
 msgstr "Avoid Name Conflict"
 
 msgid "MergeBone:tooltip:avoidNameConflict"
-msgstr "By changing names of children GameObjects, avoid GameObject name conflict"
+msgstr "Renaming children GameObjects to avoid name conflict"
 
 msgid "MergeBone:validation:thereAreComponent"
 msgstr "There are some components other than Transform. This is not supported."
diff --git a/Localization/ja.po b/Localization/ja.po
index f4dcc7c78..d3ef8a7a2 100644
--- a/Localization/ja.po
+++ b/Localization/ja.po
@@ -95,7 +95,7 @@ msgid "MergeBone:prop:avoidNameConflict"
 msgstr "名前の競合を避ける"
 
 msgid "MergeBone:tooltip:avoidNameConflict"
-msgstr "子GameObjectの名前を少し変更することで、ゲームオブジェクト名の競合を回避します"
+msgstr "統合時に子GameObjectの名前を変更し、名前の重複を回避します"
 
 msgid "MergeBone:validation:thereAreComponent"
 msgstr "Transform以外のコンポーネントがあります。これはサポートされていません。"

From 350fdd01aa21449466ded5b7c6c7415036cdecf1 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 23:35:52 +0900
Subject: [PATCH 7/8] docs: Apply suggestions from code review

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 .docs/content/docs/reference/merge-bone/index.ja.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docs/content/docs/reference/merge-bone/index.ja.md b/.docs/content/docs/reference/merge-bone/index.ja.md
index 8890ebf6f..6468e44e2 100644
--- a/.docs/content/docs/reference/merge-bone/index.ja.md
+++ b/.docs/content/docs/reference/merge-bone/index.ja.md
@@ -15,4 +15,4 @@ weight: 100
 
 ![component.png](component.png)
 
-- `名前の競合を避ける` この設定をオンにするとマージされたあとに子ボーンの名前がかぶることによってアニメーションが正しく動かなくなる問題を回避します。
+- `名前の競合を避ける` 統合時に子GameObjectの名前を変更することで、名前の重複によってアニメーションが正しく動かなくなる問題を回避します。

From 0caa724be24cca0fc8b75040ecf590e890694e16 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 14 Sep 2023 23:37:53 +0900
Subject: [PATCH 8/8] chore(localization): Apply suggestions from code review

---
 Localization/en.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Localization/en.po b/Localization/en.po
index f2bfaf1fc..d10940117 100644
--- a/Localization/en.po
+++ b/Localization/en.po
@@ -92,7 +92,7 @@ msgid "MergeBone:prop:avoidNameConflict"
 msgstr "Avoid Name Conflict"
 
 msgid "MergeBone:tooltip:avoidNameConflict"
-msgstr "Renaming children GameObjects to avoid name conflict"
+msgstr "Renames child GameObjects to avoid name conflict"
 
 msgid "MergeBone:validation:thereAreComponent"
 msgstr "There are some components other than Transform. This is not supported."