From e40aef85f46264bba18db754c551af237fbb17de 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: Thu, 28 Aug 2025 21:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E4=BA=86=E5=BE=88=E5=A4=9Abug?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AFtrae=E5=8F=B8=E9=A9=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Bullets/Common/LaserCommoner.tscn | 6 ++++-- components/Characters/Hen.tscn | 2 +- scripts/Contents/Panels/MakeFeed.gd | 10 +++++++++- scripts/Contents/Wave.gd | 6 +++--- shaders/BigLaser1.gdshader | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/components/Bullets/Common/LaserCommoner.tscn b/components/Bullets/Common/LaserCommoner.tscn index ea97bed..f6c4f39 100644 --- a/components/Bullets/Common/LaserCommoner.tscn +++ b/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") diff --git a/components/Characters/Hen.tscn b/components/Characters/Hen.tscn index 27e0b3a..efb2dcb 100644 --- a/components/Characters/Hen.tscn +++ b/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") diff --git a/scripts/Contents/Panels/MakeFeed.gd b/scripts/Contents/Panels/MakeFeed.gd index 0569b1e..0007379 100644 --- a/scripts/Contents/Panels/MakeFeed.gd +++ b/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(): diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index 34541c0..b064424 100644 --- a/scripts/Contents/Wave.gd +++ b/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( diff --git a/shaders/BigLaser1.gdshader b/shaders/BigLaser1.gdshader index 7a24434..ea9110a 100644 --- a/shaders/BigLaser1.gdshader +++ b/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); }