修了很多bug，但是trae司马

components/Bullets/Common/LaserCommoner.tscn

@@ -11,7 +11,7 @@
 shader = ExtResource("3_km2v1")
 shader_parameter/laser_color = Color(1, 0, 0, 1)
 shader_parameter/width = 1.0
-shader_parameter/softness = 0.237
+shader_parameter/softness = 0.2
 shader_parameter/wave_speed = 2.0
 shader_parameter/wave_frequency = 13.154
 shader_parameter/wave_amplitude = 1.151
@@ -229,8 +229,9 @@ sprite_frames = SubResource("SpriteFrames_yip5k")
 [node name="rect" type="ColorRect" parent="texture" index="0"]
 material = SubResource("ShaderMaterial_b2oy8")
 offset_left = 233.0
+offset_top = 50.0
 offset_right = 333.0
-offset_bottom = 2000.0
+offset_bottom = 2050.0
 rotation = -1.5708
 scale = Vector2(1e-05, 1)
 
@@ -258,6 +259,7 @@ scale = Vector2(1e-05, 1e-05)
 texture = ExtResource("4_rs8hf")
 
 [node name="hitbox" parent="." index="1"]
+visible = false
 position = Vector2(1234, 0)
 rotation = 1.5708
 shape = SubResource("CapsuleShape2D_x66th")

components/Characters/Hen.tscn

@@ -35,7 +35,7 @@ radius = 40.0
 script = ExtResource("2_8u5a0")
 cooldownUnit = 1000.0
 drops = Array[int]([0, 1])
-dropCounts = Array[Vector2]([Vector2(6, 12), Vector2(3, 8)])
+dropCounts = Array[Vector2]([Vector2(3, 6), Vector2(1, 4)])
 
 [node name="hurt" parent="sounds" index="3"]
 stream = ExtResource("3_ojyt7")

scripts/Contents/Panels/MakeFeed.gd

@@ -28,7 +28,15 @@ func _ready():
 		if feedScene.get_extension() == "remap":
 			feedScene = feedScene.substr(0, len(feedScene) - 6)
 		print("正在从 %s 加载饲料卡" % feedScene)
-		var feed = load(feedScene).instantiate()
+		var feed = load(feedScene).instantiate() as Feed
+		feed.selected.connect(
+			func(applied: bool):
+				if applied:
+					selectedCount += 1
+					updateValue()
+					if selectedCount >= UIState.player.fields[FieldStore.Entity.FEED_COUNT_CAN_MADE]:
+						finish()
+		)
 		avaliableFeeds.add_child(feed)
 
 func beforeOpen():

scripts/Contents/Wave.gd

@@ -11,9 +11,9 @@ 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, 5),
-	create(preload("res://components/Characters/Chick.tscn"), 0, 0, true, 1, INF, 1000000)
+	# 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, 5),
+	create(preload("res://components/Characters/Chick.tscn"), 0, 0, true, 0, INF, 1000000)
 ]
 
 static func create(

shaders/BigLaser1.gdshader

@@ -41,5 +41,5 @@ void fragment() {
     vec3 color = base_color + vec3(wave_intensity);
     
     // 设置最终颜色（加法混合模式会忽略alpha）
-    COLOR = vec4(color, 0.5-x_dist);
+    COLOR = vec4(color, (0.5-x_dist)*2.0);
 }