Merge remote-tracking branch 'origin/demo'

This commit is contained in:
cakipaul 2025-08-13 23:35:01 +08:00
commit 33b1bf39f5

View File

@ -14,11 +14,13 @@ func _ready() -> void:
func _on_ground_ready() -> void: func _on_ground_ready() -> void:
var pickable_meat = $"../DeployLayer/Pickable掉落的肉"
pickable_meat.triggered.connect(_on_pick_meat)
# 粘鼠游戏 # 粘鼠游戏
if ArchiveManager.get_global_value(&"c02_meat_dropping"): if ArchiveManager.get_global_value(&"c02_meat_dropping"):
# 肉掉落,检查粘鼠板是否启用 # 肉掉落,检查粘鼠板是否启用
if $"../DeployLayer/Interactable粘鼠板".interacted_times > 0: if $"../DeployLayer/Interactable粘鼠板".interacted_times > 0:
if not $"../DeployLayer/Pickable掉落的肉".picked: if not pickable_meat.picked:
var sprite = $"../DeployLayer/Interactable粘鼠板/粘鼠挣扎" var sprite = $"../DeployLayer/Interactable粘鼠板/粘鼠挣扎"
sprite.visible = true sprite.visible = true
sprite.play() sprite.play()
@ -30,7 +32,7 @@ func _on_ground_ready() -> void:
$"../DeployLayer/Ambush老鼠叼肉".enabled = true $"../DeployLayer/Ambush老鼠叼肉".enabled = true
$"../DeployLayer/老鼠叼肉".visible = true $"../DeployLayer/老鼠叼肉".visible = true
if ArchiveManager.get_global_value(&"c02_meat_given"): if ArchiveManager.get_global_value(&"c02_meat_given"):
$"../DeployLayer/Pickable掉落的肉".enabled = true pickable_meat.enabled = true
var xiaochan = $"../DeployLayer/Ambush小蝉消失" as Ambush2D var xiaochan = $"../DeployLayer/Ambush小蝉消失" as Ambush2D
var madman = $"../DeployLayer/Npc疯子" as Npc2D var madman = $"../DeployLayer/Npc疯子" as Npc2D
@ -96,8 +98,7 @@ func wood_puppet() -> void:
$"Sfx背景音".reset_volumn_to_default() $"Sfx背景音".reset_volumn_to_default()
func bucket_meat() -> void: func _on_pick_meat() -> void:
SceneManager.enable_prop_item("prop_新鲜的肉")
EventManager.set_stage_if_greater(&"handnote_c02_meat_stopMouse", 2) EventManager.set_stage_if_greater(&"handnote_c02_meat_stopMouse", 2)
EventManager.set_stage_if_greater(&"handnote_c02_meat_knockDoor", 2) EventManager.set_stage_if_greater(&"handnote_c02_meat_knockDoor", 2)