style(UI): 调整容器间距从4增加到10以改善布局

feat: 调整游戏平衡性和修复数据存储问题
- 调整草莓、水果沙拉和焦糖苹果的数值平衡 - 在OutGameStorage中新增MAX_ENERGY等升级字段 - 修复GameOver面板中物品存储的遍历问题 - 优化FeedFilter组件的目标字段和点击刷新功能 - 修正A-Applr组件的显示名称和贴图问题
2026-05-27 22:41:56 +08:00 · 2026-05-04 11:17:21 +08:00 · 2026-05-04 11:02:35 +08:00 · 2026-05-04 10:52:17 +08:00 · 2026-05-04 10:30:54 +08:00 · 2026-05-04 09:53:38 +08:00
31 changed files with 574 additions and 185 deletions
@@ -1,47 +1,48 @@
-[gd_scene load_steps=5 format=3 uid="uid://bykwevnv7keeh"]
+[gd_scene format=3 uid="uid://bykwevnv7keeh"]

-[ext_resource type="Script" path="res://scripts/Structs/Feed.gd" id="1_2ea75"]
+[ext_resource type="Script" uid="uid://nt81whieye7h" path="res://scripts/Structs/Feed.gd" id="1_2ea75"]
 [ext_resource type="Theme" uid="uid://dhvs6urgf6jr5" path="res://themes/main.tres" id="2_lvrpo"]
 [ext_resource type="PackedScene" uid="uid://bt370a1djjg5p" path="res://components/UI/FeedName.tscn" id="4_aewpy"]

-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_n2ewr"]
-content_margin_left = 30.0
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3g2k7"]
+content_margin_left = 20.0
 content_margin_top = 20.0
-content_margin_right = 30.0
+content_margin_right = 20.0
 content_margin_bottom = 20.0
-bg_color = Color(0, 0, 0, 0.5)
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-border_color = Color(0, 0, 0, 0.75)
-corner_radius_top_left = 5
-corner_radius_top_right = 5
-corner_radius_bottom_right = 5
-corner_radius_bottom_left = 5
+bg_color = Color(0, 0, 0, 0.70000005)
+border_width_left = 10
+border_width_top = 10
+border_width_right = 10
+border_width_bottom = 10
+border_color = Color(1, 1, 1, 1)
+border_blend = true
+corner_radius_top_left = 15
+corner_radius_top_right = 15
+corner_radius_bottom_right = 15
+corner_radius_bottom_left = 15
+corner_detail = 1

-[node name="FeedCard" type="PanelContainer"]
+[node name="FeedCard" type="PanelContainer" unique_id=1794851856]
 offset_right = 200.0
 offset_bottom = 300.0
-theme_override_styles/panel = SubResource("StyleBoxFlat_n2ewr")
+theme_override_styles/panel = SubResource("StyleBoxFlat_3g2k7")
 script = ExtResource("1_2ea75")
-metadata/_edit_lock_ = true

-[node name="container" type="VBoxContainer" parent="."]
+[node name="container" type="VBoxContainer" parent="." unique_id=2054000756]
 layout_mode = 2
 theme_override_constants/separation = 10

-[node name="selectBtn" type="Button" parent="container"]
+[node name="selectBtn" type="Button" parent="container" unique_id=775671566]
 unique_name_in_owner = true
 layout_mode = 2
 theme = ExtResource("2_lvrpo")
 text = "确定"

-[node name="info" type="VBoxContainer" parent="container"]
+[node name="info" type="VBoxContainer" parent="container" unique_id=1288419607]
 layout_mode = 2
 theme_override_constants/separation = 10

-[node name="avatar" type="TextureRect" parent="container/info"]
+[node name="avatar" type="TextureRect" parent="container/info" unique_id=239110315]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(75, 75)
 layout_mode = 2
@@ -50,20 +51,20 @@ size_flags_vertical = 0
 expand_mode = 1
 stretch_mode = 5

-[node name="name" parent="container/info" instance=ExtResource("4_aewpy")]
+[node name="name" parent="container/info" unique_id=1202819558 instance=ExtResource("4_aewpy")]
 unique_name_in_owner = true
 layout_mode = 2
 quality = 1

-[node name="fields" type="VBoxContainer" parent="container"]
+[node name="fields" type="VBoxContainer" parent="container" unique_id=54224040]
 unique_name_in_owner = true
 layout_mode = 2

-[node name="weapons" type="VBoxContainer" parent="container"]
+[node name="weapons" type="VBoxContainer" parent="container" unique_id=2041301443]
 unique_name_in_owner = true
 layout_mode = 2

