diff --git a/components/Debug/FeedHasField.tscn b/components/Debug/FeedHasField.tscn index 0f407ef..94a6566 100644 --- a/components/Debug/FeedHasField.tscn +++ b/components/Debug/FeedHasField.tscn @@ -5,6 +5,5 @@ [node name="FeedHasField" type="HBoxContainer"] theme_override_constants/separation = 0 script = ExtResource("1_7leag") -targetFields = Array[int]([24]) +targetFields = Array[int]([25]) composeMode = 1 -clickToRefresh = true diff --git a/components/Feeds/FruitPlatter.tscn b/components/Feeds/FruitPlatter.tscn index 94c39cb..a066475 100644 --- a/components/Feeds/FruitPlatter.tscn +++ b/components/Feeds/FruitPlatter.tscn @@ -7,8 +7,8 @@ avatarTexture = ExtResource("2_6i6sp") displayName = "水果拼盘" topic = 7 -fields = Array[int]([21]) -fieldValues = Array[float]([5.0]) +fields = Array[int]([21, 25]) +fieldValues = Array[float]([5.0, 0.5]) costs = Array[int]([0, 1]) costCounts = Array[int]([150, 200]) diff --git a/components/Scenes/UI.tscn b/components/Scenes/UI.tscn index e51d439..1123cd0 100644 --- a/components/Scenes/UI.tscn +++ b/components/Scenes/UI.tscn @@ -235,6 +235,7 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_ri8gw") [node name="fields" type="VBoxContainer" parent="root/fields/wrapper"] unique_name_in_owner = true layout_mode = 2 +theme_override_constants/separation = 1 [node name="fieldsAnimator" type="AnimationPlayer" parent="root/fields"] unique_name_in_owner = true diff --git a/components/UI/FieldShow.tscn b/components/UI/FieldShow.tscn index a4a474c..082195d 100644 --- a/components/UI/FieldShow.tscn +++ b/components/UI/FieldShow.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://cw5ip3rw4r3pp"] +[gd_scene load_steps=4 format=3 uid="uid://cw5ip3rw4r3pp"] [ext_resource type="Script" path="res://scripts/Statemachine/FieldShow.gd" id="1_gwocj"] +[ext_resource type="Texture2D" uid="uid://iu5i8ullbhf6" path="res://resources/items/apple.svg" id="2_q02yi"] [ext_resource type="Theme" uid="uid://b6nox1qqh50ub" path="res://themes/smallText.tres" id="2_x62bb"] [node name="FieldShow" type="HBoxContainer"] @@ -9,6 +10,15 @@ offset_bottom = 18.0 script = ExtResource("1_gwocj") metadata/_edit_horizontal_guides_ = [18.0] +[node name="icon" type="TextureRect" parent="."] +custom_minimum_size = Vector2(14, 14) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +texture = ExtResource("2_q02yi") +expand_mode = 1 +stretch_mode = 5 + [node name="name" type="Label" parent="."] unique_name_in_owner = true layout_mode = 2