fix: test manual scroll enable on draven and voice

This commit is contained in:
tiger tiger tiger 2026-01-12 21:49:17 +01:00
parent a91830d28b
commit d29b1d8e78
4 changed files with 26 additions and 12 deletions

View File

@ -496,7 +496,6 @@ custom_minimum_size = Vector2(0, 700)
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 2 size_flags_vertical = 2
mouse_filter = 2
horizontal_scroll_mode = 0 horizontal_scroll_mode = 0
vertical_scroll_mode = 3 vertical_scroll_mode = 3

View File

@ -664,7 +664,6 @@ script = ExtResource("1_543ki")
scene_id = 2 scene_id = 2
story_array = PackedStringArray("My secret comic stash. I remember playing Clue-Men with the boys.", "I had a voice for every character in that comic. But more often than not I played him: Agent Q.", "Going under the radar, putting in precise work to save the world.", "Not having to deal with being a girl.", "Boys were so much easier. They like cars, bikes, guns and agents.", "They don\'t talk behind your back. They don\'t think everything is about relationships.", "Girls don\'t get that. I knew they talked behind my back about me only “pretending” to like boy stuff, so Id get laid ", "… I mean, maybe they were right?", "Like I won\'t deny I was probably the first girl in my class to see a dick.", "But like - thats what the boys do, right?", "At least it has gotten better after me and Jojo became friends.", "I still remember how that happend. I did a voice acting workshop in art class.", "Being allowed to share my technique in front of everyone was just :D", "I mean next to nobody put in any effort. But Jojo did.", "When our Mr Funny then decided to ape her attempts instead of just minding his own, I pretty much exploded.", "After this, we suddenly were besties. And my class finally started to just leave me be. ", "Maybe because I for once was friends with another girl. Maybe because I scared them. Maybe both.") story_array = PackedStringArray("My secret comic stash. I remember playing Clue-Men with the boys.", "I had a voice for every character in that comic. But more often than not I played him: Agent Q.", "Going under the radar, putting in precise work to save the world.", "Not having to deal with being a girl.", "Boys were so much easier. They like cars, bikes, guns and agents.", "They don\'t talk behind your back. They don\'t think everything is about relationships.", "Girls don\'t get that. I knew they talked behind my back about me only “pretending” to like boy stuff, so Id get laid ", "… I mean, maybe they were right?", "Like I won\'t deny I was probably the first girl in my class to see a dick.", "But like - thats what the boys do, right?", "At least it has gotten better after me and Jojo became friends.", "I still remember how that happend. I did a voice acting workshop in art class.", "Being allowed to share my technique in front of everyone was just :D", "I mean next to nobody put in any effort. But Jojo did.", "When our Mr Funny then decided to ape her attempts instead of just minding his own, I pretty much exploded.", "After this, we suddenly were besties. And my class finally started to just leave me be. ", "Maybe because I for once was friends with another girl. Maybe because I scared them. Maybe both.")
paragraph_lengths = PackedInt32Array(1, 2, 5, 7, 9, 10, 13, 14, 16) paragraph_lengths = PackedInt32Array(1, 2, 5, 7, 9, 10, 13, 14, 16)
progress = 17.0
[node name="PanelContainer" type="PanelContainer" parent="."] [node name="PanelContainer" type="PanelContainer" parent="."]
layout_mode = 2 layout_mode = 2
@ -725,12 +724,12 @@ render_target_update_mode = 3
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.21953, 3.52719, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.21953, 3.52719, 0)
[node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] [node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"]
transform = Transform3D(-0.09237667, -0.0774974, -0.992704, 0.085104756, 0.99270386, -0.08541691, 0.992081, -0.092374295, -0.08510727, -0.045, -0.111, 0.033) transform = Transform3D(-0.09237667, -0.0774974, -0.992704, 0.085104756, 0.9927038, -0.08541691, 0.992081, -0.092374295, -0.08510727, -0.045, -0.111, 0.033)
mesh = ExtResource("3_ho85h") mesh = ExtResource("3_ho85h")
skeleton = NodePath("../..") skeleton = NodePath("../..")
[node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] [node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"]
transform = Transform3D(-0.4210099, 0.12640646, -0.7739451, 0.15260528, 0.7853271, 0.07756861, 0.78067994, -0.08534441, -0.4325408, 0.02, -0.055, -0.02) transform = Transform3D(-0.4210099, 0.12640648, -0.7739451, 0.15260528, 0.78532714, 0.07756861, 0.78067994, -0.08534441, -0.4325408, 0.02, -0.055, -0.02)
mesh = ExtResource("4_kn83e") mesh = ExtResource("4_kn83e")
skeleton = NodePath("../..") skeleton = NodePath("../..")
@ -777,7 +776,6 @@ custom_minimum_size = Vector2(0, 700)
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 2 size_flags_vertical = 2
mouse_filter = 2
horizontal_scroll_mode = 0 horizontal_scroll_mode = 0
vertical_scroll_mode = 3 vertical_scroll_mode = 3

View File

@ -35,7 +35,7 @@ var aborted
var is_auto_proceeding: bool = false: var is_auto_proceeding: bool = false:
set(value): set(value):
if is_auto_proceeding and not value: if is_auto_proceeding and not value:
var tween = get_tree().create_tween() var tween := get_tree().create_tween()
tween.set_ease(Tween.EASE_IN) tween.set_ease(Tween.EASE_IN)
tween.set_trans(Tween.TRANS_QUAD) tween.set_trans(Tween.TRANS_QUAD)
tween.tween_property(progress, "value", 0.0, 0.3) tween.tween_property(progress, "value", 0.0, 0.3)
@ -112,12 +112,27 @@ func _input(event: InputEvent) -> void:
aborted = true aborted = true
get_viewport().set_input_as_handled() get_viewport().set_input_as_handled()
func _on_skip_button_button_up():
if not is_auto_proceeding:
pressed = false
time_pressed = 0
progress.value = 0
func _on_skip_button_button_down():
if not (is_auto_proceeding):
pressed = true
if not aborted and is_auto_proceeding:
pressed = false
time_pressed = 0
is_auto_proceeding = false
aborted = true
func _on_skip_button_toggled(button_pressed): func _on_skip_button_toggled(button_pressed):
if button_pressed: if button_pressed:
pressed = true pressed = true
else:
pressed = false
time_pressed = 0
func start_proceed_countdown(): func start_proceed_countdown():
text_revealed = true text_revealed = true

View File

@ -17,12 +17,12 @@ corner_radius_bottom_left = 5
expand_margin_top = 5.0 expand_margin_top = 5.0
expand_margin_bottom = 5.0 expand_margin_bottom = 5.0
[sub_resource type="InputEventKey" id="InputEventKey_7em4l"] [sub_resource type="InputEventKey" id="InputEventKey_4wxxu"]
device = -1 device = -1
physical_keycode = 88 physical_keycode = 88
unicode = 120 unicode = 120
[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_hb4jw"] [sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_qghsb"]
device = -1 device = -1
button_index = 2 button_index = 2
pressed = true pressed = true
@ -296,11 +296,13 @@ stretch_mode = 5
script = ExtResource("2_ev8gx") script = ExtResource("2_ev8gx")
action = "skip" action = "skip"
icon = 0 icon = 0
events = Array[InputEvent]([null, SubResource("InputEventKey_7em4l"), SubResource("InputEventJoypadButton_hb4jw")]) events = Array[InputEvent]([null, SubResource("InputEventKey_4wxxu"), SubResource("InputEventJoypadButton_qghsb")])
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {
&"": SubResource("AnimationLibrary_f8gbl") &"": SubResource("AnimationLibrary_f8gbl")
} }
[connection signal="button_down" from="SkipButton" to="." method="_on_skip_button_button_down"]
[connection signal="button_up" from="SkipButton" to="." method="_on_skip_button_button_up"]
[connection signal="toggled" from="SkipButton" to="." method="_on_skip_button_toggled"] [connection signal="toggled" from="SkipButton" to="." method="_on_skip_button_toggled"]