From 7a51c43f04c9235a4258ee99300e569e57720d3a Mon Sep 17 00:00:00 2001 From: Joywayer Date: Thu, 21 May 2026 08:31:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=9A=84?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E8=B5=84=E4=BA=A7=20ABL=5FBoss=5FNew?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=20ABL=5FBoss=5FChaofeng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ABL_Boss_New.asset => ABL_Boss_Chaofeng.asset} | 2 +- ..._New.asset.meta => ABL_Boss_Chaofeng.asset.meta} | 0 Assets/_Game/Scripts/Editor/Hub/DataHubWindow.cs | 13 ++++++++----- .../_Game/Scripts/Editor/Modules/BossSkillModule.cs | 8 ++------ Assets/_Game/Scripts/Editor/Modules/EnemyModule.cs | 8 ++------ Assets/_Game/Scripts/Editor/Modules/FormModule.cs | 8 ++------ Assets/_Game/Scripts/Editor/Modules/SkillModule.cs | 4 +--- Assets/_Game/Scripts/Editor/Modules/WeaponModule.cs | 4 +--- 8 files changed, 17 insertions(+), 30 deletions(-) rename Assets/_Game/Data/Boss/Skills/{ABL_Boss_New.asset => ABL_Boss_Chaofeng.asset} (97%) rename Assets/_Game/Data/Boss/Skills/{ABL_Boss_New.asset.meta => ABL_Boss_Chaofeng.asset.meta} (100%) diff --git a/Assets/_Game/Data/Boss/Skills/ABL_Boss_New.asset b/Assets/_Game/Data/Boss/Skills/ABL_Boss_Chaofeng.asset similarity index 97% rename from Assets/_Game/Data/Boss/Skills/ABL_Boss_New.asset rename to Assets/_Game/Data/Boss/Skills/ABL_Boss_Chaofeng.asset index e387934..29eaf25 100644 --- a/Assets/_Game/Data/Boss/Skills/ABL_Boss_New.asset +++ b/Assets/_Game/Data/Boss/Skills/ABL_Boss_Chaofeng.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: de92221c7c3fb4a42a7cd122a8f97632, type: 3} - m_Name: ABL_Boss_New + m_Name: ABL_Boss_Chaofeng m_EditorClassIdentifier: skillId: displayName: diff --git a/Assets/_Game/Data/Boss/Skills/ABL_Boss_New.asset.meta b/Assets/_Game/Data/Boss/Skills/ABL_Boss_Chaofeng.asset.meta similarity index 100% rename from Assets/_Game/Data/Boss/Skills/ABL_Boss_New.asset.meta rename to Assets/_Game/Data/Boss/Skills/ABL_Boss_Chaofeng.asset.meta diff --git a/Assets/_Game/Scripts/Editor/Hub/DataHubWindow.cs b/Assets/_Game/Scripts/Editor/Hub/DataHubWindow.cs index 4d789b0..a6d8aa9 100644 --- a/Assets/_Game/Scripts/Editor/Hub/DataHubWindow.cs +++ b/Assets/_Game/Scripts/Editor/Hub/DataHubWindow.cs @@ -100,19 +100,22 @@ namespace BaseGames.Editor split.style.flexGrow = 1; root.Add(split); - // 列表区容器（TwoPaneSplitView 管理宽度，不需要 flexGrow） + // 列表区容器 _listWrapper = new VisualElement(); _listWrapper.style.flexGrow = 1; _listWrapper.style.overflow = Overflow.Hidden; split.Add(_listWrapper); - // 详情区容器（ScrollView 支持超长内容滚动） + // 详情区：外层 ScrollView 提供滚动视口，_detailWrapper 是内容容器（自然高度） var detailScroll = new ScrollView(ScrollViewMode.Vertical); detailScroll.style.flexGrow = 1; - detailScroll.contentContainer.style.flexGrow = 1; - detailScroll.contentContainer.style.flexDirection = FlexDirection.Column; + detailScroll.style.overflow = Overflow.Hidden; split.Add(detailScroll); - _detailWrapper = detailScroll.contentContainer; + + _detailWrapper = new VisualElement(); + _detailWrapper.style.flexDirection = FlexDirection.Column; + _detailWrapper.style.paddingBottom = 16; + detailScroll.Add(_detailWrapper); } private VisualElement BuildNavSidebar() diff --git a/Assets/_Game/Scripts/Editor/Modules/BossSkillModule.cs b/Assets/_Game/Scripts/Editor/Modules/BossSkillModule.cs index f16ca26..8e68706 100644 --- a/Assets/_Game/Scripts/Editor/Modules/BossSkillModule.cs +++ b/Assets/_Game/Scripts/Editor/Modules/BossSkillModule.cs @@ -81,18 +81,14 @@ namespace BaseGames.Editor.Modules container.Add(BuildSkillCard(skill)); container.Add(BuildActionBar(skill, SkillFolder, _skillPane)); container.Add(SkillModule.MakeDivider()); - var insp = new InspectorElement(skill); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(skill); container.Add(insp); } else if (selected is SkillSequenceSO seq) { container.Add(BuildSeqCard(seq)); container.Add(BuildActionBar(seq, SeqFolder, _seqPane)); container.Add(SkillModule.MakeDivider()); - var insp = new InspectorElement(seq); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(seq); container.Add(insp); } } diff --git a/Assets/_Game/Scripts/Editor/Modules/EnemyModule.cs b/Assets/_Game/Scripts/Editor/Modules/EnemyModule.cs index ab8c4db..8648ec1 100644 --- a/Assets/_Game/Scripts/Editor/Modules/EnemyModule.cs +++ b/Assets/_Game/Scripts/Editor/Modules/EnemyModule.cs @@ -84,18 +84,14 @@ namespace BaseGames.Editor.Modules container.Add(BuildStatsCard(stats)); container.Add(BuildActionBar(stats, StatsFolder, _statsPane)); container.Add(SkillModule.MakeDivider()); - var insp = new InspectorElement(stats); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(stats); container.Add(insp); } else if (selected is LootTableSO loot) { container.Add(BuildLootCard(loot)); container.Add(BuildActionBar(loot, LootFolder, _lootPane)); container.Add(SkillModule.MakeDivider()); - var insp = new InspectorElement(loot); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(loot); container.Add(insp); } } diff --git a/Assets/_Game/Scripts/Editor/Modules/FormModule.cs b/Assets/_Game/Scripts/Editor/Modules/FormModule.cs index 80e99a1..79e3528 100644 --- a/Assets/_Game/Scripts/Editor/Modules/FormModule.cs +++ b/Assets/_Game/Scripts/Editor/Modules/FormModule.cs @@ -88,18 +88,14 @@ namespace BaseGames.Editor.Modules container.Add(SkillModule.MakeDivider()); container.Add(BuildFormGrid(config)); container.Add(SkillModule.MakeDivider()); - var insp = new InspectorElement(config); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(config); container.Add(insp); } else if (selected is FormSO form) { container.Add(BuildFormCard(form)); container.Add(BuildFormActionBar(form)); container.Add(SkillModule.MakeDivider()); - var insp = new InspectorElement(form); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(form); container.Add(insp); } } diff --git a/Assets/_Game/Scripts/Editor/Modules/SkillModule.cs b/Assets/_Game/Scripts/Editor/Modules/SkillModule.cs index ac8643d..8a9a1fe 100644 --- a/Assets/_Game/Scripts/Editor/Modules/SkillModule.cs +++ b/Assets/_Game/Scripts/Editor/Modules/SkillModule.cs @@ -61,9 +61,7 @@ namespace BaseGames.Editor.Modules container.Add(MakeDivider()); // Inspector - var insp = new InspectorElement(_selected); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(_selected); container.Add(insp); } public void OnActivated() => _listPane?.Refresh(); diff --git a/Assets/_Game/Scripts/Editor/Modules/WeaponModule.cs b/Assets/_Game/Scripts/Editor/Modules/WeaponModule.cs index 4a27144..6d2d47c 100644 --- a/Assets/_Game/Scripts/Editor/Modules/WeaponModule.cs +++ b/Assets/_Game/Scripts/Editor/Modules/WeaponModule.cs @@ -66,9 +66,7 @@ namespace BaseGames.Editor.Modules container.Add(MakeDivider()); // Inspector - var insp = new InspectorElement(_selected); - insp.style.flexGrow = 1; - container.Add(insp); + var insp = new InspectorElement(_selected); container.Add(insp); } public void OnActivated()