From 890931faa8a45fa8c75242c785a003289590153d Mon Sep 17 00:00:00 2001 From: VAILLANT Jeremy Date: Sat, 15 May 2021 17:17:12 +0200 Subject: [PATCH] Link back button to quit code main menu --- assets/props/column/sm_column.mesh | Bin 8180 -> 4635 bytes scenes/UI/UI_back.tscn | 1 + scenes/levels/levels.gd | 24 +----------------------- scenes/levels/warcraft/WarCraft.gd | 6 ++++-- scenes/levels/warcraft/WarCraft.tscn | 25 +++++-------------------- 5 files changed, 11 insertions(+), 45 deletions(-) diff --git a/assets/props/column/sm_column.mesh b/assets/props/column/sm_column.mesh index 40bf4d66b1c152acd93915cf2b38984a0ad314c6..26e3b95f20eb515f50b689400be0ab6c2402554d 100644 GIT binary patch literal 4635 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 R?KPhO2!Y~>oCZ=;Lqoo_LA?L~ literal 8180 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 J?!){3{{#F3+*beq diff --git a/scenes/UI/UI_back.tscn b/scenes/UI/UI_back.tscn index 16aa406..0a788b7 100644 --- a/scenes/UI/UI_back.tscn +++ b/scenes/UI/UI_back.tscn @@ -13,6 +13,7 @@ __meta__ = { [node name="TextureButton" type="TextureButton" parent="."] margin_right = 40.0 margin_bottom = 40.0 +mouse_default_cursor_shape = 2 texture_normal = ExtResource( 1 ) texture_hover = ExtResource( 2 ) texture_focused = ExtResource( 2 ) diff --git a/scenes/levels/levels.gd b/scenes/levels/levels.gd index 3035d9d..63d8dfa 100644 --- a/scenes/levels/levels.gd +++ b/scenes/levels/levels.gd @@ -18,15 +18,9 @@ func _ready(): _load_meshes() func _process(_delta): - _check_quit_scene() _check_dissolve_mesh() _check_change_angle_camera() -func _check_quit_scene(): - # Event key "escape" and "godot event" ui_end - if Input.is_action_just_pressed("ui_end"): - _confirm_before_quit() - func _check_dissolve_mesh(): # Event dissolve in object searched by gamer for key in meshes: @@ -109,29 +103,13 @@ func _gyroscope_changed_up(gyroscope): (gyroscope.abs().x - gyroscope_value_old.abs().x) > GYROSCOPE_MAX_DIFF and \ gyroscope.x < gyroscope_value_old.x -func _notification(what): - # Notification for android back action - if what == MainLoop.NOTIFICATION_WM_GO_BACK_REQUEST: - _confirm_before_quit() - -func _confirm_before_quit(): - $Dialog/ConfirmEscape.popup() - -# Back to main scene -func _quit_to_menu(): - Global.goto_scene("res://scenes/main.tscn") - func _start_dissolve(key): if meshes[key].lock() == false: meshes[key].set_lock(true) -func _on_ConfirmEscape_confirmed(): - _quit_to_menu() - ## PRIVATE func _load_translations(): - $Dialog/ConfirmEscape.set_title(tr("SCENE_WARCRAFT_DIALOG_QUIT_TITLE")) - $Dialog/ConfirmEscape.set_text(tr("SCENE_WARCRAFT_DIALOG_QUIT_QUESTION")) + pass func _load_meshes(): var scene_detail = null diff --git a/scenes/levels/warcraft/WarCraft.gd b/scenes/levels/warcraft/WarCraft.gd index 681b9fd..f2baa79 100644 --- a/scenes/levels/warcraft/WarCraft.gd +++ b/scenes/levels/warcraft/WarCraft.gd @@ -1,4 +1,6 @@ extends "res://scenes/levels/levels.gd" -func _ready(): - pass +# Back to main scene +func _on_TextureButton_pressed(): + print("[levels#_on_TextureButton_pressed] quit to menu") + Global.goto_scene("res://scenes/main.tscn") diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index bec94a6..f76ccce 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -544,23 +544,6 @@ use_in_baked_light = true mesh = ExtResource( 9 ) material/0 = null -[node name="Dialog" type="Control" parent="."] -margin_right = 40.0 -margin_bottom = 40.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="ConfirmEscape" type="ConfirmationDialog" parent="Dialog"] -visible = true -margin_right = 200.0 -margin_bottom = 70.0 -rect_min_size = Vector2( 400, 140 ) -window_title = "Veuillez confirmer…" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="sm_gabarit_male" type="MeshInstance" parent="."] transform = Transform( 0.534795, 0, 0.844982, 0, 1, 0, -0.844982, 0, 0.534795, -4.02751, 0.0561329, -0.889434 ) mesh = ExtResource( 20 ) @@ -754,8 +737,10 @@ collision_mask = 2 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 ) shape = SubResource( 18 ) -[node name="Control" parent="." instance=ExtResource( 44 )] +[node name="ListObjects" parent="." instance=ExtResource( 44 )] -[node name="Control2" parent="." instance=ExtResource( 45 )] +[node name="Quit" parent="." instance=ExtResource( 45 )] -[connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"] +[connection signal="pressed" from="Quit/TextureButton" to="." method="_on_TextureButton_pressed"] + +[editable path="Quit"]