prevent sticky animation being picked skipped by card animation completing
This commit is contained in:
parent
c1eecd8980
commit
089a849883
|
|
@ -67,6 +67,7 @@ func _ready():
|
||||||
reset()
|
reset()
|
||||||
|
|
||||||
func reset():
|
func reset():
|
||||||
|
card_anim_skipped = false
|
||||||
output = []
|
output = []
|
||||||
options = []
|
options = []
|
||||||
anim_players = []
|
anim_players = []
|
||||||
|
|
@ -113,6 +114,7 @@ func fill_post_slots():
|
||||||
var picked_player: AnimationPlayer
|
var picked_player: AnimationPlayer
|
||||||
var random_player: AnimationPlayer
|
var random_player: AnimationPlayer
|
||||||
|
|
||||||
|
var card_anim_skipped:bool = false
|
||||||
func _input(event):
|
func _input(event):
|
||||||
#if event.is_action_pressed("ui_end"):
|
#if event.is_action_pressed("ui_end"):
|
||||||
# fill_card_slots(3)
|
# fill_card_slots(3)
|
||||||
|
|
@ -134,6 +136,7 @@ func _input(event):
|
||||||
for player in anim_players:
|
for player in anim_players:
|
||||||
player.advance(10.0)
|
player.advance(10.0)
|
||||||
transition()
|
transition()
|
||||||
|
card_anim_skipped = true
|
||||||
show_posts()
|
show_posts()
|
||||||
elif selection_state == POSTS_SELECTED:
|
elif selection_state == POSTS_SELECTED:
|
||||||
for player:AnimationPlayer in anim_players + [picked_player, random_player]:
|
for player:AnimationPlayer in anim_players + [picked_player, random_player]:
|
||||||
|
|
@ -194,7 +197,7 @@ func pick(id: int):
|
||||||
anim.play("unshuffle")
|
anim.play("unshuffle")
|
||||||
|
|
||||||
await yield_to
|
await yield_to
|
||||||
transition()
|
if not card_anim_skipped: transition()
|
||||||
|
|
||||||
func transition():
|
func transition():
|
||||||
if selection_state == CARDS_SELECTED:
|
if selection_state == CARDS_SELECTED:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue