vincent.p.mercier/Kalulu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New back button system

Browse Source
This commit is contained in:
Adrien Ufferte
2026-03-02 10:06:58 +01:00
parent f9b139aa66
commit f79aa14ab4
28 changed files with 164 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/gardens/gardens.gd
+4 -13
View File
@@ -72,8 +72,7 @@ var is_back_button_hold_active: bool = false
@onready var minigame_selection: Control = %MinigameSelection
@onready var lesson_button: LessonButton = %LessonButton
@onready var lesson_button_particles: GPUParticles2D = %LessonButtonParticles
@onready var back_button: TextureButton = %BackButton
@onready var back_button_hold_ring: HoldProgressRing = %BackButtonHoldRing
@onready var back_button: BackButton = %BackButton
@onready var right_audio_stream_player: AudioStreamPlayer = $RightAudioStreamPlayer
@onready var left_audio_stream_player: AudioStreamPlayer = $LeftAudioStreamPlayer
@onready var feedback_audio_stream_player: AudioStreamPlayer = $FeedBackAudioStreamPlayer
@@ -802,7 +801,6 @@ static func _generate_lesson_positions(lessons_for_garden: int, garden_index: in
func _process(_delta: float) -> void:
_process_back_button_hold(_delta)
_update_back_button_hold_ring_transform()
locked_line.position.x = - scroll_container.scroll_horizontal
unlocked_line.position.x = - scroll_container.scroll_horizontal
parallax_background.scroll_offset.x = - scroll_container.scroll_horizontal
@@ -816,17 +814,12 @@ func _process_back_button_hold(delta: float) -> void:
return
back_button_hold_progress_seconds += delta
var progress_ratio: float = clampf(back_button_hold_progress_seconds / BACK_BUTTON_HOLD_DURATION_SECONDS, 0.0, 1.0)
back_button_hold_ring.progress_ratio = progress_ratio
back_button.set_hold_progress_ratio(progress_ratio)
if progress_ratio >= 1.0:
_cancel_back_button_hold()
_confirm_back_button_pressed()
func _update_back_button_hold_ring_transform() -> void:
var ring_padding: float = 24.0
back_button_hold_ring.position = back_button.position - Vector2.ONE * ring_padding
back_button_hold_ring.size = back_button.size + Vector2.ONE * ring_padding * 2.0
func _get_minigame_layouts() -> Array[MinigameLayout]:
return [minigame_layout_1, minigame_layout_2, minigame_layout_3]
@@ -1468,8 +1461,7 @@ func _on_back_button_button_down() -> void:
return
is_back_button_hold_active = true
back_button_hold_progress_seconds = 0.0
back_button_hold_ring.progress_ratio = 0.0
back_button_hold_ring.visible = true
back_button.begin_hold()
func _on_back_button_button_up() -> void:
@@ -1479,8 +1471,7 @@ func _on_back_button_button_up() -> void:
func _cancel_back_button_hold() -> void:
is_back_button_hold_active = false
back_button_hold_progress_seconds = 0.0
back_button_hold_ring.progress_ratio = 0.0
back_button_hold_ring.visible = false
back_button.cancel_hold()
func _on_area_2d_input_event(_viewport: Node, event: InputEvent, _shape_idx: int) -> void:
sources/gardens/gardens.tscn
+9 -20
View File
@@ -2,10 +2,7 @@
[ext_resource type="Script" uid="uid://djolw68efn6r5" path="res://sources/gardens/gardens.gd" id="1_qlsw4"]
[ext_resource type="Texture2D" uid="uid://jlwblk7lj7vi" path="res://assets/vfx/fx_10.png" id="3_xbvhu"]
[ext_resource type="Texture2D" uid="uid://wtx3wqs0l4si" path="res://assets/minigames/minigame_ui/graphic/button_back_up.png" id="4_neut5"]
[ext_resource type="Texture2D" uid="uid://cbhip35yyqneg" path="res://assets/minigames/minigame_ui/graphic/button_back_down.png" id="5_2yuxn"]
[ext_resource type="Texture2D" uid="uid://cq5wwf7y1msh7" path="res://assets/minigames/crabs/graphic/gauge_icon_crab_full.png" id="5_h8c5w"]
[ext_resource type="Texture2D" uid="uid://tcapan0mj64o" path="res://assets/minigames/minigame_ui/graphic/button_back_disabled.png" id="6_gs6gi"]
[ext_resource type="Texture2D" uid="uid://di2qcv6jw8wh0" path="res://assets/minigames/parakeets/graphic/gauge_icon_parakeet_full.png" id="6_hekq6"]
[ext_resource type="Texture2D" uid="uid://cq87j1xw4c31r" path="res://assets/minigames/jellyfish/graphic/gauge_icon_jellyfish_full.png" id="6_p30hm"]
[ext_resource type="Texture2D" uid="uid://cffuqacgb1jra" path="res://assets/lesson_screen/branches.png" id="7_axgdc"]
@@ -30,8 +27,10 @@
[ext_resource type="Texture2D" uid="uid://cqhbpt3lk6f15" path="res://assets/lesson_screen/bottom.png" id="25_tyvq6"]
[ext_resource type="AudioStream" uid="uid://dlxvbjp63w6wm" path="res://assets/look_and_learn/effect.wav" id="26_5g3l0"]
[ext_resource type="Script" uid="uid://ddew42fnpmsx1" path="res://sources/gardens/minigame_layout.gd" id="28_kvgph"]
[ext_resource type="Script" path="res://sources/ui/hold_progress_ring.gd" id="29_hold_ring"]
[ext_resource type="Shader" uid="uid://bnp4dxce44hcm" path="res://resources/shaders/outline_shader.gdshader" id="29_pew8x"]
[ext_resource type="PackedScene" uid="uid://cyoioissvrkj8" path="res://sources/ui/back_button.tscn" id="29_back_button"]
[ext_resource type="Texture2D" uid="uid://dj0ygi5q6kbdw" path="res://assets/minigames/minigame_ui/graphic/button_back_normal.png" id="29_cgp31"]
[ext_resource type="Texture2D" uid="uid://gmoc5mxxfqin" path="res://assets/minigames/minigame_ui/graphic/button_back_pressed.png" id="30_wnxkf"]
[ext_resource type="Texture2D" uid="uid://bnvx1mujmy3vf" path="res://assets/minigames/minigame_ui/graphic/button_back_disabled.png" id="31_b65yw"]
[ext_resource type="PackedScene" uid="uid://cn2rw06pltyiu" path="res://sources/utils/fx/right.tscn" id="33_5y3ye"]
[ext_resource type="Texture2D" uid="uid://iw84x6mx8h2g" path="res://assets/minigames/minigame_ui/graphic/button_kalulu_normal.png" id="41_xcos2"]
[ext_resource type="Texture2D" uid="uid://ub1dnysbojn8" path="res://assets/minigames/minigame_ui/graphic/button_kalulu_pressed.png" id="42_l35j3"]
@@ -418,28 +417,18 @@ texture = ExtResource("20_elp7t")
expand_mode = 1
stretch_mode = 5
[node name="BackButton" type="TextureButton" parent="CanvasLayer" unique_id=1838227918]
unique_name_in_owner = true
[node name="BackButton" parent="CanvasLayer" unique_id=1838227918 instance=ExtResource("29_back_button")]
custom_minimum_size = Vector2(275, 275)
offset_left = 50.0
offset_top = 50.0
offset_right = 300.0
offset_bottom = 300.0
size_flags_vertical = 0
texture_normal = ExtResource("4_neut5")
texture_pressed = ExtResource("5_2yuxn")
texture_disabled = ExtResource("6_gs6gi")
texture_normal = ExtResource("29_cgp31")
texture_pressed = ExtResource("30_wnxkf")
texture_disabled = ExtResource("31_b65yw")
stretch_mode = 4
[node name="BackButtonHoldRing" type="Control" parent="CanvasLayer" unique_id=418574918]
unique_name_in_owner = true
visible = false
offset_left = 26.0
offset_top = 26.0
offset_right = 324.0
offset_bottom = 324.0
mouse_filter = 2
script = ExtResource("29_hold_ring")
ring_padding = 24.0
[node name="KaluluButton" type="TextureButton" parent="CanvasLayer" unique_id=999341786]
unique_name_in_owner = true