From 2ff8d0d388b87c4ad4201b2eb590bdc3ab3374c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=A8=E8=90=BD=E5=9F=BA=E5=9B=B4=E8=99=BE?= <3161880837@qq.com> Date: Sun, 10 May 2026 08:12:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor(UI):=20=E8=B0=83=E6=95=B4=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=B8=83=E5=B1=80=E5=92=8C=E6=96=87=E6=9C=AC=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一多个场景的容器对齐方式 - 修改MakeFeed面板的文本描述和按钮布局 - 优化ItemShow组件的属性和动画资源引用 --- .../Scenes/FullscreenPanels/MakeFeed.tscn | 91 +++++++++++-------- .../Scenes/FullscreenPanels/Starter.tscn | 1 + components/UI/ItemShow.tscn | 30 +++--- 3 files changed, 70 insertions(+), 52 deletions(-) diff --git a/components/Scenes/FullscreenPanels/MakeFeed.tscn b/components/Scenes/FullscreenPanels/MakeFeed.tscn index 2f772cf..32e49b0 100644 --- a/components/Scenes/FullscreenPanels/MakeFeed.tscn +++ b/components/Scenes/FullscreenPanels/MakeFeed.tscn @@ -1,34 +1,41 @@ -[gd_scene load_steps=5 format=3 uid="uid://1n28ji5sl6bx"] +[gd_scene format=3 uid="uid://1n28ji5sl6bx"] [ext_resource type="PackedScene" uid="uid://d3qojeqa3difn" path="res://components/Abstracts/FullscreenPanelBase.tscn" id="1_1wmro"] -[ext_resource type="Script" path="res://scripts/Contents/Panels/MakeFeed.gd" id="2_pr610"] +[ext_resource type="Script" uid="uid://cegfj4bplbf08" path="res://scripts/Contents/Panels/MakeFeed.gd" id="2_pr610"] [ext_resource type="Theme" uid="uid://dhvs6urgf6jr5" path="res://themes/main.tres" id="3_q1rym"] [ext_resource type="PackedScene" uid="uid://bbm8l3hr4ihar" path="res://components/UI/ItemShow.tscn" id="4_kei5t"] -[node name="MakeFeed" instance=ExtResource("1_1wmro")] +[sub_resource type="StyleBoxLine" id="StyleBoxLine_6fisa"] +color = Color(1, 1, 1, 1) +thickness = 2 +vertical = true + +[node name="MakeFeed" unique_id=1787274994 instance=ExtResource("1_1wmro")] +offset_top = 0.0 +offset_bottom = 0.0 script = ExtResource("2_pr610") [node name="wrapper" parent="content" index="1"] theme_override_constants/separation = 50 -[node name="tips" type="VBoxContainer" parent="content/wrapper" index="0"] +[node name="tips" type="VBoxContainer" parent="content/wrapper" index="0" unique_id=634791755] layout_mode = 2 -[node name="title" type="RichTextLabel" parent="content/wrapper/tips" index="0"] +[node name="title" type="RichTextLabel" parent="content/wrapper/tips" index="0" unique_id=319665190] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 theme_override_font_sizes/bold_font_size = 30 bbcode_enabled = true -text = "[b]天降鸡饲料[/b]" +text = "[b]下一波敌人即将来袭...[/b]" fit_content = true autowrap_mode = 0 -[node name="tip" type="HBoxContainer" parent="content/wrapper/tips" index="1"] +[node name="tip" type="HBoxContainer" parent="content/wrapper/tips" index="1" unique_id=1194561455] layout_mode = 2 alignment = 1 -[node name="before" type="RichTextLabel" parent="content/wrapper/tips/tip" index="0"] +[node name="before" type="RichTextLabel" parent="content/wrapper/tips/tip" index="0" unique_id=1833472880] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 @@ -37,7 +44,7 @@ text = "在第" fit_content = true autowrap_mode = 0 -[node name="wave" type="RichTextLabel" parent="content/wrapper/tips/tip" index="1"] +[node name="wave" type="RichTextLabel" parent="content/wrapper/tips/tip" index="1" unique_id=1568052776] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 @@ -47,16 +54,16 @@ text = "0" fit_content = true autowrap_mode = 0 -[node name="select" type="RichTextLabel" parent="content/wrapper/tips/tip" index="2"] +[node name="select" type="RichTextLabel" parent="content/wrapper/tips/tip" index="2" unique_id=1049971074] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 bbcode_enabled = true -text = "波开始前可选择" +text = "波开始前可购买" fit_content = true autowrap_mode = 0 -[node name="count" type="RichTextLabel" parent="content/wrapper/tips/tip" index="3"] +[node name="count" type="RichTextLabel" parent="content/wrapper/tips/tip" index="3" unique_id=661675747] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 @@ -66,7 +73,7 @@ text = "0" fit_content = true autowrap_mode = 0 -[node name="feed" type="RichTextLabel" parent="content/wrapper/tips/tip" index="4"] +[node name="feed" type="RichTextLabel" parent="content/wrapper/tips/tip" index="4" unique_id=649638622] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 @@ -75,33 +82,45 @@ text = "项增益" fit_content = true autowrap_mode = 0 -[node name="skipBtn" type="Button" parent="content/wrapper/tips/tip" index="5"] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 4 -theme = ExtResource("3_q1rym") -text = "跳过" - -[node name="refreshBtn" type="Button" parent="content/wrapper/tips/tip" index="6"] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 4 -theme = ExtResource("3_q1rym") -text = "刷新" - -[node name="needBB" parent="content/wrapper/tips/tip" index="7" instance=ExtResource("4_kei5t")] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 4 - -[node name="feedcards" type="HBoxContainer" parent="content/wrapper" index="1"] +[node name="feedcards" type="HBoxContainer" parent="content/wrapper" index="1" unique_id=146747870] unique_name_in_owner = true layout_mode = 2 theme_override_constants/separation = 30 alignment = 1 -[node name="avaliableFeeds" type="Node2D" parent="content/wrapper" index="2"] +[node name="control" type="HBoxContainer" parent="content/wrapper" index="2" unique_id=1940955559] +layout_mode = 2 +theme_override_constants/separation = 15 +alignment = 1 + +[node name="skipBtn" type="Button" parent="content/wrapper/control" index="0" unique_id=861602358] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +theme = ExtResource("3_q1rym") +text = "离开商店" + +[node name="VSeparator" type="VSeparator" parent="content/wrapper/control" index="1" unique_id=307265805] +layout_mode = 2 +theme_override_styles/separator = SubResource("StyleBoxLine_6fisa") + +[node name="refresh" type="HBoxContainer" parent="content/wrapper/control" index="2" unique_id=849141605] +layout_mode = 2 + +[node name="refreshBtn" type="Button" parent="content/wrapper/control/refresh" index="0" unique_id=407207523] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +theme = ExtResource("3_q1rym") +text = "重新进货" + +[node name="needBB" parent="content/wrapper/control/refresh" index="1" unique_id=1875940916 instance=ExtResource("4_kei5t")] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 4 + +[node name="avaliableFeeds" type="Node2D" parent="content/wrapper" index="3" unique_id=207293318] unique_name_in_owner = true visible = false diff --git a/components/Scenes/FullscreenPanels/Starter.tscn b/components/Scenes/FullscreenPanels/Starter.tscn index 0111497..8969cca 100644 --- a/components/Scenes/FullscreenPanels/Starter.tscn +++ b/components/Scenes/FullscreenPanels/Starter.tscn @@ -256,6 +256,7 @@ theme_override_styles/panel = ExtResource("7_kl3ko") [node name="starter" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start" index="0" unique_id=2056064159] layout_mode = 2 theme_override_constants/separation = 30 +alignment = 1 [node name="singleplayer" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter" index="0" unique_id=1117567773] layout_mode = 2 diff --git a/components/UI/ItemShow.tscn b/components/UI/ItemShow.tscn index 6f8472e..b4c197f 100644 --- a/components/UI/ItemShow.tscn +++ b/components/UI/ItemShow.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=8 format=3 uid="uid://bbm8l3hr4ihar"] +[gd_scene format=3 uid="uid://bbm8l3hr4ihar"] -[ext_resource type="Script" path="res://scripts/Statemachine/ItemShow.gd" id="1_2dhsb"] +[ext_resource type="Script" uid="uid://cl2orf01mb827" path="res://scripts/Statemachine/ItemShow.gd" id="1_2dhsb"] [ext_resource type="Texture2D" uid="uid://bks8jmctleina" path="res://resources/items/baseball.svg" id="1_hyowb"] -[sub_resource type="LabelSettings" id="LabelSettings_3yjwr"] +[sub_resource type="LabelSettings" id="LabelSettings_bcjvg"] [sub_resource type="Animation" id="Animation_6sxrr"] length = 0.001 @@ -85,37 +85,35 @@ tracks/1/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_xbbtb"] _data = { -"RESET": SubResource("Animation_6sxrr"), -"hide": SubResource("Animation_ltvf2"), -"show": SubResource("Animation_pv00d") +&"RESET": SubResource("Animation_6sxrr"), +&"hide": SubResource("Animation_ltvf2"), +&"show": SubResource("Animation_pv00d") } -[node name="ItemShow" type="HBoxContainer"] +[node name="ItemShow" type="HBoxContainer" unique_id=583849471] offset_right = 34.0 offset_bottom = 20.0 size_flags_horizontal = 6 size_flags_vertical = 6 +alignment = 1 script = ExtResource("1_2dhsb") -[node name="avatar" type="TextureRect" parent="."] +[node name="avatar" type="TextureRect" parent="." unique_id=772951764] unique_name_in_owner = true custom_minimum_size = Vector2(20, 20) layout_mode = 2 size_flags_horizontal = 2 -size_flags_vertical = 8 +size_flags_vertical = 4 texture = ExtResource("1_hyowb") expand_mode = 1 -[node name="count" type="Label" parent="."] +[node name="count" type="Label" parent="." unique_id=626046085] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 0 -size_flags_vertical = 8 text = "0" -label_settings = SubResource("LabelSettings_3yjwr") +label_settings = SubResource("LabelSettings_bcjvg") -[node name="animator" type="AnimationPlayer" parent="."] +[node name="animator" type="AnimationPlayer" parent="." unique_id=355450861] unique_name_in_owner = true -libraries = { -"": SubResource("AnimationLibrary_xbbtb") -} +libraries/ = SubResource("AnimationLibrary_xbbtb")