diff --git a/scene/little_game/八音盒/八音盒.gd b/scene/little_game/八音盒/八音盒.gd index 4a7869e9..2cf87a6a 100644 --- a/scene/little_game/八音盒/八音盒.gd +++ b/scene/little_game/八音盒/八音盒.gd @@ -64,19 +64,19 @@ func _ready() -> void: box_closed.picked.connect(_on_box_picked) drawer_btn.picked.connect(_on_drawer_picked) - if ArchiveManager.get_global_value(&"c02_musicbox_pic_taken"): + if ArchiveManager.get_global_value(&"c02_musicbox_taken_prop_撕下的照片上"): pic.queue_free() - if ArchiveManager.get_global_value(&"c02_musicbox_danzhu_taken"): + if ArchiveManager.get_global_value(&"c02_musicbox_taken_prop_弹珠"): danzhu.queue_free() - if ArchiveManager.get_global_value(&"c02_musicbox_xiaomao_taken"): + if ArchiveManager.get_global_value(&"c02_musicbox_taken_prop_无头小猫玩具"): xiaomao.queue_free() - if ArchiveManager.get_global_value(&"c02_musicbox_xiaochan_taken"): + if ArchiveManager.get_global_value(&"c02_musicbox_taken_prop_木头人偶"): xiaochan.queue_free() - pic.picked.connect(_on_prop_picked.bind("pic")) - danzhu.picked.connect(_on_prop_picked.bind("danzhu")) - xiaomao.picked.connect(_on_prop_picked.bind("xiaomao")) - xiaochan.picked.connect(_on_prop_picked.bind("xiaochan")) + pic.picked.connect(_on_prop_picked.bind("prop_撕下的照片上")) + danzhu.picked.connect(_on_prop_picked.bind("prop_弹珠")) + xiaomao.picked.connect(_on_prop_picked.bind("prop_无头小猫玩具")) + xiaochan.picked.connect(_on_prop_picked.bind("prop_木头人偶")) d1.picked.connect(_on_picked) d1.dropped.connect(_on_dropped) @@ -124,9 +124,8 @@ func _on_drawer_picked(_node): create_tween().tween_property(box_drawer, "modulate:a", 1.0, 0.5) -func _on_prop_picked(node: Draggable2D, archive_key: String): +func _on_prop_picked(node: Draggable2D, prop_key: String): node.freezing = true - var key = node.item_name # var tween = create_tween() # # 撕下来的 fade out # tween.tween_property(node, "modulate:a", 0.0, 1.0) @@ -134,10 +133,10 @@ func _on_prop_picked(node: Draggable2D, archive_key: String): # tween.tween_interval(0.5) # await tween.finished node.queue_free() - SceneManager.enable_prop_item(key) - if key == "prop_无头小猫玩具": + SceneManager.enable_prop_item(prop_key) + if prop_key == "prop_无头小猫玩具": _on_pick_catty() - ArchiveManager.set_global_entry(&"c02_musicbox_" + archive_key + "_taken", true) + ArchiveManager.set_global_entry(&"c02_musicbox_taken_" + prop_key, true) func _on_picked(node: Draggable2D): @@ -321,7 +320,7 @@ func _unhandled_input(event: InputEvent) -> void: get_viewport().set_input_as_handled() # 尝试使用道具 var hud = SceneManager.get_prop_hud() as PropHud - var key = SceneManager.get_current_prop(false) + var key = SceneManager.get_current_prop() if key == "prop_木头人偶": SceneManager.disable_prop_item(key) _chechout_stage(2)