All audio stuff moved to audio autoload and removed game.tscn in favor of just game.gd
This commit is contained in:
parent
30cfad6e7e
commit
e1a30188a6
21 changed files with 134 additions and 97 deletions
|
@ -33,7 +33,7 @@ export var target_time_any = 0
|
|||
func _ready():
|
||||
Game.fade.fade_in(0.000000000000001)
|
||||
change_current_level(Game.current_level)
|
||||
Game.ac_music.stop()
|
||||
Audio.ac_music.stop()
|
||||
|
||||
func _physics_process(delta):
|
||||
if Input.is_action_just_pressed("ui_up"): change_current_level(-1)
|
||||
|
|
|
@ -14,7 +14,7 @@ func _ready():
|
|||
Game.fade.fade_in(0.4)
|
||||
Game.fade.connect("fade_finished", get_tree(), "set_pause", [false], CONNECT_ONESHOT)
|
||||
Game.fade.connect("fade_finished", Game, "set", ["can_pause", true], CONNECT_ONESHOT)
|
||||
Game.play_music(music)
|
||||
Audio.play_music(music)
|
||||
|
||||
func _physics_process(delta):
|
||||
if Game.golds == 50 && Game.shards == 5:
|
||||
|
|
|
@ -169,7 +169,6 @@ material = SubResource( 4 )
|
|||
position = Vector2( 120, 168 )
|
||||
z_index = -3
|
||||
frames = SubResource( 5 )
|
||||
frame = 1
|
||||
playing = true
|
||||
|
||||
[node name="SawTest4" type="AnimatedSprite" parent="."]
|
||||
|
@ -177,6 +176,7 @@ material = SubResource( 4 )
|
|||
position = Vector2( 160, 168 )
|
||||
z_index = -3
|
||||
frames = SubResource( 5 )
|
||||
frame = 1
|
||||
playing = true
|
||||
|
||||
[node name="SawTest5" type="AnimatedSprite" parent="."]
|
||||
|
@ -184,6 +184,7 @@ material = SubResource( 4 )
|
|||
position = Vector2( 56, 176 )
|
||||
z_index = -3
|
||||
frames = SubResource( 5 )
|
||||
frame = 1
|
||||
playing = true
|
||||
|
||||
[node name="RollingFiend" parent="." instance=ExtResource( 22 )]
|
||||
|
@ -191,14 +192,12 @@ position = Vector2( 48, 120 )
|
|||
|
||||
[node name="AnimatedSprite" parent="RollingFiend" index="0"]
|
||||
visible = false
|
||||
frame = 0
|
||||
|
||||
[node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"]
|
||||
material = SubResource( 4 )
|
||||
position = Vector2( 4, 4 )
|
||||
z_index = -3
|
||||
frames = SubResource( 5 )
|
||||
frame = 1
|
||||
playing = true
|
||||
|
||||
[editable path="RollingFiend"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue