From b030781caa04b32aa6442a26b8bcf05afc80123d 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, 7 Sep 2025 12:35:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(Wave):=20=E9=87=8D=E6=9E=84=E6=B3=A2?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E6=8D=AE=E4=B8=BA=E9=A2=84=E8=AE=BE=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将硬编码的波次数据改为可配置的预设字典，便于管理不同模式的波次配置
移除Rooster场景中未使用的武器资源
---
 components/Characters/Rooster.tscn |  5 +----
 scripts/Contents/Wave.gd           | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn
index 3f2c6ea..7739689 100644
--- a/components/Characters/Rooster.tscn
+++ b/components/Characters/Rooster.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3 uid="uid://bm7ymrri6pykb"]
+[gd_scene load_steps=17 format=3 uid="uid://bm7ymrri6pykb"]
 
 [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_e5pl8"]
 [ext_resource type="Script" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"]
@@ -13,7 +13,6 @@
 [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"]
 [ext_resource type="PackedScene" uid="uid://bb1uh8k7gkhr7" path="res://components/Weapons/VectorStar.tscn" id="6_fvy5n"]
 [ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"]
-[ext_resource type="PackedScene" uid="uid://ct2p0fbd5ktof" path="res://components/Weapons/Arrow7.tscn" id="7_jguvd"]
 [ext_resource type="AudioStream" uid="uid://b10u6iir6uvqn" path="res://resources/sounds/effect/BigLaser.wav" id="8_7dhim"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_4v2ol"]
@@ -59,8 +58,6 @@ debugRebuild = false
 [node name="BigLaser" parent="weaponStore" index="3" instance=ExtResource("4_plqwu")]
 debugRebuild = false
 
-[node name="WeaponCard" parent="weaponStore" index="4" instance=ExtResource("7_jguvd")]
-
 [node name="sprint" parent="sounds" index="0"]
 stream = ExtResource("4_66s6c")
 
diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd
index 286316c..3a06cd4 100644
--- a/scripts/Contents/Wave.gd
+++ b/scripts/Contents/Wave.gd
@@ -9,13 +9,19 @@ var to: float = 0
 var per: int = 0
 
 static var current: int = 0
-static var data: Array[Wave] = [
-	# entity, minCount, maxCount, isBoss, from, to, per
-	# create(preload("res://components/Characters/Hen.tscn"), 1, 5, false, 0, INF, 1),
-	# create(preload("res://components/Characters/Chick.tscn"), 0, 0, true, 8, INF, 6),
-	# create(preload("res://components/Characters/Chick.tscn"), 1, 1, true, 0, INF, 1),
-	create(preload("res://components/Characters/Bear.tscn"), 1, 1, true, 0, INF, 1),
-]
+# entity, minCount, maxCount, isBoss, from, to, per
+static var presetWaves = {
+	"normal": [
+		create(preload("res://components/Characters/Hen.tscn"), 1, 5, false, 0, INF, 1),
+		create(preload("res://components/Characters/Chick.tscn"), 0, 0, true, 9, INF, 15),
+		create(preload("res://components/Characters/Bear.tscn"), 0, 0, true, 19, INF, 10),
+	],
+	"testBoss": [
+		create(preload("res://components/Characters/Chick.tscn"), 1, 1, true, 0, INF, 1),
+		create(preload("res://components/Characters/Bear.tscn"), 1, 1, true, 0, INF, 1),
+	]
+}
+static var data = presetWaves["normal"]
 
 static func create(
 		entity_: PackedScene,