diff --git a/scene/effect/dizzy_shader.gd b/scene/effect/dizzy_shader.gd index e28bb3b1..d7999961 100644 --- a/scene/effect/dizzy_shader.gd +++ b/scene/effect/dizzy_shader.gd @@ -2,19 +2,21 @@ extends CanvasLayer @onready var rect = $ColorRect as ColorRect -var tween + +func _ready() -> void: + rect.material.set("shader_parameter/intensity", 0.0) -func dizzy(duration := 2.0): +var tween: Tween + + +func dizzy(duration := 3.5, intensity := 1.5): + if duration < 0.6: + return if tween and tween.is_valid(): tween.kill() show() tween = create_tween() - tween.tween_property(rect.material, "shader_parameter/intensity", 0.7, 0.2) - tween.tween_property(rect.material, "shader_parameter/intensity", 1.3, 0.2) - if duration > 0.0: - tween.set_loops(max(duration / 0.4, 1)) - else: - # infinite - tween.set_loops(10000) - tween.tween_callback(hide) + tween.tween_property(rect.material, "shader_parameter/intensity", intensity, 0.3) + tween.tween_interval(duration - 0.6) + tween.tween_property(rect.material, "shader_parameter/intensity", 0.0, 0.3) diff --git a/scene/effect/dizzy_shader.tscn b/scene/effect/dizzy_shader.tscn index 9e434d2c..9be782ac 100644 --- a/scene/effect/dizzy_shader.tscn +++ b/scene/effect/dizzy_shader.tscn @@ -7,14 +7,15 @@ [sub_resource type="ShaderMaterial" id="ShaderMaterial_iylo4"] shader = ExtResource("1_qpmt5") shader_parameter/intensity = 1.0 -shader_parameter/speed = 1.0 +shader_parameter/speed = 0.7 shader_parameter/samples = 4 -shader_parameter/angle_spread = 1.0 +shader_parameter/angle_spread = 2.0 [node name="DizzyShader" type="CanvasLayer"] script = ExtResource("1_t0l4c") [node name="TextureRect" type="TextureRect" parent="."] +visible = false anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -26,7 +27,6 @@ expand_mode = 1 stretch_mode = 5 [node name="ColorRect" type="ColorRect" parent="."] -visible = false material = SubResource("ShaderMaterial_iylo4") anchors_preset = 15 anchor_right = 1.0 diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index b08a7420..ef5c9a23 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -588,6 +588,7 @@ event = "c02_madman_interacted" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"] +process_mode = 1 position = Vector2(-2, -1) stream = ExtResource("6_jhod7") volume_db = 20.0 @@ -726,6 +727,7 @@ animation = &"霸凌1" autoplay = "霸凌1" [node name="Sfx2D霸凌童谣" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/霸凌/f1"] +process_mode = 1 stream = ExtResource("46_qqdxs") volume_db = -5.0 attenuation = 2.0 @@ -998,6 +1000,7 @@ animation = &"吕萍牵手动作" shape = SubResource("RectangleShape2D_vddfx") [node name="Sfx2D跑步" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/火灾/牵手跑"] +process_mode = 1 stream = SubResource("AudioStreamRandomizer_fxne6") volume_db = 3.0 bus = &"game_sfx" diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn index ec438a74..d24b556c 100644 --- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn @@ -355,6 +355,7 @@ event = "c02_madman_interacted" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"] +process_mode = 1 position = Vector2(-103, -11) stream = ExtResource("24_7mq0m") volume_db = 20.0 @@ -365,6 +366,7 @@ loop = true metadata/_custom_type_script = "uid://wapo47a1oddf" [node name="DizzyShader" parent="Ground/DeployLayer" index="19" instance=ExtResource("29_74b3r")] +layer = 0 visible = false [node name="MainPlayer" parent="Ground" index="5"]