diff --git a/Addons/SimpleNodes/MusicManager.gd b/Addons/SimpleNodes/MusicManager.gd index 3b74d03..e7d02b5 100644 --- a/Addons/SimpleNodes/MusicManager.gd +++ b/Addons/SimpleNodes/MusicManager.gd @@ -35,12 +35,14 @@ func change_music(new_music: String, crossfade_time: float = 0.0)->void: _Tween.interpolate_property( _Tracks[-1], "volume_db", _Tracks[-1].volume_db, 0, - crossfade_time + crossfade_time, + Tween.TRANS_CUBIC, Tween.EASE_IN ) _Tween.interpolate_property( _Tracks[0], "volume_db", _Tracks[0].volume_db, -80, - crossfade_time + crossfade_time, + Tween.TRANS_CUBIC, Tween.EASE_OUT ) _Tween.start() else: diff --git a/Scenes/Gameplay/Player.tscn b/Scenes/Gameplay/Player.tscn index 09bfc78..0f7b6e7 100644 --- a/Scenes/Gameplay/Player.tscn +++ b/Scenes/Gameplay/Player.tscn @@ -229,7 +229,7 @@ z_index = 1 texture = ExtResource( 10 ) hframes = 10 vframes = 9 -frame = 4 +frame = 3 [node name="Collider" type="CollisionShape2D" parent="."] position = Vector2( 0, 1 ) diff --git a/Scenes/Levels/Tutorial_1.tscn b/Scenes/Levels/Tutorial_1.tscn index a8e5f30..5c9146a 100644 --- a/Scenes/Levels/Tutorial_1.tscn +++ b/Scenes/Levels/Tutorial_1.tscn @@ -25,7 +25,7 @@ func _ready() -> void: func _on_Tips_goto_next_offset(offset_id:int) -> void: if offset_id == 0: - Global._Music.change_music(\"Part1_intro\", 0.0) + Global._Music.change_music(\"Part1_intro\", 0.2) Global._Music.queue_music(\"Part1_loop\") $AnimationPlayer.play(\"title_drop\",-1, 2.0) diff --git a/Scripts/UI/controls/ControlScreen.gd b/Scripts/UI/controls/ControlScreen.gd index b2b52c7..2d01f76 100644 --- a/Scripts/UI/controls/ControlScreen.gd +++ b/Scripts/UI/controls/ControlScreen.gd @@ -40,6 +40,10 @@ func _process(delta): # var vtrans = get_canvas_transform() # return -vtrans.get_origin() / vtrans.get_scale() +func _input(event: InputEvent) -> void: + if event.is_action_pressed("retrieve"): + retrieve_all() + func reparent(node: Node2D, target: Node): # Detach from old parent var source = node.get_parent() diff --git a/project.godot b/project.godot index cff39a4..dedf72e 100644 --- a/project.godot +++ b/project.godot @@ -144,6 +144,13 @@ jump={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) ] } +retrieve={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":4,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":5,"pressure":0.0,"pressed":false,"script":null) + ] +} [layer_names]