-[node name="costs" type="GridContainer" parent="container"]
+[node name="costs" type="GridContainer" parent="container" unique_id=1806594453]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 10
@@ -2,11 +2,9 @@

 [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_e5pl8"]
 [ext_resource type="Script" uid="uid://cthtupc6dtbav" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"]
-[ext_resource type="PackedScene" uid="uid://c3crr8r7y3oho" path="res://components/Weapons/BlueCrystal.tscn" id="3_joj4g"]
+[ext_resource type="PackedScene" uid="uid://dlaks67h2osms" path="res://components/Weapons/ChainGun.tscn" id="3_s7kxe"]
 [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"]
-[ext_resource type="PackedScene" uid="uid://cx7nogfnv7s8t" path="res://components/Weapons/Tree.tscn" id="4_jluqw"]
 [ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"]
-[ext_resource type="PackedScene" uid="uid://bbrllsqjmx0ie" path="res://components/Weapons/DaoStatue.tscn" id="5_fkh3f"]
 [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"]
 [ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"]
 [ext_resource type="Texture2D" uid="uid://dwwpkn4q07ja2" path="res://icon.svg" id="10_0omr3"]
@@ -99,11 +97,7 @@ process_material = SubResource("ParticleProcessMaterial_joj4g")
 [node name="weaponStore" parent="." index="2"]
 process_mode = 4

-[node name="BlueCrystal" parent="weaponStore" index="0" unique_id=2047904399 instance=ExtResource("3_joj4g")]
-
-[node name="Tree" parent="weaponStore" index="1" unique_id=185228402 instance=ExtResource("4_jluqw")]
-
-[node name="DaoStatue" parent="weaponStore" index="2" unique_id=265403254 instance=ExtResource("5_fkh3f")]
+[node name="ChainGun" parent="weaponStore" index="0" unique_id=1992324853 instance=ExtResource("3_s7kxe")]
 debugRebuild = false

 [node name="sprint" parent="sounds" index="0"]
@@ -5,3 +5,5 @@
 [node name="FeedFilter" type="HBoxContainer" unique_id=1769176018]
 theme_override_constants/separation = 0
 script = ExtResource("1_feedfilter")
+targetFields = Array[int]([14])
+clickToRefresh = true
@@ -1,25 +1,24 @@
-[gd_scene load_steps=5 format=3 uid="uid://uu0s26ehdr4h"]
+[gd_scene format=3 uid="uid://uu0s26ehdr4h"]

 [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_cwqpr"]
-[ext_resource type="Texture2D" uid="uid://ckr8tw7fsa7qx" path="res://resources/weapons/AcidWind.png" id="2_cq26m"]
 [ext_resource type="Texture2D" uid="uid://c2q4cf4ivu7o7" path="res://resources/feeds/apple.png" id="2_l1ph2"]
 [ext_resource type="PackedScene" uid="uid://dgxvgsipl0gr1" path="res://components/Weapons/CursorKnife.tscn" id="3_powvs"]

-[node name="Applr" instance=ExtResource("1_cwqpr")]
+[node name="Applr" unique_id=1383006342 instance=ExtResource("1_cwqpr")]
 avatarTexture = ExtResource("2_l1ph2")
 displayName = "焦糖苹果"
 quality = 2
 topic = 8
 fields = Array[int]([14])
-fieldValues = Array[float]([0.01])
+fieldValues = Array[float]([0.003])
 weapons = Array[PackedScene]([ExtResource("3_powvs")])
 costs = Array[int]([0, 2])
 costCounts = Array[int]([500, 1])

-[node name="avatar" parent="container/info" index="0"]
-texture = ExtResource("2_cq26m")
+[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="0" unique_id=239110315]
+texture = ExtResource("2_l1ph2")

-[node name="name" parent="container/info" index="1"]
-displayName = "酸蚀风暴"
+[node name="name" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="1" unique_id=1202819558]
+displayName = "焦糖苹果"
 quality = 2
 topic = 8
@@ -1,22 +1,22 @@
-[gd_scene load_steps=3 format=3 uid="uid://d3oh03276434b"]
+[gd_scene format=3 uid="uid://d3oh03276434b"]

 [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_mvycn"]
 [ext_resource type="Texture2D" uid="uid://bdknu6rkkpoyd" path="res://resources/feeds/fruitsalad.svg" id="2_2oxe7"]

-[node name="FruitSalad" instance=ExtResource("1_mvycn")]
+[node name="FruitSalad" unique_id=453318050 instance=ExtResource("1_mvycn")]
 avatarTexture = ExtResource("2_2oxe7")
 displayName = "水果沙拉"
 quality = 0
 topic = 5
 fields = Array[int]([4, 14])
-fieldValues = Array[float]([0.04, 0.02])
+fieldValues = Array[float]([0.04, 0.006])
 costs = Array[int]([1])
 costCounts = Array[int]([200])

-[node name="avatar" parent="container/info" index="0"]
+[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="0" unique_id=239110315]
 texture = ExtResource("2_2oxe7")

-[node name="name" parent="container/info" index="1"]
+[node name="name" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="1" unique_id=1202819558]
 displayName = "水果沙拉"
 quality = 0
 topic = 5
@@ -1,20 +1,20 @@
-[gd_scene load_steps=3 format=3 uid="uid://cjcefxdt72d0k"]
+[gd_scene format=3 uid="uid://cjcefxdt72d0k"]

 [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_wr2cd"]
 [ext_resource type="Texture2D" uid="uid://cbyfpwrg2e3ns" path="res://resources/feeds/strawberry-a.svg" id="2_82amy"]

-[node name="Strawberry" instance=ExtResource("1_wr2cd")]
+[node name="Strawberry" unique_id=604791747 instance=ExtResource("1_wr2cd")]
 avatarTexture = ExtResource("2_82amy")
 displayName = "草莓"
 quality = 3
 fields = Array[int]([14])
-fieldValues = Array[float]([0.04])
+fieldValues = Array[float]([0.012])
 costs = Array[int]([1])
 costCounts = Array[int]([400])

-[node name="avatar" parent="container/info" index="0"]
+[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="0" unique_id=239110315]
 texture = ExtResource("2_82amy")

-[node name="name" parent="container/info" index="1"]
+[node name="name" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="1" unique_id=1202819558]
 displayName = "草莓"
 quality = 3
@@ -1,7 +1,7 @@
-[gd_scene load_steps=7 format=3 uid="uid://beo6s1kudbbve"]
+[gd_scene format=3 uid="uid://beo6s1kudbbve"]

 [ext_resource type="PackedScene" uid="uid://d3qojeqa3difn" path="res://components/Abstracts/FullscreenPanelBase.tscn" id="1_u2ynr"]
-[ext_resource type="Script" path="res://scripts/Contents/Panels/GameOver.gd" id="2_6cd45"]
+[ext_resource type="Script" uid="uid://bub7ku5qf2tpo" path="res://scripts/Contents/Panels/GameOver.gd" id="2_6cd45"]
 [ext_resource type="FontFile" uid="uid://v3frxpuvtj5o" path="res://resources/fonts/syht-bold.ttf" id="3_2arur"]
 [ext_resource type="AudioStream" uid="uid://dbso1w8hvgilg" path="res://resources/sounds/effect/Lose.wav" id="3_n4aax"]

@@ -12,7 +12,7 @@ bg_color = Color(1, 0, 0, 0.3)
 font = ExtResource("3_2arur")
 font_size = 50

-[node name="GameOver" instance=ExtResource("1_u2ynr")]
+[node name="GameOver" unique_id=2121797652 instance=ExtResource("1_u2ynr")]
 offset_top = 0.0
 offset_bottom = 0.0
 script = ExtResource("2_6cd45")
@@ -20,22 +20,26 @@ script = ExtResource("2_6cd45")
 [node name="wrapper" parent="content" index="1"]
 theme_override_constants/separation = 50

-[node name="container" type="PanelContainer" parent="content/wrapper" index="0"]
+[node name="container" type="PanelContainer" parent="content/wrapper" index="0" unique_id=428012739]
 layout_mode = 2
 size_flags_vertical = 3
 theme_override_styles/panel = SubResource("StyleBoxFlat_7gbuu")

-[node name="wrapper" type="VBoxContainer" parent="content/wrapper/container" index="0"]
+[node name="wrapper" type="VBoxContainer" parent="content/wrapper/container" index="0" unique_id=2055114212]
 layout_mode = 2
+theme_override_constants/separation = 20
 alignment = 1

-[node name="text" type="Label" parent="content/wrapper/container/wrapper" index="0"]
+[node name="death" type="VBoxContainer" parent="content/wrapper/container/wrapper" index="0" unique_id=1305351100]
+layout_mode = 2
+
+[node name="text" type="Label" parent="content/wrapper/container/wrapper/death" index="0" unique_id=1017927892]
 layout_mode = 2
 size_flags_horizontal = 4
 text = "败北"
 label_settings = SubResource("LabelSettings_17i5j")

-[node name="deadreason" type="RichTextLabel" parent="content/wrapper/container/wrapper" index="1"]
+[node name="deadreason" type="RichTextLabel" parent="content/wrapper/container/wrapper/death" index="1" unique_id=1670544883]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
@@ -44,7 +48,23 @@ text = "[color=gray]死亡原因[/color]"
 fit_content = true
 autowrap_mode = 0

-[node name="audio" type="AudioStreamPlayer2D" parent="." index="2"]
+[node name="gameControl" type="HBoxContainer" parent="content/wrapper/container/wrapper" index="1" unique_id=2129714003]
+layout_mode = 2
+alignment = 1
+
+[node name="returnBtn" type="Button" parent="content/wrapper/container/wrapper/gameControl" index="0" unique_id=1955688444]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 4
+text = "重新开始游戏"
+
+[node name="exitBtn" type="Button" parent="content/wrapper/container/wrapper/gameControl" index="1" unique_id=1303303813]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 4
+text = "退出游戏"
+
+[node name="audio" type="AudioStreamPlayer2D" parent="." index="2" unique_id=2020590816]
 unique_name_in_owner = true
 stream = ExtResource("3_n4aax")
 volume_db = 10.0
@@ -27,14 +27,10 @@ size_flags_horizontal = 4
 text = "在游戏开始前，你可以选择一项初始增益。"
 label_settings = SubResource("LabelSettings_eugsq")

-[node name="container" type="ScrollContainer" parent="content/wrapper/wrapper" index="1" unique_id=465067132]
-layout_mode = 2
-follow_focus = true
-vertical_scroll_mode = 0
-
-[node name="initialFeedSelection" type="HBoxContainer" parent="content/wrapper/wrapper/container" index="0" unique_id=1363721283]
+[node name="initialFeedSelection" type="HBoxContainer" parent="content/wrapper/wrapper" index="1" unique_id=1363721283]
 unique_name_in_owner = true
 layout_mode = 2
+alignment = 1

 [node name="title2" type="Label" parent="content/wrapper/wrapper" index="2" unique_id=398646662]
 unique_name_in_owner = true
@@ -43,14 +39,10 @@ size_flags_horizontal = 4
 text = "在游戏开始前，你可以选择一个初始武器。"
 label_settings = SubResource("LabelSettings_eugsq")

-[node name="container2" type="ScrollContainer" parent="content/wrapper/wrapper" index="3" unique_id=474299205]
-layout_mode = 2
-follow_focus = true
-vertical_scroll_mode = 0
-
-[node name="initialWeaponSelection" type="HBoxContainer" parent="content/wrapper/wrapper/container2" index="0" unique_id=1933174501]
+[node name="initialWeaponSelection" type="HBoxContainer" parent="content/wrapper/wrapper" index="3" unique_id=1933174501]
 unique_name_in_owner = true
 layout_mode = 2
+alignment = 1

 [node name="startBtn" type="Button" parent="content/wrapper" index="1" unique_id=298849731]
 unique_name_in_owner = true
@@ -6,30 +6,19 @@
 [ext_resource type="Texture2D" uid="uid://dtw7ljiir0ug6" path="res://resources/comics/starterBack.png" id="3_sdsu8"]
 [ext_resource type="Theme" uid="uid://dhvs6urgf6jr5" path="res://themes/main.tres" id="4_lfxcn"]
 [ext_resource type="Texture2D" uid="uid://bgi4bx6bsjv48" path="res://resources/icons/logo.png" id="5_i7qv0"]
+[ext_resource type="PackedScene" uid="uid://bbm8l3hr4ihar" path="res://components/UI/ItemShow.tscn" id="7_4ekdw"]
+[ext_resource type="StyleBox" uid="uid://c2umi01exgdmu" path="res://styleboxes/panel/HorizontalBorder.tres" id="7_kl3ko"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_i7qv0"]
 shader = ExtResource("3_i7qv0")
 shader_parameter/prog = 0.5000000074506

+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4ekdw"]
+content_margin_left = 60.0
+
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sdsu8"]
 content_margin_right = 60.0

-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_i7qv0"]
-content_margin_left = 20.0
-content_margin_top = 20.0
-content_margin_right = 20.0
-content_margin_bottom = 20.0
-bg_color = Color(0, 0, 0, 0.70000005)
-border_width_left = 10
-border_width_right = 10
-border_color = Color(1, 1, 1, 1)
-border_blend = true
-corner_radius_top_left = 15
-corner_radius_top_right = 15
-corner_radius_bottom_right = 15
-corner_radius_bottom_left = 15
-corner_detail = 1
-
 [sub_resource type="LabelSettings" id="LabelSettings_lfxcn"]
 font_size = 20
 outline_size = 1
@@ -179,56 +168,107 @@ stretch_mode = 5
 [node name="wrapper" parent="content" index="3"]
 theme_override_constants/separation = 30

-[node name="wrapper" type="PanelContainer" parent="content/wrapper" index="0" unique_id=756923034]
+[node name="layout" type="HBoxContainer" parent="content/wrapper" index="0" unique_id=1600804613]
 layout_mode = 2
-size_flags_horizontal = 8
-theme_override_styles/panel = SubResource("StyleBoxEmpty_sdsu8")

-[node name="start" type="PanelContainer" parent="content/wrapper/wrapper" index="0" unique_id=1232082966]
+[node name="outGameWrapper" type="PanelContainer" parent="content/wrapper/layout" index="0" unique_id=2095529794]
 layout_mode = 2
-size_flags_horizontal = 8
-theme_override_styles/panel = SubResource("StyleBoxFlat_i7qv0")
+theme_override_styles/panel = SubResource("StyleBoxEmpty_4ekdw")

-[node name="starter" type="VBoxContainer" parent="content/wrapper/wrapper/start" index="0" unique_id=2056064159]
+[node name="layout" type="HBoxContainer" parent="content/wrapper/layout/outGameWrapper" index="0" unique_id=425031834]
 layout_mode = 2
 theme_override_constants/separation = 30

-[node name="singleplayer" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter" index="0" unique_id=1117567773]
+[node name="character" type="PanelContainer" parent="content/wrapper/layout/outGameWrapper/layout" index="0" unique_id=1828402109]
+layout_mode = 2
+theme_override_styles/panel = ExtResource("7_kl3ko")
+
+[node name="container" type="VBoxContainer" parent="content/wrapper/layout/outGameWrapper/layout/character" index="0" unique_id=1167478166]
+layout_mode = 2
+
+[node name="title" type="Label" parent="content/wrapper/layout/outGameWrapper/layout/character/container" index="0" unique_id=1287813603]
+layout_mode = 2
+text = "选择角色"
+
+[node name="outGame" type="PanelContainer" parent="content/wrapper/layout/outGameWrapper/layout" index="1" unique_id=1923951688]
+layout_mode = 2
+theme_override_styles/panel = ExtResource("7_kl3ko")
+
+[node name="container" type="VBoxContainer" parent="content/wrapper/layout/outGameWrapper/layout/outGame" index="0" unique_id=145459012]
+layout_mode = 2
+theme_override_constants/separation = 10
+
+[node name="items" type="HBoxContainer" parent="content/wrapper/layout/outGameWrapper/layout/outGame/container" index="0" unique_id=141139741]
 layout_mode = 2
 theme_override_constants/separation = 20

-[node name="playConfig" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter/singleplayer" index="0" unique_id=1132195820]
+[node name="crystal" parent="content/wrapper/layout/outGameWrapper/layout/outGame/container/items" index="0" unique_id=827814628 instance=ExtResource("7_4ekdw")]
+unique_name_in_owner = true
+layout_mode = 2
+type = 5
+
+[node name="diamond" parent="content/wrapper/layout/outGameWrapper/layout/outGame/container/items" index="1" unique_id=1846263735 instance=ExtResource("7_4ekdw")]
+unique_name_in_owner = true
+layout_mode = 2
+type = 6
+
+[node name="upgradeFields" type="VBoxContainer" parent="content/wrapper/layout/outGameWrapper/layout/outGame/container" index="1" unique_id=310882955]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_vertical = 3
+alignment = 1
+
+[node name="startGameWrapper" type="PanelContainer" parent="content/wrapper/layout" index="1" unique_id=756923034]
+layout_mode = 2
+size_flags_horizontal = 10
+theme_override_styles/panel = SubResource("StyleBoxEmpty_sdsu8")
+
+[node name="start" type="PanelContainer" parent="content/wrapper/layout/startGameWrapper" index="0" unique_id=1232082966]
+layout_mode = 2
+size_flags_horizontal = 8
+theme = ExtResource("4_lfxcn")
+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
+
+[node name="singleplayer" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter" index="0" unique_id=1117567773]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="playConfig" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer" index="0" unique_id=1132195820]
 layout_mode = 2
 theme_override_constants/separation = 6

-[node name="diffs" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig" index="0" unique_id=526058063]
+[node name="diffs" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig" index="0" unique_id=526058063]
 layout_mode = 2
 alignment = 1

-[node name="tip" type="Label" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/diffs" index="0" unique_id=1507689450]
+[node name="tip" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/diffs" index="0" unique_id=1507689450]
 layout_mode = 2
 text = "选择难度："

-[node name="diffEdit" type="HSlider" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/diffs" index="1" unique_id=1308866785]
+[node name="diffEdit" type="HSlider" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/diffs" index="1" unique_id=1308866785]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(100, 0)
 layout_mode = 2
 size_flags_vertical = 4
 max_value = 0.0

-[node name="levelShow" type="Label" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/diffs" index="2" unique_id=1102279314]
+[node name="levelShow" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/diffs" index="2" unique_id=1102279314]
 unique_name_in_owner = true
 layout_mode = 2
 text = "0 ∈ [0, 0]"

-[node name="gamemode" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig" index="1" unique_id=1396041711]
+[node name="gamemode" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig" index="1" unique_id=1396041711]
 layout_mode = 2

-[node name="tip" type="Label" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/gamemode" index="0" unique_id=1975146551]
+[node name="tip" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/gamemode" index="0" unique_id=1975146551]
 layout_mode = 2
 text = "游戏模式："

-[node name="gamemodeOption" type="OptionButton" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/gamemode" index="1" unique_id=620219949]
+[node name="gamemodeOption" type="OptionButton" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/gamemode" index="1" unique_id=620219949]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -243,14 +283,14 @@ popup/item_1/id = 1
 popup/item_2/text = "割草"
 popup/item_2/id = 2

-[node name="player" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig" index="2" unique_id=656225175]
+[node name="player" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig" index="2" unique_id=656225175]
 layout_mode = 2

-[node name="tip" type="Label" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/player" index="0" unique_id=1899542373]
+[node name="tip" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/player" index="0" unique_id=1899542373]
 layout_mode = 2
 text = "角色名："

-[node name="playerNameInput" type="LineEdit" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/player" index="1" unique_id=1401004968]
+[node name="playerNameInput" type="LineEdit" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/player" index="1" unique_id=1401004968]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -263,14 +303,14 @@ expand_to_text_length = true
 select_all_on_focus = true
 virtual_keyboard_type = 7

-[node name="useTutorial" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig" index="3" unique_id=2079979053]
+[node name="useTutorial" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig" index="3" unique_id=2079979053]
 layout_mode = 2

-[node name="tip" type="Label" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/useTutorial" index="0" unique_id=20976924]
+[node name="tip" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/useTutorial" index="0" unique_id=20976924]
 layout_mode = 2
 text = "新手教程？"

-[node name="useTutorialBtn" type="Button" parent="content/wrapper/wrapper/start/starter/singleplayer/playConfig/useTutorial" index="1" unique_id=689654160]
+[node name="useTutorialBtn" type="Button" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/playConfig/useTutorial" index="1" unique_id=689654160]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -278,41 +318,41 @@ toggle_mode = true
 button_pressed = true
 text = "观看"

-[node name="start" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter/singleplayer" index="1" unique_id=1119283819]
+[node name="start" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer" index="1" unique_id=1119283819]
 layout_mode = 2
 theme_override_constants/separation = 10
 alignment = 1

-[node name="startSingleplayerBtn" type="Button" parent="content/wrapper/wrapper/start/starter/singleplayer/start" index="0" unique_id=935895475]
+[node name="startSingleplayerBtn" type="Button" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/start" index="0" unique_id=935895475]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
 theme = ExtResource("4_lfxcn")
 text = "单人游戏"

-[node name="startMultiplayerBtn" type="Button" parent="content/wrapper/wrapper/start/starter/singleplayer/start" index="1" unique_id=1874616219]
+[node name="startMultiplayerBtn" type="Button" parent="content/wrapper/layout/startGameWrapper/start/starter/singleplayer/start" index="1" unique_id=1874616219]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
 theme = ExtResource("4_lfxcn")
 text = "多人游戏"

-[node name="multiplayer" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter" index="1" unique_id=2010516457]
+[node name="multiplayer" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter" index="1" unique_id=2010516457]
 visible = false
 layout_mode = 2
 theme_override_constants/separation = 15
 alignment = 1

-[node name="main" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer" index="0" unique_id=255202573]
+[node name="main" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer" index="0" unique_id=255202573]
 layout_mode = 2

-[node name="title" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/main" index="0" unique_id=504003020]
+[node name="title" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main" index="0" unique_id=504003020]
 layout_mode = 2
 size_flags_horizontal = 4
 text = "多人游戏"
 label_settings = SubResource("LabelSettings_lfxcn")

-[node name="connectionState" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/main" index="1" unique_id=1479839873]
+[node name="connectionState" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main" index="1" unique_id=1479839873]
 unique_name_in_owner = true
 modulate = Color(1, 0, 0, 1)
 layout_mode = 2
@@ -320,16 +360,16 @@ size_flags_horizontal = 4
 text = "状态：未连接到服务器。"
 label_settings = SubResource("LabelSettings_kl3ko")

-[node name="host" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer/main" index="2" unique_id=105458555]
+[node name="host" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main" index="2" unique_id=105458555]
 layout_mode = 2
 alignment = 1

-[node name="tip" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/main/host" index="0" unique_id=871253279]
+[node name="tip" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/host" index="0" unique_id=871253279]
 layout_mode = 2
 text = "地址"
 label_settings = SubResource("LabelSettings_sdsu8")

-[node name="hostInput" type="LineEdit" parent="content/wrapper/wrapper/start/starter/multiplayer/main/host" index="1" unique_id=1534443919]
+[node name="hostInput" type="LineEdit" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/host" index="1" unique_id=1534443919]
 unique_name_in_owner = true
 layout_mode = 2
 theme = ExtResource("4_lfxcn")
@@ -341,11 +381,11 @@ clear_button_enabled = true
 select_all_on_focus = true
 virtual_keyboard_type = 7

-[node name="separator" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/main/host" index="2" unique_id=1728951883]
+[node name="separator" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/host" index="2" unique_id=1728951883]
 layout_mode = 2
 text = ":"

-[node name="portInput" type="LineEdit" parent="content/wrapper/wrapper/start/starter/multiplayer/main/host" index="3" unique_id=476929474]
+[node name="portInput" type="LineEdit" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/host" index="3" unique_id=476929474]
 unique_name_in_owner = true
 layout_mode = 2
 theme = ExtResource("4_lfxcn")
@@ -356,55 +396,55 @@ emoji_menu_enabled = false
 select_all_on_focus = true
 virtual_keyboard_type = 2

-[node name="operation" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer/main" index="3" unique_id=720531196]
+[node name="operation" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main" index="3" unique_id=720531196]
 layout_mode = 2
 alignment = 1

-[node name="launchBtn" type="Button" parent="content/wrapper/wrapper/start/starter/multiplayer/main/operation" index="0" unique_id=480209339]
+[node name="launchBtn" type="Button" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/operation" index="0" unique_id=480209339]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
 text = "启动服务器"

-[node name="connectBtn" type="Button" parent="content/wrapper/wrapper/start/starter/multiplayer/main/operation" index="1" unique_id=921875653]
+[node name="connectBtn" type="Button" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/operation" index="1" unique_id=921875653]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
 text = "连接服务器"

-[node name="disconnectBtn" type="Button" parent="content/wrapper/wrapper/start/starter/multiplayer/main/operation" index="2" unique_id=1179706084]
+[node name="disconnectBtn" type="Button" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/main/operation" index="2" unique_id=1179706084]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
 disabled = true
 text = "断开连接"

-[node name="configs" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer" index="1" unique_id=332744115]
+[node name="configs" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer" index="1" unique_id=332744115]
 layout_mode = 2
 theme_override_constants/separation = 30
 alignment = 1

-[node name="serverConfig" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer/configs" index="0" unique_id=586906646]
+[node name="serverConfig" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs" index="0" unique_id=586906646]
 unique_name_in_owner = true
 visible = false
 layout_mode = 2

-[node name="title" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/configs/serverConfig" index="0" unique_id=838895828]
+[node name="title" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs/serverConfig" index="0" unique_id=838895828]
 layout_mode = 2
 size_flags_horizontal = 4
 text = "服务器配置"

-[node name="maxPlayer" type="HBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer/configs/serverConfig" index="1" unique_id=233504210]
+[node name="maxPlayer" type="HBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs/serverConfig" index="1" unique_id=233504210]
 layout_mode = 2
 alignment = 1

-[node name="title" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/configs/serverConfig/maxPlayer" index="0" unique_id=665443104]
+[node name="title" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs/serverConfig/maxPlayer" index="0" unique_id=665443104]
 layout_mode = 2
 size_flags_horizontal = 4
 text = "最大玩家数"
 label_settings = SubResource("LabelSettings_i7qv0")

-[node name="maxPlayerInput" type="LineEdit" parent="content/wrapper/wrapper/start/starter/multiplayer/configs/serverConfig/maxPlayer" index="1" unique_id=237311490]
+[node name="maxPlayerInput" type="LineEdit" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs/serverConfig/maxPlayer" index="1" unique_id=237311490]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 4
@@ -415,17 +455,17 @@ emoji_menu_enabled = false
 select_all_on_focus = true
 virtual_keyboard_type = 2

-[node name="players" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer/configs" index="1" unique_id=798597277]
+[node name="players" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs" index="1" unique_id=798597277]
 unique_name_in_owner = true
 visible = false
 layout_mode = 2

-[node name="title" type="Label" parent="content/wrapper/wrapper/start/starter/multiplayer/configs/players" index="0" unique_id=1095446629]
+[node name="title" type="Label" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs/players" index="0" unique_id=1095446629]
 layout_mode = 2
 size_flags_horizontal = 4
 text = "玩家管理"

-[node name="list" type="VBoxContainer" parent="content/wrapper/wrapper/start/starter/multiplayer/configs/players" index="1" unique_id=1550608733]
+[node name="list" type="VBoxContainer" parent="content/wrapper/layout/startGameWrapper/start/starter/multiplayer/configs/players" index="1" unique_id=1550608733]
 unique_name_in_owner = true
 layout_mode = 2
 alignment = 1
@@ -180,6 +180,16 @@ unique_name_in_owner = true
 layout_mode = 2
 type = 4

+[node name="crystal" parent="root/itemsContainer/items" unique_id=707392257 instance=ExtResource("3_o2oi4")]
+unique_name_in_owner = true
+layout_mode = 2
+type = 5
+
+[node name="diamond" parent="root/itemsContainer/items" unique_id=1684500885 instance=ExtResource("3_o2oi4")]
+unique_name_in_owner = true
+layout_mode = 2
+type = 6
+
 [node name="energyContainer" type="PanelContainer" parent="root" unique_id=1886165069]
 unique_name_in_owner = true
 z_index = 1
@@ -1,29 +1,31 @@
-[gd_scene load_steps=5 format=3 uid="uid://cw5ip3rw4r3pp"]
+[gd_scene 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="Script" uid="uid://cosrwhfwqba7c" path="res://scripts/Statemachine/FieldShow.gd" id="1_gwocj"]
+[ext_resource type="Texture2D" uid="uid://indwfnk25l74" path="res://resources/fieldIcons/生命上限.svg" id="2_ueodc"]
 [ext_resource type="Theme" uid="uid://b6nox1qqh50ub" path="res://themes/smallText.tres" id="2_x62bb"]
+[ext_resource type="Texture2D" uid="uid://bq8wf01j5ulwe" path="res://resources/ui/update-level.svg" id="4_imrgm"]

-[sub_resource type="LabelSettings" id="LabelSettings_ysv18"]
+[sub_resource type="LabelSettings" id="LabelSettings_imrgm"]
 font_size = 13

-[node name="FieldShow" type="HBoxContainer"]
+[node name="FieldShow" type="HBoxContainer" unique_id=1958616813]
 offset_right = 144.0
 offset_bottom = 18.0
+alignment = 1
 script = ExtResource("1_gwocj")
 metadata/_edit_horizontal_guides_ = [20.0]

-[node name="icon" type="TextureRect" parent="."]
+[node name="icon" type="TextureRect" parent="." unique_id=1570201622]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(20, 20)
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
-texture = ExtResource("2_q02yi")
+texture = ExtResource("2_ueodc")
 expand_mode = 1
 stretch_mode = 5

-[node name="name" type="Label" parent="."]
+[node name="name" type="Label" parent="." unique_id=452024197]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 11
@@ -31,18 +33,31 @@ theme = ExtResource("2_x62bb")
 text = "生命上限"
 horizontal_alignment = 1

-[node name="sep" type="ColorRect" parent="."]
+[node name="sep" type="ColorRect" parent="." unique_id=947351883]
 custom_minimum_size = Vector2(20, 1)
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 4
 size_flags_stretch_ratio = 16.0

-[node name="value" type="Label" parent="."]
+[node name="value" type="Label" parent="." unique_id=1521326049]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 10
-size_flags_vertical = 8
-text = "0"
-label_settings = SubResource("LabelSettings_ysv18")
+text = "+10.0"
+label_settings = SubResource("LabelSettings_imrgm")
 horizontal_alignment = 1
+
+[node name="upgrades" type="HBoxContainer" parent="." unique_id=1359455298]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="upgradeBtn" type="Button" parent="upgrades" unique_id=1348396281]
+unique_name_in_owner = true
+layout_mode = 2
+icon = ExtResource("4_imrgm")
+
+[node name="cost" type="HBoxContainer" parent="upgrades" unique_id=1708563406]
+unique_name_in_owner = true
+layout_mode = 2
@@ -29,6 +29,10 @@ window/size/viewport_width=1280
 window/size/viewport_height=720
 window/size/mode=2

+[global_group]
+
+bullets=""
+
 [gui]

 theme/custom="res://themes/main.tres"
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33.51739" height="35.44804" viewBox="0,0,33.51739,35.44804"><g transform="translate(-223.24131,-162.27598)"><g stroke="none" stroke-miterlimit="10"><g><g><path d="M223.49351,192.90505c0,0 15.37471,-25.43046 18.61824,-28.21065c0,0 7.42396,-3.51778 14.59531,-2.06804c0,0 0.30978,8.3177 -1.28976,14.43664c0,0 -23.75717,19.61115 -26.02193,20.52265c0,0 -3.52537,-0.26784 -5.31028,-1.19203c0.0292,0.13837 -1.41041,-2.23176 -0.59159,-3.48855z" fill="#8644b3"/><path d="M256.59789,162.79393l-13.58605,10.96081c-1.81157,-3.44793 -0.87089,-8.92197 -0.87089,-8.92197c0,0 7.42396,-3.51778 14.45694,-2.03884z" fill="#ea8be5"/><path d="M256.59789,162.79393l-13.58605,10.96081c-1.81157,-3.44793 -0.87089,-8.92197 -0.87089,-8.92197c0,0 7.42396,-3.51778 14.45694,-2.03884z" fill="#ea8be5"/><path d="M254.75845,177.7079c-6.31572,-1.84708 -11.83038,-4.00775 -11.83038,-4.00775l13.66983,-10.90623c0.05459,-0.08379 0.13837,-0.0292 0.13837,-0.0292c0,0 0.30978,8.3177 -1.37355,14.38205c0,0 -0.10918,0.16757 -0.60428,0.56112z" fill="#ad59c2"/><path d="M242.95726,173.83853l-18.89756,22.77724c0,0 -1.30123,-2.39933 -0.53701,-3.57235c0,0 15.37471,-25.43046 18.61824,-28.21065z" fill="#ad59c2"/><path d="M242.92807,173.70015c0,0 -0.95719,1.28599 -2.43487,3.18769c-0.73884,0.95085 -1.67064,2.01469 -2.57325,3.2169c-0.98639,1.14762 -1.94358,2.43362 -2.92997,3.58124c-1.04098,1.23141 -2.08196,2.46282 -3.01376,3.52665c-0.98639,1.14762 -1.91819,2.21146 -2.60244,3.07852c-1.59066,1.70874 -2.63165,2.94014 -2.63165,2.94014c0,0 0.95719,-1.28599 2.43487,-3.18769c0.73884,-0.95085 1.67064,-2.01469 2.57325,-3.2169c0.98639,-1.14762 1.94358,-2.43362 2.92997,-3.58124c1.04098,-1.23141 2.08196,-2.46282 3.01376,-3.52665c0.98639,-1.14762 1.91819,-2.21146 2.60244,-3.07852c1.64525,-1.79253 2.63165,-2.94014 2.63165,-2.94014z" fill="#ea8be5"/><path d="M226.16706,193.93079l-2.13654,2.5466c0,0 -1.30123,-2.39933 -0.53701,-3.57235c0,0 1.50435,0.62205 2.67355,1.02574z" fill="#a546bd"/><path d="M229.34079,197.66942c0,0 -3.60916,-0.32244 -5.31028,-1.19203l2.13654,-2.5466c0.55731,0.24375 1.03083,0.4329 1.1984,0.54207c0.72488,0.35292 1.97534,3.19657 1.97534,3.19657z" fill="#7c36ab"/><path d="M224.1143,196.53198c0.86326,0.32372 1.7811,0.56364 2.61515,0.749c0.83405,0.18534 1.7227,0.2869 2.63673,0.1663l-0.13837,0.0292c1.59448,-1.34821 3.27274,-2.64181 4.95099,-3.93543c1.67826,-1.29361 3.27274,-2.64181 4.89641,-3.85165c3.35652,-2.58723 6.65846,-5.09067 10.04418,-7.53953c-3.18895,2.6964 -6.46169,5.33822 -9.81821,7.92545c-1.67826,1.29361 -3.35652,2.58723 -4.89641,3.85165c-1.67826,1.29361 -3.35652,2.58723 -4.9802,3.79706c-0.94323,-0.01777 -1.83187,-0.11933 -2.74972,-0.35926c-0.97243,-0.15614 -1.75189,-0.42528 -2.56056,-0.83277z" fill="#6b348f"/><path d="M242.05717,164.77818c0,0 4.07252,2.17589 6.92127,4.03187l-6.05037,4.8901c-1.6732,-3.47713 -0.87089,-8.92197 -0.87089,-8.92197z" fill="#e17de3"/><path d="M251.66342,170.91741c0.59031,0.74265 2.53645,3.80084 3.77929,5.92343c-0.05459,0.08379 -0.07997,0.30595 -0.13456,0.38973c0,0 -0.19296,0.11299 -0.54968,0.47733c-6.31572,-1.84708 -11.83038,-4.00775 -11.83038,-4.00775l6.05037,-4.8901c1.34059,0.8734 2.51359,1.63763 2.68498,2.10734z" fill="#9b4dae"/><path d="M254.81304,177.62411c0,0 -0.66648,-0.07616 -1.50054,-0.26152c-0.91785,-0.23993 -2.05784,-0.50525 -3.28163,-0.82516c-1.1692,-0.40369 -2.3384,-0.80739 -3.20165,-1.1311c-0.86326,-0.32372 -1.36597,-0.65125 -1.36597,-0.65125c0,0 0.08379,0.05459 0.38973,0.13456c0.30595,0.07997 0.61189,0.15995 1.08542,0.34911c0.91785,0.23993 2.00325,0.58904 3.22704,0.90895c1.1692,0.40369 2.39299,0.7236 3.25625,1.04732c0.83405,0.18534 1.39136,0.42909 1.39136,0.42909z" fill="#6b348f"/></g><path d="M256.59789,162.79393c0,0 -0.60428,0.56112 -1.51069,1.40279c-0.90641,0.84167 -2.19875,1.90932 -3.49109,2.97696c-1.29234,1.06765 -2.66846,2.0807 -3.74245,2.8132c-1.07399,0.7325 -1.76205,1.23903 -1.76205,1.23903c0,0 0.60428,-0.56112 1.51069,-1.40279c0.961,-0.92546 2.30793,-2.07689 3.54567,-3.06075c1.29234,-1.06765 2.66846,-2.0807 3.74245,-2.8132c0.9902,-0.78709 1.70746,-1.15524 1.70746,-1.15524z" fill="#ffbcfc"/></g></g></g></svg><!--rotationCenter:16.75869348767222:17.7240205896303-->
@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bdp6x3yncvway"
+path="res://.godot/imported/crystal.svg-b5be99c51af6bba53888868c59397820.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resources/items/crystal.svg"
+dest_files=["res://.godot/imported/crystal.svg-b5be99c51af6bba53888868c59397820.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="25" height="22.05604362487793" viewBox="2.5 4.043956756591797 25 22.05604362487793" version="1.1" xml:space="preserve">
+  <!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
+  <defs/>
+  <g>
+    <title>crystal-a</title>
+    <desc>Created with Sketch.</desc>
+    <g id="crystal-a" fill-rule="evenodd">
+      <g id="Blue-Crystal" fill-rule="nonzero">
+        <path d="M 3 12.3 C 3 12.3 5.9 7.1 10 5.6 C 10 5.6 17.9 3.8 20.5 4.9 C 20.5 4.9 25.7 8.5 27 10.5 C 27 10.5 20 23.5 16.7 25.5 C 16.7 25.6 4.3 17.7 3 12.3 Z " id="Shape" fill="#7FCCEF" stroke-width="1" stroke="none"/>
+        <path d="M 27 10.5 C 26.8 10.2 26.5 9.8 26.1 9.5 L 20.6 12.9 L 15.8 18.7 L 16.7 25.6 C 20.1 23.5 27 10.5 27 10.5 Z " id="Shape" fill="#678FE4" stroke-width="1" stroke="none"/>
+        <path d="M 11.3 13.9 C 11.3 13.9 13.8 22.6 16.7 25.6 C 16.7 25.6 20.4 16.1 20.6 12.9 L 13.8 9.7 L 11.3 13.9 Z " id="Shape" fill="#73B5E4" stroke-width="1" stroke="none"/>
+        <path d="M 20.5 4.9 C 17.8 3.8 10 5.6 10 5.6 C 6 7.2 3 12.3 3 12.3 C 3 12.3 9.5 13.9 11.3 13.9 C 11.3 13.9 17 14 20.6 12.9 C 23 12.2 24.5 11.9 27 10.5 C 25.7 8.5 20.5 4.9 20.5 4.9 Z " id="Shape" fill="#92D7EF" stroke-width="1" stroke="none"/>
+        <path d="M 17.2 4.6 C 15.8 4.7 14.3 4.8 13 5.1 L 11.8 7.5 L 11.4 14 C 11.4 14 17.1 14.1 20.7 13 L 18 6.9 L 17.2 4.6 Z " id="Shape" fill="#7FCCEF" stroke-width="1" stroke="none"/>
+        <path d="M 11.2 9.6 C 10.4 9.6 6.2 10.9 3.3 11.8 C 3.1 12.1 3 12.3 3 12.3 C 3 12.3 9.5 13.9 11.3 13.9 C 11.3 13.9 17 14 20.6 12.9 C 23 12.2 24.5 11.9 27 10.5 C 26.9 10.4 26.9 10.3 26.8 10.2 C 24.4 9.7 20.2 8.8 19.7 8.8 C 19 8.9 12.4 9.6 11.2 9.6 Z " id="Shape" fill="#83CDEF" stroke-width="1" stroke="none"/>
+        <path d="M 11.8 7.4 L 18.1 7 C 18.1 7 19.9 6.8 20.6 5 C 17.8 3.8 10 5.6 10 5.6 C 10 5.6 10.6 6.5 11.8 7.4 Z " id="Shape" fill="#BEE6F1" stroke-width="1" stroke="none"/>
+        <path d="M 20.5 4.9 C 20.3 4.8 20 4.7 19.7 4.7 L 18 6.9 L 20.6 12.8 C 23 12.1 24.5 11.8 27 10.4 C 25.7 8.5 20.5 4.9 20.5 4.9 Z " id="Shape" fill="#73B5E4" stroke-width="1" stroke="none"/>
+        <path d="M 27 10.5 C 27 10.5 26.9 10.8 26.7 11.2 C 26.5 11.7 26.2 12.3 25.9 13.1 C 25.7 13.5 25.5 13.9 25.3 14.3 C 25.1 14.7 24.8 15.2 24.5 15.7 C 24 16.6 23.3 17.6 22.7 18.6 C 22 19.5 21.3 20.5 20.7 21.3 C 20 22.1 19.4 22.9 18.8 23.5 C 17.6 24.8 16.8 25.5 16.8 25.5 C 16.8 25.5 17.6 24.6 18.6 23.3 C 19.1 22.6 19.7 21.8 20.4 21 C 21 20.1 21.7 19.2 22.4 18.3 C 23.1 17.4 23.7 16.4 24.2 15.5 C 24.8 14.6 25.3 13.7 25.7 13 C 26.1 12.3 26.5 11.6 26.7 11.2 C 26.9 10.8 27 10.5 27 10.5 Z " id="Shape" fill="#3B73E4" stroke-width="1" stroke="none"/>
+        <path d="M 3 12.3 C 3 12.3 3.5 12.3 4.2 12.4 C 4.9 12.5 5.8 12.6 6.7 12.8 C 7.6 13 8.5 13.2 9.2 13.4 C 9.9 13.6 10.3 13.7 10.3 13.7 C 10.3 13.7 9.8 13.8 9.1 13.7 C 8.4 13.6 7.5 13.5 6.6 13.3 C 5.7 13.1 4.8 12.9 4.1 12.7 C 3.4 12.5 3 12.3 3 12.3 Z " id="Shape" fill="#BEE6F1" stroke-width="1" stroke="none"/>
+        <path d="M 11.5 14.9 C 11.5 14.9 11.8 15.5 12.1 16.3 C 12.5 17.2 12.9 18.3 13.4 19.4 C 13.8 20.5 14.3 21.7 14.6 22.5 C 14.8 22.9 14.9 23.3 15.1 23.5 C 15.3 23.7 15.3 23.8 15.3 23.8 C 15.3 23.8 15.2 23.7 15 23.5 C 14.8 23.3 14.6 23 14.3 22.6 C 13.8 21.8 13.3 20.7 12.8 19.5 C 12.3 18.3 12 17.2 11.7 16.3 C 11.7 15.5 11.5 14.9 11.5 14.9 Z " id="Shape" fill="#BEE6F1" stroke-width="1" stroke="none"/>
+        <path d="M 18.9 8.9 L 20.6 12.9 C 23 12.2 24.5 11.9 27 10.5 C 26.9 10.4 26.9 10.3 26.8 10.2 C 24.4 9.7 20.2 8.8 19.7 8.8 C 19.6 8.9 19.3 8.9 18.9 8.9 Z " id="Shape" fill="#679FE4" stroke-width="1" stroke="none"/>
+        <path d="M 11.6 9.6 L 11.3 13.9 C 11.3 13.9 17 14 20.6 12.9 L 18.9 8.9 C 17.2 9.1 13.2 9.5 11.6 9.6 Z " id="Shape" fill="#7CBFEF" stroke-width="1" stroke="none"/>
+      </g>
+    </g>
+  </g>
+</svg><!--rotationCenter:15:15-->
@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b2pdt75oaeyyi"
+path="res://.godot/imported/diamond.svg-c2e0c7bcfcf4bf5e3510e897076abe04.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resources/items/diamond.svg"
+dest_files=["res://.godot/imported/diamond.svg-c2e0c7bcfcf4bf5e3510e897076abe04.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
@@ -1,10 +1,32 @@
@tool
 extends FullscreenPanelBase

-@onready var audio: AudioStreamPlayer2D = $"%audio"
-@onready var deadreason: RichTextLabel = $"%deadreason"
+@onready var audio: AudioStreamPlayer2D = $%audio
+@onready var deadreason: RichTextLabel = $%deadreason
+@onready var returnBtn: Button = $%returnBtn
+@onready var exitBtn: Button = $%exitBtn
+
+func _ready():
+	returnBtn.pressed.connect(
+		func():
+			returnBtn.disabled = true
+			for bullet in get_tree().get_nodes_in_group("bullets"):
+				bullet.queue_free()
+			for entity in get_tree().get_nodes_in_group("entities"):
+				entity.queue_free()
+			UIState.setPanel("Starter")
+	)
+	exitBtn.pressed.connect(
+		func():
+			get_tree().quit()
+	)

 func beforeOpen(args: Array = []):
 	audio.play()
 	var reasonTemplate = MathTool.randomChoiceFrom(GameRule.deadReasons)
 	deadreason.text = ("[color=gray]" + reasonTemplate + "凶手是[b]%s[/b]的[b]%s[/b]。[/color]") % args
+	for item in OutGameStorage.inventory:
+		OutGameStorage.inventory[item] += UIState.player.inventory[item]
+func afterOpen(_args: Array = []):
+	returnBtn.disabled = false
+	exitBtn.disabled = false
@@ -36,6 +36,9 @@ func _ready():
 					updateValue()
 					if selectedCount >= UIState.player.fields[FieldStore.Entity.FEED_COUNT_CAN_MADE]:
 						finish()
+					for feedCard in feedCards.get_children():
+						if feedCard is Feed:
+							feed.rebuildInfo()
 		)
 		avaliableFeeds.add_child(feed)

@@ -19,30 +19,38 @@ func _ready():
 func beforeOpen(_args: Array = []):
 	clearFeeds()
 	clearWeapons()
+	var feedCounted = 0
+	var weaponCounted = 0
 	ComponentManager.feeds.shuffle()
 	for feed in ComponentManager.feeds:
 		var card = feed.instantiate() as Feed
 		card.freeToBuy = true
 		if card.topic == FeedName.Topic.WEAPON:
-			initialWeaponSelection.add_child(card)
-			card.selected.connect(
-				func(_x):
-					if WorldManager.isRelease():
-						clearWeapons()
-						title2.hide()
-						if !title1.visible:
-							startBtn.pressed.emit()
-			)
+			if weaponCounted < OutGameStorage.maxInitialWeaponCount:
+				initialWeaponSelection.add_child(card)
+				card.selected.connect(
+					func(_x):
+						if WorldManager.isRelease():
+							clearWeapons()
+							title2.hide()
+							if !title1.visible:
+								startBtn.pressed.emit()
+				)
+				weaponCounted += 1
 		else:
-			initialFeedSelection.add_child(card)
-			card.selected.connect(
-				func(_x):
-					if WorldManager.isRelease():
-						clearFeeds()
-						title1.hide()
-						if !title2.visible:
-							startBtn.pressed.emit()
-			)
+			if feedCounted < OutGameStorage.maxInitialFeedCount:
+				initialFeedSelection.add_child(card)
+				card.selected.connect(
+					func(_x):
+						if WorldManager.isRelease():
+							clearFeeds()
+							title1.hide()
+							if !title2.visible:
+								startBtn.pressed.emit()
+				)
+				feedCounted += 1
+func afterOpen(_args: Array = []):
+	startBtn.disabled = false

 func clearFeeds():
 	for feed in initialFeedSelection.get_children():
@@ -7,6 +7,10 @@ class_name StarterPanel
@onready var gamemodeOption: OptionButton = $%gamemodeOption
@onready var useTutorialBtn: Button = $%useTutorialBtn

+@onready var upgradeFieldsBox: Control = $%upgradeFields
+@onready var crystalShow: ItemShow = $%crystal
+@onready var diamondShow: ItemShow = $%diamond
+
@onready var startSingleplayerBtn: Button = $%startSingleplayerBtn
@onready var startMultiplayerBtn: Button = $%startMultiplayerBtn
@onready var levelShow: Label = $%levelShow
@@ -81,9 +85,6 @@ func startSingleplayerGame():

 func _ready():
 	historyStack = Composables.useHistoryStack(playerNameInput)
-	diffEdit.min_value = GameRule.difficultyRange.x
-	diffEdit.max_value = GameRule.difficultyRange.y
-	diffEdit.value = GameRule.difficulty
 	useTutorialBtn.toggled.connect(
 		func(on: bool):
 			useTutorialBtn.text = "观看" if on else "跳过"
@@ -134,7 +135,6 @@ func _ready():
 			setPlayerName(getLast.call(1), newText)
 			mutexPlayer.rpc(newText)
 	)
-	setState(MultiplayerState.ConnectionState.DISCONNECTED)
 func _physics_process(_delta):
 	levelShow.text = "%d ∈ [%d, %d]" % [diffEdit.value, diffEdit.min_value, diffEdit.max_value]
 	GameRule.difficulty = diffEdit.value
@@ -158,3 +158,36 @@ func getPlayerNames() -> Array[String]:
 	for i in playersList.get_children():
 		result.append(i.text)
 	return result
+
+func beforeOpen(_args: Array = []):
+	diffEdit.min_value = GameRule.difficultyRange.x
+	diffEdit.max_value = GameRule.difficultyRange.y
+	diffEdit.value = GameRule.difficulty
+	setState(MultiplayerState.ConnectionState.DISCONNECTED)
+	rebuildInfo()
+	startSingleplayerBtn.disabled = false
+	Wave.current = 0
+
+func rebuildInfo():
+	crystalShow.count = OutGameStorage.inventory[ItemStore.ItemType.CRYSTAL]
+	diamondShow.count = OutGameStorage.inventory[ItemStore.ItemType.DIAMOND]
+	for child in upgradeFieldsBox.get_children():
+		upgradeFieldsBox.remove_child(child)
+	for field in OutGameStorage.upgradableFieldsAdvance:
+		var fieldShow = ComponentManager.getUIComponent("FieldShow").instantiate() as FieldShow
+		var level = OutGameStorage.upgradableFieldsLevel[field]
+		for item in OutGameStorage.upgradableFieldsCost:
+			var count = OutGameStorage.upgradableFieldsCost[item]
+			fieldShow.cost(item, count[0] * (level + count[1]))
+		fieldShow.upgradable = true
+		fieldShow.upgradeValue = OutGameStorage.upgradableFieldsAdvance[field]
+		fieldShow.field = field
+		fieldShow.value = OutGameStorage.upgradableFieldsValue[field]
+		fieldShow.showAdvantage = true
+		fieldShow.upgrade.connect(
+			func(newValue: float):
+				OutGameStorage.upgradableFieldsValue[fieldShow.field] = newValue
+				OutGameStorage.upgradableFieldsLevel[fieldShow.field] += 1
+				rebuildInfo()
+		)
+		upgradeFieldsBox.add_child(fieldShow)
@@ -67,6 +67,8 @@ var inventory = {
 	ItemStore.ItemType.APPLE: 5,
 	ItemStore.ItemType.BEACHBALL: 0,
 	ItemStore.ItemType.SOUL: 0,
+	ItemStore.ItemType.CRYSTAL: 0,
+	ItemStore.ItemType.DIAMOND: 0
 }
 var inventoryMax = {
 	ItemStore.ItemType.BASEBALL: INF, # 无限
@@ -74,6 +76,8 @@ var inventoryMax = {
 	ItemStore.ItemType.APPLE: 5,
 	ItemStore.ItemType.BEACHBALL: INF,
 	ItemStore.ItemType.SOUL: INF,
+	ItemStore.ItemType.CRYSTAL: INF,
+	ItemStore.ItemType.DIAMOND: INF,
 }

@export var defaultCooldownUnit: float = 100
@@ -415,6 +419,18 @@ func tryDie(by: BulletBase = null):
 			fields[FieldStore.Entity.MAX_HEALTH] * randf_range(1 - GameRule.beachballOffset, 1 + GameRule.beachballOffset),
 			position + MathTool.sampleInCircle(GameRule.itemDroppedSpawnOffset)
 		)
+		for i in randi_range(0, 10 if isBoss else 3):
+			ItemDropped.generate(
+				ItemStore.ItemType.CRYSTAL,
+				5 if isBoss else 1,
+				position + MathTool.sampleInCircle(GameRule.itemDroppedSpawnOffset)
+			)
+		if isBoss:
+			ItemDropped.generate(
+				ItemStore.ItemType.DIAMOND,
+				randi_range(1, 3),
+				position + MathTool.sampleInCircle(GameRule.itemDroppedSpawnOffset)
+			)
 	if isBoss:
 		ItemDropped.generate(
 			ItemStore.ItemType.SOUL,
@@ -544,6 +560,12 @@ static func generatePlayer(playerName: String) -> EntityBase:
 	var player = generate(ComponentManager.getCharacter("Rooster"), Vector2.ZERO, false)
 	player.displayName = playerName
 	player.name = "Player_%s" % playerName
+	var feed = ComponentManager.getAbstract("FeedCardBase").instantiate() as Feed
+	for field in OutGameStorage.upgradableFieldsValue:
+		feed.fields.append(field)
+		feed.fieldValues.append(OutGameStorage.upgradableFieldsValue[field])
+	feed.freeToBuy = true
+	feed.apply(player)
 	return player
 static func generate(
 	entity: PackedScene,
@@ -560,6 +582,7 @@ static func generate(
 		instance.add_to_group("mobs")
 	else:
 		instance.add_to_group("players")
+	instance.add_to_group("entities")
 	if addToWorld:
 		WorldManager.rootNode.spawn(instance)
 	return instance
@@ -2,6 +2,8 @@
 extends HBoxContainer
 class_name FieldShow

+signal upgrade(newValue: float)
+
@export var field: FieldStore.Entity = FieldStore.Entity.MAX_HEALTH
@export var value: float = 0
@export var showSign: bool = true
@@ -9,19 +11,43 @@ class_name FieldShow
@export var useViewCast: bool = false
@export var maxed: bool = false
@export var showAdvantage: bool = false
+@export var upgradable: bool = false
+@export var upgradeValue: float = 0
+@export var costItems: Array[ItemStore.ItemType] = []
+@export var costCounts: Array[int] = []

-@onready var icon: TextureRect = $"%icon"
-@onready var nameLabel: Label = $"%name"
-@onready var valueLabel: Label = $"%value"
+@onready var icon: TextureRect = $%icon
+@onready var nameLabel: Label = $%name
+@onready var valueLabel: Label = $%value
+@onready var upgradesBox: Control = $%upgrades
+@onready var upgradeBtn: Button = $%upgradeBtn
+@onready var costsBox: Control = $%cost

 func _ready():
+	valueLabel.label_settings = valueLabel.label_settings.duplicate()
+	upgradeBtn.pressed.connect(
+		func():
+			if upgradable:
+				if enoughToUpgrade():
+					for index in len(costItems):
+						var item = costItems[index]
+						OutGameStorage.inventory[item] -= costCounts[index]
+					value += upgradeValue
+					upgrade.emit(value)
+					rebuildInfo()
+				else:
+					UIState.showTip("物品不足！", TipBox.MessageType.ERROR)
+	)
+	rebuildInfo()
+
+func rebuildInfo():
+	nameLabel.text = FieldStore.entityMap[field]
+	icon.texture = ComponentManager.getFieldTexture(FieldStore.entityMap.get(field))
 	if useViewCast:
 		var caster = FieldStore.entityViewCastMap.get(field)
 		if caster:
 			value = caster.call(entity, value)
-	nameLabel.text = FieldStore.entityMap[field]
-	icon.texture = ComponentManager.getFieldTexture(FieldStore.entityMap.get(field))
-	var formattedValue: String
+	var formattedValue: String = ""
 	var dataType = FieldStore.entityMapType[field]
 	if dataType == FieldStore.DataType.VALUE:
 		formattedValue = "%s" % (MathTool.toSigned(value) if showSign else str(value))
@@ -31,18 +57,46 @@ func _ready():
 		formattedValue = "%s°" % (MathTool.toSigned(value) if showSign else str(value))
 	elif dataType == FieldStore.DataType.PERCENT:
 		formattedValue = (MathTool.toSigned(value * 100) if showSign else str(value * 100)) + "%"
-	valueLabel.label_settings = valueLabel.label_settings.duplicate()
 	valueLabel.text = formattedValue
 	if maxed:
 		valueLabel.label_settings.font_color = Color(1, 0.3, 0.3)
 		valueLabel.text = "MAX%s" % valueLabel.text
 	elif showAdvantage:
-		if field in FieldStore.entityNegativeFields:
-			valueLabel.label_settings.font_color = Color.RED if value > 0 else Color.GREEN
+		if value == 0:
+			valueLabel.label_settings.font_color = Color.WHITE
 		else:
-			valueLabel.label_settings.font_color = Color.GREEN if value > 0 else Color.RED
+			if field in FieldStore.entityNegativeFields:
+				valueLabel.label_settings.font_color = Color.RED if value > 0 else Color.GREEN
+			else:
+				valueLabel.label_settings.font_color = Color.GREEN if value > 0 else Color.RED
 	else:
 		valueLabel.label_settings.font_color = Color(1, 1, 1)
+	upgradesBox.visible = upgradable
+	for child in costsBox.get_children():
+		costsBox.remove_child(child)
+	for index in len(costItems):
+		var item = costItems[index]
+		var itemShow = ComponentManager.getUIComponent("ItemShow").instantiate() as ItemShow
+		itemShow.type = item
+		itemShow.count = costCounts[index]
+		itemShow.enough = OutGameStorage.inventory[item] >= costCounts[index]
+		costsBox.add_child(itemShow)
+func enoughToUpgrade():
+	var result = true
+	for child in costsBox.get_children():
+		if child is ItemShow:
+			if !child.enough:
+				result = false
+				break
+	return result
+func cost(item: ItemStore.ItemType, count: int):
+	for index in len(costItems):
+		var itemd = costItems[index]
+		if itemd == item:
+			costCounts[index] += count
+			break
+	costItems.append(item)
+	costCounts.append(count)

 static func create(newField: FieldStore.Entity, newValue: float, newShowSign: bool, newEntity: EntityBase, newUseViewCast: bool) -> FieldShow:
 	var fieldShow = ComponentManager.getUIComponent("FieldShow").instantiate()
@@ -118,7 +118,6 @@ func _ready():
 	)
 	for i in sounds.get_children():
 		i.process_mode = ProcessMode.PROCESS_MODE_ALWAYS
-	rebuildInfo()
 	debugRebuild = false # 只能在编辑器里打开
 func _physics_process(_delta):
 	if debugRebuild:
@@ -24,3 +24,10 @@ static func betterMap(arr: Array, executor: Callable) -> Array:
 	for index in len(arr):
 		result.append(executor.call(arr[index], index, arr))
 	return result
+static func fill(origin: Dictionary, filler: Callable) -> Dictionary:
+	return origin.keys().reduce(
+		func(accum, key):
+			accum[key] = filler.call(key)
+			return accum,
+		{}
+	)
@@ -105,7 +105,7 @@ static var entityMaxValueMap = {
 	Entity.CRIT_RATE: 0.9,
 	Entity.PENERATE: 0.9,
 	Entity.PENARATION_RESISTANCE: 1,
-	Entity.PRICE_REDUCTION: 0.7,
+	Entity.PRICE_REDUCTION: 0.85,
 	Entity.DROP_APPLE_RATE: 0.3,
 	Entity.FEED_COUNT_SHOW: 5,
 	Entity.BULLET_TRACE: 1,
@@ -9,7 +9,7 @@ static var damageOffset: float = MathTool.percent(20) # 伤害随机浮动比例
 static var beachballOffset: float = MathTool.percent(30) # 棒球掉落数随机浮动比例
 static var damageLabelSpawnOffset: float = 30 # 伤害标签生成位置的随机偏移
 static var itemDroppedSpawnOffset: float = 30 # 掉落物生成位置的随机偏移
-static var appleDropRate: float = MathTool.percent(3) # 苹果掉落概率
+static var appleDropRate: float = MathTool.percent(2) # 苹果掉落概率
 static var refreshCountIncreaseCount: Vector2i = Vector2i(0, 3) # 刷新所需的棒球数量的增加的数量
 static var entityCountBoostPerWave: float = MathTool.percent(2) # 每波敌人数量增加的百分比，倍数级
 static var itemShowLifetime: int = 1500 # 物品展示组件如果设置了自动隐藏，那么隐藏前可以存活的时间
@@ -7,6 +7,8 @@ enum ItemType {
 	APPLE,
 	BEACHBALL,
 	SOUL,
+	CRYSTAL,
+	DIAMOND
 }
 static var nameMap = {
 	ItemType.BASEBALL: "棒球",
@@ -14,6 +16,8 @@ static var nameMap = {
 	ItemType.APPLE: "苹果",
 	ItemType.BEACHBALL: "沙滩球",
 	ItemType.SOUL: "灵魂",
+	ItemType.CRYSTAL: "紫水晶",
+	ItemType.DIAMOND: "钻石"
 }
 static var idMap = {
 	ItemType.BASEBALL: "baseball",
@@ -21,6 +25,8 @@ static var idMap = {
 	ItemType.APPLE: "apple",
 	ItemType.BEACHBALL: "beachball",
 	ItemType.SOUL: "soul",
+	ItemType.CRYSTAL: "crystal",
+	ItemType.DIAMOND: "diamond"
 }
 static func getTexture(type: ItemType) -> Texture2D:
 	return ComponentManager.getItemTexture(idMap.get(type, "baseball"))
@@ -2,6 +2,7 @@
 extends Node
 class_name ComponentManager

+static var abstracts = {}
 static var bullets = {}
 static var characters = {}
 static var weapons = {}
@@ -16,6 +17,8 @@ static var fieldTextures = {}
 static var itemTextures = {}

 static func init():
+	for i in DirTool.listdir("res://components/Abstracts"):
+		abstracts[DirTool.getBasenameWithoutExtension(i)] = load(i)
 	for i in DirTool.listdir("res://components/Bullets"):
 		bullets[DirTool.getBasenameWithoutExtension(i)] = load(i)
 	for i in DirTool.listdir("res://components/Characters"):
@@ -40,6 +43,9 @@ static func init():
 		fieldTextures[DirTool.getBasenameWithoutExtension(i)] = load(i)
 	for i in DirTool.listdir("res://resources/items"):
 		itemTextures[DirTool.getBasenameWithoutExtension(i)] = load(i)
+
+static func getAbstract(t: String) -> PackedScene:
+	return MathTool.priority(abstracts.get(t, false), load("res://components/Abstracts/%s.tscn" % t))
 static func getBullet(t: String) -> PackedScene:
 	return MathTool.priority(bullets.get(t, false), load("res://components/Bullets/%s.tscn" % t))
 static func getCharacter(t: String) -> PackedScene:
@@ -0,0 +1,21 @@
+class_name OutGameStorage
+
+static var upgradableFieldsCost = {
+	ItemStore.ItemType.CRYSTAL: [50, 1], # [每级所需,初始等级]
+	ItemStore.ItemType.DIAMOND: [1, 0],
+}
+static var upgradableFieldsAdvance = {
+	FieldStore.Entity.MAX_HEALTH: 10,
+	FieldStore.Entity.MAX_ENERGY: 15,
+	FieldStore.Entity.DAMAGE_MULTIPILER: 0.1,
+	FieldStore.Entity.ATTACK_SPEED: 0.05,
+	FieldStore.Entity.PRICE_REDUCTION: 0.03,
+	FieldStore.Entity.LUCK_VALUE: 1,
+	FieldStore.Entity.DROP_APPLE_RATE: 0.007
+}
+static var upgradableFieldsValue = ArrayTool.fill(upgradableFieldsAdvance, func(_k): return 0)
+static var upgradableFieldsLevel = ArrayTool.fill(upgradableFieldsAdvance, func(_k): return 0)
+
+static var maxInitialFeedCount: int = 3
+static var maxInitialWeaponCount: int = 3
+static var inventory = ArrayTool.fill(upgradableFieldsCost, func(_k): return 0)
@@ -0,0 +1 @@
+uid://dum6mef633vej
@@ -0,0 +1,17 @@
+[gd_resource type="StyleBoxFlat" format=3 uid="uid://c2umi01exgdmu"]
+
+[resource]
+content_margin_left = 20.0
+content_margin_top = 20.0
+content_margin_right = 20.0
+content_margin_bottom = 20.0
+bg_color = Color(0, 0, 0, 0.70000005)
+border_width_left = 10
+border_width_right = 10
+border_color = Color(1, 1, 1, 1)
+border_blend = true
+corner_radius_top_left = 15
+corner_radius_top_right = 15
+corner_radius_bottom_right = 15
+corner_radius_bottom_left = 15
+corner_detail = 1
Author	SHA1	Message	Date
fallingshrimp	c23d0355fe	style(UI): 调整容器间距从4增加到10以改善布局	2026-05-04 11:17:21 +08:00
fallingshrimp	cdba10c867	feat: 调整游戏平衡性和修复数据存储问题 - 调整草莓、水果沙拉和焦糖苹果的数值平衡 - 在OutGameStorage中新增MAX_ENERGY等升级字段 - 修复GameOver面板中物品存储的遍历问题 - 优化FeedFilter组件的目标字段和点击刷新功能 - 修正A-Applr组件的显示名称和贴图问题	2026-05-04 11:02:35 +08:00
fallingshrimp	f9e512a5e6	feat(ArrayTool): 添加字典填充工具方法 refactor(OutGameStorage): 重构升级字段初始化逻辑使用新的ArrayTool.fill方法简化字典初始化，提高代码可读性 fix(EntityBase): 调整boss死亡掉落物品数量将boss掉落水晶数量上限从20降低到10，钻石掉落数量改为1-3随机 fix(Starter): 修复升级成本计算逻辑根据新的升级成本数据结构调整升级显示计算方式	2026-05-04 10:52:17 +08:00
fallingshrimp	6b31030887	feat(角色系统): 重构角色生成和升级系统 - 在EntityBase.gd中修改角色生成逻辑，使用FeedCardBase初始化角色属性 - 调整OutGameStorage.gd中的升级字段初始值和成本配置 - 在ComponentManager.gd中添加抽象组件管理功能 - 更新Rooster.tscn的默认武器为ChainGun - 在Starter.gd中优化升级界面刷新逻辑，提取rebuildInfo方法 - 在MakeFeed.gd中添加feed卡片重建功能	2026-05-04 10:30:54 +08:00
fallingshrimp	5e82841d58	refactor(武器系统): 替换蓝色水晶为紫色水晶并移除多余武器将Rooster角色的武器从蓝色水晶更换为紫色水晶，并移除了不再使用的树和道像武器修复FieldShow状态机中costItems循环的长度检查问题	2026-05-04 09:53:38 +08:00
fallingshrimp	e377840a16	feat(养成系统): 实现局外养成等级机制并调整升级消耗添加upgradableFieldsLevel字段记录养成等级修改升级逻辑使用等级计算消耗而非固定倍率升级时自动增加等级并重新计算下次升级消耗	2026-05-04 09:46:21 +08:00
fallingshrimp	bd85129ecc	feat: 添加水晶和钻石物品系统 - 在EntityBase中新增水晶和钻石物品类型 - 敌人在死亡时概率掉落水晶，BOSS额外掉落钻石 - 游戏结束时将水晶和钻石存入OutGameStorage - 调整Starter面板中钻石升级成本为0 - 在UI场景中添加水晶和钻石显示节点	2026-05-04 09:15:49 +08:00
fallingshrimp	e1c017bf3a	feat: 添加局外养成系统和游戏结束面板改进添加新的物品类型紫水晶和钻石实现局外属性升级系统改进游戏结束面板的返回和退出功能添加新的UI组件用于显示属性和物品更新游戏规则和存储系统以支持局外养成	2026-05-04 08:52:20 +08:00
fallingshrimp	e53af2a163	feat(初始选择): 添加初始增益和武器数量限制 - 新增OutGameStorage类存储最大初始数量配置 - 修改SelectInitialFeed面板逻辑以限制选择数量 - 优化FeedCardBase样式和布局 - 移除不必要的ScrollContainer简化UI结构	2026-05-04 07:03:18 +08:00
				`@@ -0,0 +1 @@`
				<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="33.51739" height="35.44804" viewBox="0,0,33.51739,35.44804"><g transform="translate(-223.24131,-162.27598)"><g stroke="none" stroke-miterlimit="10"><g><g><path d="M223.49351,192.90505c0,0 15.37471,-25.43046 18.61824,-28.21065c0,0 7.42396,-3.51778 14.59531,-2.06804c0,0 0.30978,8.3177 -1.28976,14.43664c0,0 -23.75717,19.61115 -26.02193,20.52265c0,0 -3.52537,-0.26784 -5.31028,-1.19203c0.0292,0.13837 -1.41041,-2.23176 -0.59159,-3.48855z" fill="#8644b3"/><path d="M256.59789,162.79393l-13.58605,10.96081c-1.81157,-3.44793 -0.87089,-8.92197 -0.87089,-8.92197c0,0 7.42396,-3.51778 14.45694,-2.03884z" fill="#ea8be5"/><path d="M256.59789,162.79393l-13.58605,10.96081c-1.81157,-3.44793 -0.87089,-8.92197 -0.87089,-8.92197c0,0 7.42396,-3.51778 14.45694,-2.03884z" fill="#ea8be5"/><path d="M254.75845,177.7079c-6.31572,-1.84708 -11.83038,-4.00775 -11.83038,-4.00775l13.66983,-10.90623c0.05459,-0.08379 0.13837,-0.0292 0.13837,-0.0292c0,0 0.30978,8.3177 -1.37355,14.38205c0,0 -0.10918,0.16757 -0.60428,0.56112z" fill="#ad59c2"/><path d="M242.95726,173.83853l-18.89756,22.77724c0,0 -1.30123,-2.39933 -0.53701,-3.57235c0,0 15.37471,-25.43046 18.61824,-28.21065z" fill="#ad59c2"/><path d="M242.92807,173.70015c0,0 -0.95719,1.28599 -2.43487,3.18769c-0.73884,0.95085 -1.67064,2.01469 -2.57325,3.2169c-0.98639,1.14762 -1.94358,2.43362 -2.92997,3.58124c-1.04098,1.23141 -2.08196,2.46282 -3.01376,3.52665c-0.98639,1.14762 -1.91819,2.21146 -2.60244,3.07852c-1.59066,1.70874 -2.63165,2.94014 -2.63165,2.94014c0,0 0.95719,-1.28599 2.43487,-3.18769c0.73884,-0.95085 1.67064,-2.01469 2.57325,-3.2169c0.98639,-1.14762 1.94358,-2.43362 2.92997,-3.58124c1.04098,-1.23141 2.08196,-2.46282 3.01376,-3.52665c0.98639,-1.14762 1.91819,-2.21146 2.60244,-3.07852c1.64525,-1.79253 2.63165,-2.94014 2.63165,-2.94014z" fill="#ea8be5"/><path d="M226.16706,193.93079l-2.13654,2.5466c0,0 -1.30123,-2.39933 -0.53701,-3.57235c0,0 1.50435,0.62205 2.67355,1.02574z" fill="#a546bd"/><path d="M229.34079,197.66942c0,0 -3.60916,-0.32244 -5.31028,-1.19203l2.13654,-2.5466c0.55731,0.24375 1.03083,0.4329 1.1984,0.54207c0.72488,0.35292 1.97534,3.19657 1.97534,3.19657z" fill="#7c36ab"/><path d="M224.1143,196.53198c0.86326,0.32372 1.7811,0.56364 2.61515,0.749c0.83405,0.18534 1.7227,0.2869 2.63673,0.1663l-0.13837,0.0292c1.59448,-1.34821 3.27274,-2.64181 4.95099,-3.93543c1.67826,-1.29361 3.27274,-2.64181 4.89641,-3.85165c3.35652,-2.58723 6.65846,-5.09067 10.04418,-7.53953c-3.18895,2.6964 -6.46169,5.33822 -9.81821,7.92545c-1.67826,1.29361 -3.35652,2.58723 -4.89641,3.85165c-1.67826,1.29361 -3.35652,2.58723 -4.9802,3.79706c-0.94323,-0.01777 -1.83187,-0.11933 -2.74972,-0.35926c-0.97243,-0.15614 -1.75189,-0.42528 -2.56056,-0.83277z" fill="#6b348f"/><path d="M242.05717,164.77818c0,0 4.07252,2.17589 6.92127,4.03187l-6.05037,4.8901c-1.6732,-3.47713 -0.87089,-8.92197 -0.87089,-8.92197z" fill="#e17de3"/><path d="M251.66342,170.91741c0.59031,0.74265 2.53645,3.80084 3.77929,5.92343c-0.05459,0.08379 -0.07997,0.30595 -0.13456,0.38973c0,0 -0.19296,0.11299 -0.54968,0.47733c-6.31572,-1.84708 -11.83038,-4.00775 -11.83038,-4.00775l6.05037,-4.8901c1.34059,0.8734 2.51359,1.63763 2.68498,2.10734z" fill="#9b4dae"/><path d="M254.81304,177.62411c0,0 -0.66648,-0.07616 -1.50054,-0.26152c-0.91785,-0.23993 -2.05784,-0.50525 -3.28163,-0.82516c-1.1692,-0.40369 -2.3384,-0.80739 -3.20165,-1.1311c-0.86326,-0.32372 -1.36597,-0.65125 -1.36597,-0.65125c0,0 0.08379,0.05459 0.38973,0.13456c0.30595,0.07997 0.61189,0.15995 1.08542,0.34911c0.91785,0.23993 2.00325,0.58904 3.22704,0.90895c1.1692,0.40369 2.39299,0.7236 3.25625,1.04732c0.83405,0.18534 1.39136,0.42909 1.39136,0.42909z" fill="#6b348f"/></g><path d="M256.59789,162.79393c0,0 -0.60428,0.56112 -1.51069,1.40279c-0.90641,0.84167 -2.19875,1.90932 -3.49109,2.97696c-1.29234,1.06765 -2.66846,2.0807 -3.74245,2.8132c-1.07399,0.7325 -1.76205,1.23903 -1.76205,1.23903c0,0 0.60428,-0.56112 1.51069,-1.40279c0.961,-0.92546 2.30793,-2.07689 3.54567,-3.06075c1.29234,-1.06765 2.66846,-2.0807 3.74245,-2.8132c0.9902,-0.78709 1.70746,-1.15524 1.70746,-1.15524z" fill="#ffbcfc"/></g></g></g></svg><!--rotationCenter:16.75869348767222:17.7240205896303-->