polish high score/score submit stuff
This commit is contained in:
parent
ba836830d2
commit
93656bdcfa
2 changed files with 123 additions and 99 deletions
|
|
@ -65,24 +65,32 @@ func show_final_score():
|
|||
|
||||
|
||||
func _on_AnimationPlayer_animation_finished(anim_name):
|
||||
if anim_name != "results":
|
||||
return
|
||||
|
||||
if Game.marathon_mode:
|
||||
Game.current_level += 1
|
||||
if Game.current_level > LevelData.marathon_end:
|
||||
Fade.fade_out(Options.transition_speed_secs)
|
||||
yield(Fade, "fade_finished")
|
||||
SceneManager.change_scene(load("res://menus/marathon_results.tscn").instance())
|
||||
else:
|
||||
Game.change_map(LevelData.levels[Game.current_level].scene)
|
||||
return
|
||||
if Game.final_score > Game.old_high_score and not Debug.is_cheating and not ScoreBoard.server_host.empty():
|
||||
animation_player.play("submit_score_popup")
|
||||
else:
|
||||
Fade.fade_out(Options.transition_speed_secs)
|
||||
yield(Fade, "fade_finished")
|
||||
SceneManager.change_scene(LevelSelect.instance())
|
||||
match anim_name:
|
||||
"results":
|
||||
if Game.marathon_mode:
|
||||
Game.current_level += 1
|
||||
if Game.current_level > LevelData.marathon_end:
|
||||
yield(get_tree().create_timer(6.0), "timeout")
|
||||
Fade.fade_out(Options.transition_speed_secs)
|
||||
yield(Fade, "fade_finished")
|
||||
SceneManager.change_scene(load("res://menus/marathon_results.tscn").instance())
|
||||
else:
|
||||
Game.change_map(LevelData.levels[Game.current_level].scene)
|
||||
elif Game.final_score > Game.old_high_score:
|
||||
animation_player.play("high_score")
|
||||
else:
|
||||
yield(get_tree().create_timer(6.0), "timeout")
|
||||
Fade.fade_out(Options.transition_speed_secs)
|
||||
yield(Fade, "fade_finished")
|
||||
SceneManager.change_scene(LevelSelect.instance())
|
||||
"high_score":
|
||||
if not Debug.is_cheating and not ScoreBoard.server_host.empty():
|
||||
animation_player.play("submit_score_popup")
|
||||
else:
|
||||
yield(get_tree().create_timer(5.0), "timeout")
|
||||
Fade.fade_out(Options.transition_speed_secs)
|
||||
yield(Fade, "fade_finished")
|
||||
SceneManager.change_scene(LevelSelect.instance())
|
||||
|
||||
|
||||
func _on_YesSubmit_button_down() -> void:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=35 format=2]
|
||||
[gd_scene load_steps=36 format=2]
|
||||
|
||||
[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=1]
|
||||
[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=2]
|
||||
|
|
@ -279,9 +279,72 @@ tracks/16/keys = {
|
|||
"values": [ "submit score?" ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=19]
|
||||
resource_name = "high_score"
|
||||
tracks/0/type = "value"
|
||||
tracks/0/path = NodePath("ShardsAndBonuses:position")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 0,
|
||||
"values": [ Vector2( -512, 0 ) ]
|
||||
}
|
||||
tracks/1/type = "value"
|
||||
tracks/1/path = NodePath("ShardsAndBonuses/FinalScore:visible")
|
||||
tracks/1/interp = 1
|
||||
tracks/1/loop_wrap = true
|
||||
tracks/1/imported = false
|
||||
tracks/1/enabled = true
|
||||
tracks/1/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 1,
|
||||
"values": [ true ]
|
||||
}
|
||||
tracks/2/type = "value"
|
||||
tracks/2/path = NodePath("ShardsAndBonuses/HighScore:visible")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/keys = {
|
||||
"times": PoolRealArray( 0, 0.3 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
tracks/3/type = "value"
|
||||
tracks/3/path = NodePath("ShardsAndBonuses/FinalScore:scale")
|
||||
tracks/3/interp = 1
|
||||
tracks/3/loop_wrap = true
|
||||
tracks/3/imported = false
|
||||
tracks/3/enabled = true
|
||||
tracks/3/keys = {
|
||||
"times": PoolRealArray( 0, 0.3 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ) ]
|
||||
}
|
||||
tracks/4/type = "value"
|
||||
tracks/4/path = NodePath("ShardsAndBonuses/HighScore:scale")
|
||||
tracks/4/interp = 1
|
||||
tracks/4/loop_wrap = true
|
||||
tracks/4/imported = false
|
||||
tracks/4/enabled = true
|
||||
tracks/4/keys = {
|
||||
"times": PoolRealArray( 0, 0.3, 0.6 ),
|
||||
"transitions": PoolRealArray( 1, 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=4]
|
||||
resource_name = "results"
|
||||
length = 24.0
|
||||
length = 18.0
|
||||
step = 1.0
|
||||
tracks/0/type = "method"
|
||||
tracks/0/path = NodePath("ShardsAndBonuses/Shards/ResultsIcon")
|
||||
|
|
@ -550,7 +613,7 @@ tracks/0/keys = {
|
|||
"values": [ Vector2( -512, 0 ) ]
|
||||
}
|
||||
tracks/1/type = "value"
|
||||
tracks/1/path = NodePath("ShardsAndBonuses/FinalScore:visible")
|
||||
tracks/1/path = NodePath("CenterContainer/SubmitScore:visible")
|
||||
tracks/1/interp = 1
|
||||
tracks/1/loop_wrap = true
|
||||
tracks/1/imported = false
|
||||
|
|
@ -562,7 +625,7 @@ tracks/1/keys = {
|
|||
"values": [ true ]
|
||||
}
|
||||
tracks/2/type = "value"
|
||||
tracks/2/path = NodePath("ShardsAndBonuses/HighScore:visible")
|
||||
tracks/2/path = NodePath("CenterContainer/SubmitScore:rect_scale")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/imported = false
|
||||
|
|
@ -570,102 +633,54 @@ tracks/2/enabled = true
|
|||
tracks/2/keys = {
|
||||
"times": PoolRealArray( 0, 0.3 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
"update": 0,
|
||||
"values": [ Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ]
|
||||
}
|
||||
tracks/3/type = "value"
|
||||
tracks/3/path = NodePath("ShardsAndBonuses/FinalScore:scale")
|
||||
tracks/3/type = "method"
|
||||
tracks/3/path = NodePath("CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit")
|
||||
tracks/3/interp = 1
|
||||
tracks/3/loop_wrap = true
|
||||
tracks/3/imported = false
|
||||
tracks/3/enabled = true
|
||||
tracks/3/keys = {
|
||||
"times": PoolRealArray( 0, 0.3 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ) ]
|
||||
}
|
||||
tracks/4/type = "value"
|
||||
tracks/4/path = NodePath("ShardsAndBonuses/HighScore:scale")
|
||||
tracks/4/interp = 1
|
||||
tracks/4/loop_wrap = true
|
||||
tracks/4/imported = false
|
||||
tracks/4/enabled = true
|
||||
tracks/4/keys = {
|
||||
"times": PoolRealArray( 0, 0.3, 0.6 ),
|
||||
"transitions": PoolRealArray( 1, 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ]
|
||||
}
|
||||
tracks/5/type = "value"
|
||||
tracks/5/path = NodePath("CenterContainer/SubmitScore:visible")
|
||||
tracks/5/interp = 1
|
||||
tracks/5/loop_wrap = true
|
||||
tracks/5/imported = false
|
||||
tracks/5/enabled = true
|
||||
tracks/5/keys = {
|
||||
"times": PoolRealArray( 0, 1 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
tracks/6/type = "value"
|
||||
tracks/6/path = NodePath("CenterContainer/SubmitScore:rect_scale")
|
||||
tracks/6/interp = 1
|
||||
tracks/6/loop_wrap = true
|
||||
tracks/6/imported = false
|
||||
tracks/6/enabled = true
|
||||
tracks/6/keys = {
|
||||
"times": PoolRealArray( 0, 1, 1.3 ),
|
||||
"transitions": PoolRealArray( 1, 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ Vector2( 1e-05, 1 ), Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ]
|
||||
}
|
||||
tracks/7/type = "method"
|
||||
tracks/7/path = NodePath("CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit")
|
||||
tracks/7/interp = 1
|
||||
tracks/7/loop_wrap = true
|
||||
tracks/7/imported = false
|
||||
tracks/7/enabled = true
|
||||
tracks/7/keys = {
|
||||
"times": PoolRealArray( 1.5 ),
|
||||
"times": PoolRealArray( 0.5 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"values": [ {
|
||||
"args": [ ],
|
||||
"method": "grab_focus"
|
||||
} ]
|
||||
}
|
||||
tracks/8/type = "value"
|
||||
tracks/8/path = NodePath("CenterContainer/SubmitScore:modulate")
|
||||
tracks/8/interp = 1
|
||||
tracks/8/loop_wrap = true
|
||||
tracks/8/imported = false
|
||||
tracks/8/enabled = true
|
||||
tracks/8/keys = {
|
||||
"times": PoolRealArray( 1, 1.056 ),
|
||||
tracks/4/type = "value"
|
||||
tracks/4/path = NodePath("CenterContainer/SubmitScore:modulate")
|
||||
tracks/4/interp = 1
|
||||
tracks/4/loop_wrap = true
|
||||
tracks/4/imported = false
|
||||
tracks/4/enabled = true
|
||||
tracks/4/keys = {
|
||||
"times": PoolRealArray( 0, 0.1 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
|
||||
}
|
||||
tracks/9/type = "value"
|
||||
tracks/9/path = NodePath("CenterContainer/LoadingGraphic:visible")
|
||||
tracks/9/interp = 1
|
||||
tracks/9/loop_wrap = true
|
||||
tracks/9/imported = false
|
||||
tracks/9/enabled = true
|
||||
tracks/9/keys = {
|
||||
tracks/5/type = "value"
|
||||
tracks/5/path = NodePath("CenterContainer/LoadingGraphic:visible")
|
||||
tracks/5/interp = 1
|
||||
tracks/5/loop_wrap = true
|
||||
tracks/5/imported = false
|
||||
tracks/5/enabled = true
|
||||
tracks/5/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 1,
|
||||
"values": [ false ]
|
||||
}
|
||||
tracks/10/type = "value"
|
||||
tracks/10/path = NodePath("CenterContainer/SubmitScore/Label:text")
|
||||
tracks/10/interp = 1
|
||||
tracks/10/loop_wrap = true
|
||||
tracks/10/imported = false
|
||||
tracks/10/enabled = true
|
||||
tracks/10/keys = {
|
||||
tracks/6/type = "value"
|
||||
tracks/6/path = NodePath("CenterContainer/SubmitScore/Label:text")
|
||||
tracks/6/interp = 1
|
||||
tracks/6/loop_wrap = true
|
||||
tracks/6/imported = false
|
||||
tracks/6/enabled = true
|
||||
tracks/6/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 1,
|
||||
|
|
@ -1114,9 +1129,9 @@ valign = 1
|
|||
unique_name_in_owner = true
|
||||
visible = false
|
||||
margin_left = 82.0
|
||||
margin_top = 47.0
|
||||
margin_top = 39.0
|
||||
margin_right = 173.0
|
||||
margin_bottom = 67.0
|
||||
margin_bottom = 75.0
|
||||
rect_pivot_offset = Vector2( 45.5, 18 )
|
||||
theme = ExtResource( 10 )
|
||||
|
||||
|
|
@ -1205,6 +1220,7 @@ texture = ExtResource( 4 )
|
|||
autoplay = "results"
|
||||
playback_speed = 2.0
|
||||
anims/RESET = SubResource( 10 )
|
||||
anims/high_score = SubResource( 19 )
|
||||
anims/results = SubResource( 4 )
|
||||
anims/submit = SubResource( 15 )
|
||||
anims/submit_score_popup = SubResource( 12 )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue