From dfd5429b7068271c48897610ef91b850aa3ea837 Mon Sep 17 00:00:00 2001 From: cakipaul Date: Mon, 14 Jul 2025 19:14:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9E=8E=E5=AD=90=E4=BA=95=E4=B8=8E?= =?UTF-8?q?=E5=81=B7=E5=90=AC=E6=9D=8E=E7=99=9E=E5=8F=AF=E5=9C=A8=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=AB=A0=E5=BC=80=E5=A7=8B=E5=90=8E=E8=BF=9B=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scene/ground/scene/c02/s03_院子.gd | 48 ++++++++++++++---------------- scene/ground/script/c02/井特写.gd | 5 +++- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/scene/ground/scene/c02/s03_院子.gd b/scene/ground/scene/c02/s03_院子.gd index 5cbfa90c..3c4a338a 100644 --- a/scene/ground/scene/c02/s03_院子.gd +++ b/scene/ground/scene/c02/s03_院子.gd @@ -33,11 +33,6 @@ func _on_ground_ready() -> void: gate.interact_mismatch_failed.connect(_on_gate_failed) gate.interacted.connect(_on_gate_interacted) - eavesdrop_window = $"../DeployLayer/李氏赖子房间人影" - if ArchiveManager.get_global_value(&"c02_eavesdrop_finished"): - $"../DeployLayer/Ambush偷听对话".enabled = false - eavesdrop_window.visible = false - $"../DeployLayer/Closeup敲门游戏".exit.connect(_on_knock_exit) counter = $"../DeployLayer/Interactable柜子" as Interactable2D @@ -64,23 +59,31 @@ func _on_ground_ready() -> void: $VibeSfx氛围.switch_to("c02_火灾") $"../DirectionalLight2D".energy = 0 + eavesdrop_window = $"../DeployLayer/李氏赖子房间人影" madman_npc = $"../DeployLayer/Npc井边疯子" madman_npc.visible = false - # c02_madman_hitwall 之后， c02_ball_game_stage==3（游戏结束） 之前；同时 eavesdrop_finished - if EventManager.get_stage(&"c02_ball_game_stage") < 3: - # and ArchiveManager.get_global_value(&"c02_eavesdrop_finished") + bully_layer = $"../DeployLayer/霸凌" + burning_layer = $"../DeployLayer/火灾" + var closeup_well = $"../DeployLayer/Closeup井" + # 第一章霸凌阶段（弹珠游戏结束为开始）隐藏疯子与李癞偷听，第二章开始后显示 + if EventManager.get_stage(&"c02_ball_game_stage") == 3 and EventManager.get_chapter_stage() <= 2: + _setup_bully_or_burning(true) + # 弹珠游戏结束后就开始霸凌，此时禁止偷听。第一章结束后（火灾结束），第二章再偷听 + $"../DeployLayer/Ambush偷听对话".enabled = false + eavesdrop_window.visible = false + closeup_well.enabled = false + else: if not ArchiveManager.get_global_value("c02_watched_the_well"): - $"../DeployLayer/Closeup井".exit.connect(func(_arg): madman_npc.visible = true) - else: - madman_npc.visible = true - ( - madman_npc - . talk_finished - . connect( - func(): ArchiveManager.unlock_memory(2) - # 2 号为井边记忆 - ) - ) + closeup_well.exit.connect(func(_arg): + madman_npc.visible = true + # 2 号为井边记忆 + ArchiveManager.unlock_memory(2) + ) + # madman_npc.talk_finished.connect(ArchiveManager.unlock_memory.bind(2)) + + if ArchiveManager.get_global_value(&"c02_eavesdrop_finished"): + $"../DeployLayer/Ambush偷听对话".enabled = false + eavesdrop_window.visible = false if ArchiveManager.get_global_value(&"c02_show_grounded_coins"): # 奠字 + 纸钱 @@ -116,10 +119,6 @@ func _on_ground_ready() -> void: elif EventManager.get_stage("c02_madman_interacted_stage") == 2: small_shoe.enabled = true - bully_layer = $"../DeployLayer/霸凌" - burning_layer = $"../DeployLayer/火灾" - if EventManager.get_stage(&"c02_ball_game_stage") >= 3 and EventManager.get_chapter_stage() < 3: - _setup_bully_or_burning(true) func drop_shoe(progress: float, y1: float, y2: float): @@ -203,9 +202,6 @@ func eavesdrop() -> void: func _setup_bully_or_burning(reenter_scene := false): - # 弹珠游戏结束后就开始霸凌，此时禁止偷听。第一章结束后（火灾结束），第二章再偷听 - $"../DeployLayer/Ambush偷听对话".enabled = false - eavesdrop_window.visible = false if EventManager.get_stage(&"c02_burning_end_stage") == 2: # 火灾演出完全结束 burning_layer.visible = false diff --git a/scene/ground/script/c02/井特写.gd b/scene/ground/script/c02/井特写.gd index dca3d574..f3f4a1aa 100644 --- a/scene/ground/script/c02/井特写.gd +++ b/scene/ground/script/c02/井特写.gd @@ -1,10 +1,13 @@ extends CanvasLayer +signal exit() func _ready() -> void: layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME if not ArchiveManager.get_global_value("c02_watched_the_well"): + ArchiveManager.set_global_entry("c02_watched_the_well", true) DialogueManager.show_dialogue_balloon( preload("res://asset/dialogue/npc.dialogue"), "c02_看井对话" ) - ArchiveManager.set_global_entry("c02_watched_the_well", true) \ No newline at end of file + await DialogueManager.dialogue_ended + exit.emit() \ No newline at end of file From 90024f59f14dddb07e5c05d54543fcd20facab4e Mon Sep 17 00:00:00 2001 From: bbd_pc Date: Mon, 14 Jul 2025 19:22:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demo0.5=20=E5=8F=91=E8=A1=8C=E5=86=85?= =?UTF-8?q?=E9=83=A8=E6=B5=8B=E8=AF=95=E7=89=88=EF=BC=880.6=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E7=89=88=E4=B8=BA=E6=8B=9B=E5=8B=9F=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=B5=8B=E8=AF=95=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- export_presets.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 35007de4..fac0dadd 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../demo0.3/xiandie.exe" +export_path="../demo0.5/xiandie.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -37,8 +37,8 @@ application/modify_resources=true application/icon="uid://cxgwspjv16j7m" application/console_wrapper_icon="uid://cxgwspjv16j7m" application/icon_interpolation=4 -application/file_version="0.3.0.0" -application/product_version="0.3.0.0" +application/file_version="0.5.0.0" +application/product_version="0.5.0.0" application/company_name="包包丁" application/product_name="衔蝶" application/file_description="衔蝶"