fix: bootup problems resolved.
This commit is contained in:
parent
80eb4a727f
commit
99632f6043
|
|
@ -29,6 +29,8 @@ func get_ready():
|
|||
pass
|
||||
|
||||
func play() -> String:
|
||||
for i in range(20):
|
||||
await get_tree().process_frame
|
||||
await get_ready()
|
||||
await start_room()
|
||||
var next_room : StringName = await proceed
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -16,9 +16,6 @@ func _ready():
|
|||
elif item is StickyNote:
|
||||
spawn_sticky_note((item as StickyNote).duplicate())
|
||||
|
||||
func _process(delta: float):
|
||||
pass
|
||||
|
||||
func spawn_card(card: Card):
|
||||
$cards.add_child(card)
|
||||
|
||||
|
|
|
|||
|
|
@ -70,10 +70,6 @@ func _navigate_prev():
|
|||
func _ready() -> void:
|
||||
print("CardBoard.gd: %s._ready()" % self.name)
|
||||
super._ready()
|
||||
# HACK: Lets us debug more easily
|
||||
if get_parent() == get_tree().root:
|
||||
_debug_mode()
|
||||
return
|
||||
|
||||
print("Board Ready!", self, "room", State.room)
|
||||
State.room.card_board = self
|
||||
|
|
|
|||
|
|
@ -230,4 +230,3 @@ func pick_cards(id: Scenes.id):
|
|||
|
||||
await cards_picked
|
||||
hide()
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,11 @@ var tween: Tween = null
|
|||
|
||||
func _ready() -> void:
|
||||
assert(note and frame and canvas_layer, "Interactable must have views and frame attached")
|
||||
|
||||
if interaction:
|
||||
playable = interaction.instantiate() as Control
|
||||
canvas_layer.add_child(playable)
|
||||
|
||||
view.scale = Vector3.ZERO
|
||||
frame.modulate.a = 0.0
|
||||
light.visible = false
|
||||
|
|
@ -39,9 +44,6 @@ func _ready() -> void:
|
|||
|
||||
## To be called by room
|
||||
func pull_save_state() -> void:
|
||||
if interaction:
|
||||
playable = interaction.instantiate() as Control
|
||||
canvas_layer.add_child(playable)
|
||||
_update_caption()
|
||||
# Check if this scene was already completed (for re-entering rooms)
|
||||
if playable is StoryPlayable:
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
extends Control
|
||||
extends Control
|
||||
class_name Playable
|
||||
|
||||
func _ready() -> void:
|
||||
hide()
|
||||
if not Main.normal_boot:
|
||||
play.call_deferred()
|
||||
|
||||
|
||||
## Awaitable that encapsulates the core interaction with this Playable
|
||||
|
|
|
|||
Loading…
Reference in New Issue