diff --git a/src/base-environments/youth_room/Collectable.gd b/src/base-environments/youth_room/Collectable.gd index afe47ec..872200d 100644 --- a/src/base-environments/youth_room/Collectable.gd +++ b/src/base-environments/youth_room/Collectable.gd @@ -13,7 +13,8 @@ var revealed: bool = false: else: ui.vanish() await get_tree().create_timer(1).timeout - wrapper.hide() + if not ui.visible: + wrapper.hide() var has_mouse: bool = false diff --git a/src/logic-scenes/collectable/new_collectable_ui.gd b/src/logic-scenes/collectable/new_collectable_ui.gd index ecbf48c..ca67787 100644 --- a/src/logic-scenes/collectable/new_collectable_ui.gd +++ b/src/logic-scenes/collectable/new_collectable_ui.gd @@ -180,7 +180,7 @@ func update_state(): func try_reveal() -> bool: if is_exit and not State.active_save_game.is_childhood_board_complete: return false - if not visible: + if not visible or animation_player.get_animation("vanish") or animation_player.get_animation("vanish_all"): update_state() visible = true animation_player.play("reveal") diff --git a/src/logic-scenes/collectable/new_collectable_ui.tscn b/src/logic-scenes/collectable/new_collectable_ui.tscn index ce92ede..8c17697 100644 --- a/src/logic-scenes/collectable/new_collectable_ui.tscn +++ b/src/logic-scenes/collectable/new_collectable_ui.tscn @@ -538,10 +538,10 @@ tracks/6/path = NodePath(".:visible") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 0.6), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [true] +"values": [true, true] } tracks/7/type = "value" tracks/7/imported = false