From 6177bfd25ed1fd6dd33b697ae7e5f3ab5a6cbcc3 Mon Sep 17 00:00:00 2001
From: OLC <utsumabo@ritsukage.com>
Date: Mon, 17 Nov 2025 02:21:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20UI=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E5=B8=83=E5=B1=80=E5=92=8C=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用 UIFactory 方法简化 RectTransform 和 LayoutGroup 的设置
- 移除冗余的组件添加，提升代码可读性
- 统一了 ContentSizeFitter 的配置方式
---
 .../UI/Components/FunctionButtonBar.cs        | 10 +-
 .../UI/Components/ModelListPanel.cs           | 98 +++++++------------
 .../UI/Components/TargetListPanel.cs          | 14 +--
 DuckovCustomModel/UI/ConfigWindow.cs          | 79 +++++----------
 4 files changed, 63 insertions(+), 138 deletions(-)

diff --git a/DuckovCustomModel/UI/Components/FunctionButtonBar.cs b/DuckovCustomModel/UI/Components/FunctionButtonBar.cs
index ef4afb5..cc332b5 100644
--- a/DuckovCustomModel/UI/Components/FunctionButtonBar.cs
+++ b/DuckovCustomModel/UI/Components/FunctionButtonBar.cs
@@ -35,7 +35,6 @@ public void Initialize(Transform parent)
             layoutElement.flexibleHeight = 1;
             layoutElement.preferredHeight = 80;
 
-            buttonBar.AddComponent<HorizontalLayoutGroup>();
             UIFactory.SetupHorizontalLayoutGroup(buttonBar, 10f, new(10, 10, 10, 10));
 
             BuildRefreshButton(buttonBar);
@@ -50,8 +49,7 @@ private void BuildRefreshButton(GameObject parent)
         {
             _refreshButton = UIFactory.CreateButton("RefreshButton", parent.transform, OnRefreshButtonClicked,
                 new(0.2f, 0.3f, 0.4f, 1)).GetComponent<Button>();
-            var refreshButtonRect = _refreshButton.GetComponent<RectTransform>();
-            refreshButtonRect.sizeDelta = new(180, 0);
+            UIFactory.SetupRectTransform(_refreshButton.gameObject, Vector2.zero, Vector2.zero, new(180, 0));
 
             var refreshButtonLayoutElement = _refreshButton.gameObject.AddComponent<LayoutElement>();
             refreshButtonLayoutElement.preferredWidth = 180;
@@ -70,8 +68,7 @@ private void BuildResetInvalidModelsButton(GameObject parent)
         {
             _resetInvalidModelsButton = UIFactory.CreateButton("ResetInvalidModelsButton", parent.transform,
                 OnResetInvalidModelsButtonClicked, new(0.4f, 0.2f, 0.2f, 1)).GetComponent<Button>();
-            var resetButtonRect = _resetInvalidModelsButton.GetComponent<RectTransform>();
-            resetButtonRect.sizeDelta = new(180, 0);
+            UIFactory.SetupRectTransform(_resetInvalidModelsButton.gameObject, Vector2.zero, Vector2.zero, new(180, 0));
 
             var resetButtonLayoutElement = _resetInvalidModelsButton.gameObject.AddComponent<LayoutElement>();
             resetButtonLayoutElement.preferredWidth = 180;
@@ -96,8 +93,7 @@ private void BuildOpenModelFolderButton(GameObject parent)
         {
             _openModelFolderButton = UIFactory.CreateButton("OpenModelFolderButton", parent.transform,
                 OnOpenModelFolderButtonClicked, new(0.3f, 0.5f, 0.3f, 1)).GetComponent<Button>();
-            var openFolderButtonRect = _openModelFolderButton.GetComponent<RectTransform>();
-            openFolderButtonRect.sizeDelta = new(180, 0);
+            UIFactory.SetupRectTransform(_openModelFolderButton.gameObject, Vector2.zero, Vector2.zero, new(180, 0));
 
             var openFolderButtonLayoutElement = _openModelFolderButton.gameObject.AddComponent<LayoutElement>();
             openFolderButtonLayoutElement.preferredWidth = 180;
diff --git a/DuckovCustomModel/UI/Components/ModelListPanel.cs b/DuckovCustomModel/UI/Components/ModelListPanel.cs
index 1237b5d..5b3279a 100644
--- a/DuckovCustomModel/UI/Components/ModelListPanel.cs
+++ b/DuckovCustomModel/UI/Components/ModelListPanel.cs
@@ -38,17 +38,11 @@ public void Initialize(Transform parent)
             UIFactory.SetupRectTransform(scrollView.gameObject, Vector2.zero, Vector2.one, Vector2.zero);
 
             _scrollRect = scrollView;
-
             _content = content;
-            _content.AddComponent<VerticalLayoutGroup>();
-            _content.AddComponent<ContentSizeFitter>();
 
             UIFactory.SetupVerticalLayoutGroup(_content, 10f, new(10, 10, 10, 10), TextAnchor.UpperLeft,
                 true, false, true);
-
-            var sizeFitter = _content.GetComponent<ContentSizeFitter>();
-            sizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
-            sizeFitter.horizontalFit = ContentSizeFitter.FitMode.Unconstrained;
+            UIFactory.SetupContentSizeFitter(_content, ContentSizeFitter.FitMode.Unconstrained);
         }
 
         public void SetTarget(TargetInfo? targetInfo)
@@ -246,11 +240,7 @@ private void BuildNoneModelButton()
                 new(0.2f, 0.15f, 0.15f, 0.8f)).gameObject;
             buttonObj.transform.SetAsFirstSibling();
 
-            var buttonRect = buttonObj.GetComponent<RectTransform>();
-            buttonRect.anchorMin = new(0, 0);
-            buttonRect.anchorMax = new(1, 0);
-            buttonRect.pivot = new(0.5f, 0.5f);
-            buttonRect.sizeDelta = new(0, 150);
+            UIFactory.SetupRectTransform(buttonObj, new(0, 0), new(1, 0), new(0, 150), pivot: new(0.5f, 0.5f));
 
             var layoutElement = buttonObj.AddComponent<LayoutElement>();
             layoutElement.minHeight = 150;
@@ -263,9 +253,7 @@ private void BuildNoneModelButton()
             outline.effectDistance = new(1, -1);
 
             var text = UIFactory.CreateText("Text", buttonObj.transform, Localization.NoModel, 16, Color.white,
-                TextAnchor.MiddleCenter);
-            var textComponent = text.GetComponent<Text>();
-            textComponent.fontStyle = FontStyle.Bold;
+                TextAnchor.MiddleCenter, FontStyle.Bold);
             UIFactory.SetupButtonText(text);
 
             var button = buttonObj.GetComponent<Button>();
@@ -292,22 +280,15 @@ private async UniTask BuildModelButtonAsync(ModelBundleInfo bundle, ModelInfo mo
                     isInUse = usingModel.GetModelID(_currentTarget.TargetType) == model.ModelID;
             }
 
-            var buttonObj = new GameObject($"ModelButton_{model.ModelID}", typeof(Image), typeof(Button),
-                typeof(LayoutElement));
-            buttonObj.transform.SetParent(_content.transform, false);
-
-            var buttonImage = buttonObj.GetComponent<Image>();
             Color baseColor = hasError ? new(0.22f, 0.15f, 0.15f, 0.8f) : new(0.15f, 0.18f, 0.22f, 0.8f);
             if (isInUse && !hasError) baseColor = new(0.15f, 0.22f, 0.18f, 0.8f);
-            buttonImage.color = baseColor;
 
-            var buttonRect = buttonObj.GetComponent<RectTransform>();
-            buttonRect.anchorMin = new(0, 0);
-            buttonRect.anchorMax = new(1, 0);
-            buttonRect.pivot = new(0.5f, 0.5f);
-            buttonRect.sizeDelta = new(0, 150);
+            var buttonObj = UIFactory.CreateButton($"ModelButton_{model.ModelID}", _content.transform, null, baseColor)
+                .gameObject;
 
-            var layoutElement = buttonObj.GetComponent<LayoutElement>();
+            UIFactory.SetupRectTransform(buttonObj, new(0, 0), new(1, 0), new(0, 150), pivot: new(0.5f, 0.5f));
+
+            var layoutElement = buttonObj.AddComponent<LayoutElement>();
             layoutElement.minHeight = 150;
             layoutElement.preferredHeight = 150;
             layoutElement.flexibleWidth = 0;
@@ -322,15 +303,12 @@ private async UniTask BuildModelButtonAsync(ModelBundleInfo bundle, ModelInfo mo
                     : new(0.3f, 0.35f, 0.4f, 0.6f);
             outline.effectDistance = new(1, -1);
 
-            var thumbnailImage = new GameObject("Thumbnail", typeof(Image), typeof(LayoutElement));
-            thumbnailImage.transform.SetParent(buttonObj.transform, false);
+            var thumbnailImage = UIFactory.CreateImage("Thumbnail", buttonObj.transform);
+            thumbnailImage.AddComponent<LayoutElement>();
             var thumbnailImageComponent = thumbnailImage.GetComponent<Image>();
-            var thumbnailRect = thumbnailImage.GetComponent<RectTransform>();
-            thumbnailRect.anchorMin = new(0, 0.5f);
-            thumbnailRect.anchorMax = new(0, 0.5f);
-            thumbnailRect.pivot = new(0, 0.5f);
-            thumbnailRect.anchoredPosition = new(10, 0);
-            thumbnailRect.sizeDelta = new(130, 130);
+
+            UIFactory.SetupRectTransform(thumbnailImage, new(0, 0.5f), new(0, 0.5f), new(130, 130),
+                pivot: new(0, 0.5f), anchoredPosition: new(10, 0));
 
             var thumbnailLayoutElement = thumbnailImage.GetComponent<LayoutElement>();
             thumbnailLayoutElement.minWidth = 130;
@@ -361,12 +339,11 @@ private async UniTask BuildModelButtonAsync(ModelBundleInfo bundle, ModelInfo mo
                 UIFactory.SetupRectTransform(placeholderText, Vector2.zero, Vector2.one, Vector2.zero);
             }
 
-            var contentArea = new GameObject("ContentArea", typeof(RectTransform), typeof(VerticalLayoutGroup));
+            var contentArea = new GameObject("ContentArea", typeof(RectTransform));
             contentArea.transform.SetParent(buttonObj.transform, false);
             UIFactory.SetupRectTransform(contentArea, new(0, 0), new(1, 1), offsetMin: new(150, 10),
                 offsetMax: new(-10, -10));
-            UIFactory.SetupVerticalLayoutGroup(contentArea, 2f, new(0, 0, 0, 0), TextAnchor.UpperLeft,
-                true, false, true);
+            UIFactory.SetupVerticalLayoutGroup(contentArea, 2f, new(0, 0, 0, 0), TextAnchor.UpperLeft, true, true);
 
             var nameText = UIFactory.CreateText("Name", contentArea.transform,
                 string.IsNullOrEmpty(model.Name) ? model.ModelID : model.Name, 20,
@@ -388,45 +365,38 @@ private async UniTask BuildModelButtonAsync(ModelBundleInfo bundle, ModelInfo mo
 
             if (hasError)
             {
-                var errorText = new GameObject("Error", typeof(Text), typeof(ContentSizeFitter));
-                errorText.transform.SetParent(contentArea.transform, false);
+                var errorText = UIFactory.CreateText("Error", contentArea.transform,
+                    $"⚠ {(!string.IsNullOrEmpty(errorMessage) ? errorMessage : "Unknown error")}", 15,
+                    new(1f, 0.4f, 0.4f, 1), TextAnchor.UpperLeft, FontStyle.Bold);
                 var errorTextComponent = errorText.GetComponent<Text>();
-                errorTextComponent.text = $"⚠ {(!string.IsNullOrEmpty(errorMessage) ? errorMessage : "Unknown error")}";
-                errorTextComponent.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
-                errorTextComponent.fontSize = 15;
-                errorTextComponent.color = new(1f, 0.4f, 0.4f, 1);
-                errorTextComponent.alignment = TextAnchor.UpperLeft;
-                errorTextComponent.fontStyle = FontStyle.Bold;
                 errorTextComponent.horizontalOverflow = HorizontalWrapMode.Wrap;
                 errorTextComponent.verticalOverflow = VerticalWrapMode.Overflow;
-                var errorRect = errorText.GetComponent<RectTransform>();
-                errorRect.sizeDelta = new(0, 20);
+
+                UIFactory.SetupRectTransform(errorText, Vector2.zero, Vector2.one, new(0, 20));
+
                 var errorLayoutElement = errorText.AddComponent<LayoutElement>();
                 errorLayoutElement.minHeight = 20;
                 errorLayoutElement.flexibleHeight = 1;
-                var contentSizeFitter = errorText.GetComponent<ContentSizeFitter>();
-                contentSizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+
+                UIFactory.SetupContentSizeFitter(errorText, ContentSizeFitter.FitMode.Unconstrained);
             }
 
             if (!string.IsNullOrEmpty(model.Description))
             {
-                var descText = new GameObject("Description", typeof(Text), typeof(ContentSizeFitter));
-                descText.transform.SetParent(contentArea.transform, false);
+                var descSpacer = new GameObject("DescriptionSpacer", typeof(RectTransform));
+                descSpacer.transform.SetParent(contentArea.transform, false);
+                var descSpacerLayout = descSpacer.AddComponent<LayoutElement>();
+                descSpacerLayout.minHeight = 10;
+                descSpacerLayout.preferredHeight = 10;
+                descSpacerLayout.flexibleHeight = 0;
+
+                var descText = UIFactory.CreateText("Description", contentArea.transform, model.Description, 15,
+                    new(0.7f, 0.7f, 0.7f, 1), TextAnchor.UpperLeft);
                 var descTextComponent = descText.GetComponent<Text>();
-                descTextComponent.text = model.Description;
-                descTextComponent.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
-                descTextComponent.fontSize = 15;
-                descTextComponent.color = new(0.7f, 0.7f, 0.7f, 1);
-                descTextComponent.alignment = TextAnchor.UpperLeft;
                 descTextComponent.horizontalOverflow = HorizontalWrapMode.Wrap;
                 descTextComponent.verticalOverflow = VerticalWrapMode.Overflow;
-                var descRect = descText.GetComponent<RectTransform>();
-                descRect.sizeDelta = new(0, 20);
-                var descLayoutElement = descText.AddComponent<LayoutElement>();
-                descLayoutElement.minHeight = 20;
-                descLayoutElement.flexibleHeight = 1;
-                var contentSizeFitter = descText.GetComponent<ContentSizeFitter>();
-                contentSizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+
+                UIFactory.SetupContentSizeFitter(descText, ContentSizeFitter.FitMode.Unconstrained);
             }
 
             var button = buttonObj.GetComponent<Button>();
diff --git a/DuckovCustomModel/UI/Components/TargetListPanel.cs b/DuckovCustomModel/UI/Components/TargetListPanel.cs
index 51de89a..ab00154 100644
--- a/DuckovCustomModel/UI/Components/TargetListPanel.cs
+++ b/DuckovCustomModel/UI/Components/TargetListPanel.cs
@@ -29,17 +29,10 @@ public void Initialize(Transform parent)
                 scrollViewImage.color = new(0.05f, 0.08f, 0.12f, 0.8f);
 
             _scrollRect = scrollView;
-
             _content = content;
-            _content.AddComponent<VerticalLayoutGroup>();
-            _content.AddComponent<ContentSizeFitter>();
-
-            UIFactory.SetupVerticalLayoutGroup(_content, 10f, new(10, 10, 10, 10), TextAnchor.UpperLeft,
-                false);
 
-            var sizeFitter = _content.GetComponent<ContentSizeFitter>();
-            sizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
-            sizeFitter.horizontalFit = ContentSizeFitter.FitMode.Unconstrained;
+            UIFactory.SetupVerticalLayoutGroup(_content, 10f, new(10, 10, 10, 10), TextAnchor.UpperLeft, false);
+            UIFactory.SetupContentSizeFitter(_content, ContentSizeFitter.FitMode.Unconstrained);
         }
 
         public void Refresh()
@@ -119,8 +112,7 @@ private void BuildTargetButton(TargetInfo targetInfo)
 
             var buttonObj = UIFactory.CreateButton($"TargetButton_{targetInfo.Id}", _content.transform,
                 () => OnTargetButtonClicked(targetInfo)).gameObject;
-            var buttonRect = buttonObj.GetComponent<RectTransform>();
-            buttonRect.sizeDelta = new(180, 50);
+            UIFactory.SetupRectTransform(buttonObj, Vector2.zero, Vector2.zero, new(180, 50));
 
             var layoutElement = buttonObj.AddComponent<LayoutElement>();
             layoutElement.minHeight = 50;
diff --git a/DuckovCustomModel/UI/ConfigWindow.cs b/DuckovCustomModel/UI/ConfigWindow.cs
index 17aa60a..bc491aa 100644
--- a/DuckovCustomModel/UI/ConfigWindow.cs
+++ b/DuckovCustomModel/UI/ConfigWindow.cs
@@ -194,11 +194,8 @@ private void BuildMainPanel()
             UIFactory.SetupRectTransform(_overlay, Vector2.zero, Vector2.one, Vector2.zero);
 
             _panelRoot = UIFactory.CreateImage("MainPanel", _uiRoot.transform, new Color(0.1f, 0.12f, 0.15f, 0.95f));
-            var panelRect = _panelRoot.GetComponent<RectTransform>();
-            panelRect.anchorMin = new(0.1f, 0.1f);
-            panelRect.anchorMax = new(0.9f, 0.9f);
-            panelRect.sizeDelta = Vector2.zero;
-            panelRect.anchoredPosition = Vector2.zero;
+            UIFactory.SetupRectTransform(_panelRoot, new(0.1f, 0.1f), new(0.9f, 0.9f), Vector2.zero,
+                anchoredPosition: Vector2.zero);
 
             var outline = _panelRoot.AddComponent<Outline>();
             outline.effectColor = new(0.3f, 0.35f, 0.4f, 0.7f);
@@ -216,42 +213,27 @@ private void BuildTitleBar()
             UIFactory.SetupRectTransform(titleBar, new(0, 1), new(1, 1), new(0, 40),
                 pivot: new Vector2(0.5f, 1), anchoredPosition: new Vector2(0, 0));
 
-            var titleContainer = new GameObject("TitleContainer", typeof(RectTransform), typeof(HorizontalLayoutGroup));
+            var titleContainer = new GameObject("TitleContainer", typeof(RectTransform));
             titleContainer.transform.SetParent(titleBar.transform, false);
-            var titleContainerRect = titleContainer.GetComponent<RectTransform>();
-            titleContainerRect.anchorMin = new(0, 0);
-            titleContainerRect.anchorMax = new(1, 1);
-            titleContainerRect.offsetMin = new(10, 0);
-            titleContainerRect.offsetMax = new(-10, 0);
-
-            var titleLayout = titleContainer.GetComponent<HorizontalLayoutGroup>();
-            titleLayout.spacing = 8;
-            titleLayout.childAlignment = TextAnchor.MiddleCenter;
-            titleLayout.childControlWidth = false;
-            titleLayout.childControlHeight = false;
-            titleLayout.childForceExpandWidth = false;
-            titleLayout.childForceExpandHeight = false;
-            titleLayout.padding = new(0, 0, 0, 0);
+            UIFactory.SetupRectTransform(titleContainer, new(0, 0), new(1, 1), offsetMin: new(10, 0),
+                offsetMax: new(-10, 0));
+            UIFactory.SetupHorizontalLayoutGroup(titleContainer, 8f, new(0, 0, 0, 0), TextAnchor.MiddleCenter,
+                false, false, false, false);
 
             var titleText = UIFactory.CreateText("Title", titleContainer.transform, Localization.Title,
                 20,
                 Color.white, TextAnchor.MiddleCenter, FontStyle.Bold);
             UIFactory.SetLocalizedText(titleText, () => Localization.Title);
 
-            var titleTextRect = titleText.GetComponent<RectTransform>();
-            titleTextRect.sizeDelta = new(0, 0);
-            var titleSizeFitter = titleText.AddComponent<ContentSizeFitter>();
-            titleSizeFitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
-            titleSizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            UIFactory.SetupRectTransform(titleText, Vector2.zero, Vector2.zero, new(0, 0));
+            UIFactory.SetupContentSizeFitter(titleText);
 
             var versionLabel = UIFactory.CreateText("Version", titleContainer.transform, $"v{Constant.ModVersion}", 14,
                 new Color(0.8f, 0.8f, 0.8f, 1));
-            var versionRect = versionLabel.GetComponent<RectTransform>();
-            versionRect.sizeDelta = new(0, 0);
-            var versionSizeFitter = versionLabel.AddComponent<ContentSizeFitter>();
-            versionSizeFitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
-            versionSizeFitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            UIFactory.SetupRectTransform(versionLabel, Vector2.zero, Vector2.zero, new(0, 0));
+            UIFactory.SetupContentSizeFitter(versionLabel);
 
+            var titleContainerRect = titleContainer.GetComponent<RectTransform>();
             LayoutRebuilder.ForceRebuildLayoutImmediate(titleContainerRect);
 
             var closeButton = UIFactory.CreateButton("CloseButton", titleBar.transform, HidePanel,
@@ -278,17 +260,15 @@ private void CreateTabPanels()
 
             var modelTabContainer = new GameObject("ModelTabContainer", typeof(RectTransform));
             modelTabContainer.transform.SetParent(_panelRoot.transform, false);
-            UIFactory.SetupRectTransform(modelTabContainer, new(0, 0), new(1, 1), Vector2.zero);
-            modelTabContainer.GetComponent<RectTransform>().offsetMin = new(10, 10);
-            modelTabContainer.GetComponent<RectTransform>().offsetMax = new(-10, -100);
+            UIFactory.SetupRectTransform(modelTabContainer, new(0, 0), new(1, 1), offsetMin: new(10, 10),
+                offsetMax: new(-10, -100));
 
             _modelSelectionTab = modelTabContainer.AddComponent<ModelSelectionTab>();
 
             var settingsTabContainer = new GameObject("SettingsTabContainer", typeof(RectTransform));
             settingsTabContainer.transform.SetParent(_panelRoot.transform, false);
-            UIFactory.SetupRectTransform(settingsTabContainer, new(0, 0), new(1, 1), Vector2.zero);
-            settingsTabContainer.GetComponent<RectTransform>().offsetMin = new(10, 10);
-            settingsTabContainer.GetComponent<RectTransform>().offsetMax = new(-10, -100);
+            UIFactory.SetupRectTransform(settingsTabContainer, new(0, 0), new(1, 1), offsetMin: new(10, 10),
+                offsetMax: new(-10, -100));
 
             _settingsTab = settingsTabContainer.AddComponent<SettingsTab>();
             _settingsTab.OnAnimatorParamsToggleChanged += SetAnimatorParamsWindowVisible;
@@ -672,17 +652,10 @@ private void BuildSettingsButton()
 
             _settingsButton = UIFactory.CreateButton("SettingsButton", _uiRoot.transform, OnSettingsButtonClicked,
                 new Color(0.2f, 0.25f, 0.3f, 0.9f));
-            var buttonRect = _settingsButton.GetComponent<RectTransform>();
 
             var anchorMin = GetAnchorValue(uiConfig.DCMButtonAnchor);
-            var anchorMax = anchorMin;
-            var pivot = anchorMin;
-
-            buttonRect.anchorMin = anchorMin;
-            buttonRect.anchorMax = anchorMax;
-            buttonRect.pivot = pivot;
-            buttonRect.sizeDelta = new(80, 50);
-            buttonRect.anchoredPosition = new(uiConfig.DCMButtonOffsetX, uiConfig.DCMButtonOffsetY);
+            UIFactory.SetupRectTransform(_settingsButton, anchorMin, anchorMin, new(80, 50), pivot: anchorMin,
+                anchoredPosition: new(uiConfig.DCMButtonOffsetX, uiConfig.DCMButtonOffsetY));
 
             var outline = _settingsButton.AddComponent<Outline>();
             outline.effectColor = new(0.3f, 0.35f, 0.4f, 0.7f);
@@ -729,19 +702,13 @@ public void RefreshSettingsButton()
         {
             if (_settingsButton == null || UIConfig == null) return;
 
-            var buttonRect = _settingsButton.GetComponent<RectTransform>();
-            if (buttonRect == null) return;
-
             var anchorMin = GetAnchorValue(UIConfig.DCMButtonAnchor);
-            var anchorMax = anchorMin;
-            var pivot = anchorMin;
+            UIFactory.SetupRectTransform(_settingsButton, anchorMin, anchorMin, new(80, 50), pivot: anchorMin,
+                anchoredPosition: new(UIConfig.DCMButtonOffsetX, UIConfig.DCMButtonOffsetY));
 
-            buttonRect.anchorMin = anchorMin;
-            buttonRect.anchorMax = anchorMax;
-            buttonRect.pivot = pivot;
-            buttonRect.anchoredPosition = new(UIConfig.DCMButtonOffsetX, UIConfig.DCMButtonOffsetY);
-
-            LayoutRebuilder.ForceRebuildLayoutImmediate(buttonRect);
+            var buttonRect = _settingsButton.GetComponent<RectTransform>();
+            if (buttonRect != null)
+                LayoutRebuilder.ForceRebuildLayoutImmediate(buttonRect);
         }
 
         private void UpdateSettingsButtonVisibility()

From d44499a3d8beccbb9e8f27ff99f89755ef4ece1f Mon Sep 17 00:00:00 2001
From: OLC <utsumabo@ritsukage.com>
Date: Mon, 17 Nov 2025 02:30:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E5=8F=91=E5=B8=83=20v1.8.2=20?=
 =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优化 UI 组件的布局和初始化逻辑，使用 UIFactory 方法简化代码，提升可读性
- 改进事件订阅清理逻辑，防止内存泄漏
- 更新版本号至 v1.8.2
---
 CHANGELOG.md                  | 5 +++++
 CHANGELOG_EN.md               | 5 +++++
 DuckovCustomModel/Constant.cs | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c8f46..603f9f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 [English](CHANGELOG_EN.md) | 中文
 
+## v1.8.2
+
+- 优化了 UI 组件的布局和初始化逻辑，使用 UIFactory 方法简化代码，提升可读性
+- 改进了事件订阅清理逻辑，防止内存泄漏
+
 ## v1.8.1
 
 - 新增音效标签 `trigger_on_hurt`，用于角色受伤时自动播放音效
diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md
index 5740998..f6d32be 100644
--- a/CHANGELOG_EN.md
+++ b/CHANGELOG_EN.md
@@ -2,6 +2,11 @@
 
 English | [中文](CHANGELOG.md)
 
+## v1.8.2
+
+- Optimized UI component layout and initialization logic, simplified code using UIFactory methods, improved readability
+- Improved event subscription cleanup logic to prevent memory leaks
+
 ## v1.8.1
 
 - Added sound tag `trigger_on_hurt` for automatically playing sounds when a character is hurt
diff --git a/DuckovCustomModel/Constant.cs b/DuckovCustomModel/Constant.cs
index 2bd7785..aa4978b 100644
--- a/DuckovCustomModel/Constant.cs
+++ b/DuckovCustomModel/Constant.cs
@@ -4,7 +4,7 @@ public static class Constant
     {
         public const string ModID = "DuckovCustomModel";
         public const string ModName = "Duckov Custom Model";
-        public const string ModVersion = "1.8.1";
+        public const string ModVersion = "1.8.2";
         public const string HarmonyId = "com.ritsukage.DuckovCustomModel";
     }
 }