From f2c2af8c57267e6eac7bfecf06a9244b7125bc62 Mon Sep 17 00:00:00 2001
From: cakipaul <cakipaul@gmail.com>
Date: Wed, 16 Jul 2025 17:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=AB=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 asset/dialogue/event_stage.dialogue           |  2 +-
 scene/ground/scene/c03/s02_瞎子新卧室.tscn    |  1 -
 scene/ground/scene/c03/s03_瞎子理发店.gd      |  9 ++
 .../ground/script/c03/s02_closeup洋糕点.tscn  | 85 +++++++++++++++++++
 .../ground/script/c03/s03_closeup癞子纸人.gd  |  2 +-
 .../script/c03/s03_closeup癞子纸人.tscn       |  4 +-
 6 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/asset/dialogue/event_stage.dialogue b/asset/dialogue/event_stage.dialogue
index 8112f67a..fde83c65 100644
--- a/asset/dialogue/event_stage.dialogue
+++ b/asset/dialogue/event_stage.dialogue
@@ -12,7 +12,7 @@ c02_ball_game_stage: 0:初始化 1:寻找弹珠_老虎钳可以换弹珠 2:给
 ~ EventStage_c03
 c03_s01_meat_put: 0:初始化 1:已放肉
 c03_invite_xchan_supper: 0:初始化 1:已偷听_需邀请 2:完成邀请
-c03_s03_laizi_braid:  0:初始化 1:已使用剪刀 2:已剪下
+c03_s03_laizi_braid:  0:初始化 1:已用剪刀_准备剪辫 2:已剪下辫子
 c03_f2_madman_runaway: 0:初始化 1:跑开_纸人挡路 2:消除纸人
 c03_invite_xchan_supper=2 & c03_s03_laizi_braid=2 -> c03_f2_madman_runaway=2
 c03_before_mahjong_game: 0:初始化 1:粘舌头和刀把 2:给药 4:准备好进入游戏
diff --git a/scene/ground/scene/c03/s02_瞎子新卧室.tscn b/scene/ground/scene/c03/s02_瞎子新卧室.tscn
index 3006ca77..397b8d07 100644
--- a/scene/ground/scene/c03/s02_瞎子新卧室.tscn
+++ b/scene/ground/scene/c03/s02_瞎子新卧室.tscn
@@ -184,7 +184,6 @@ position = Vector2(873, 15)
 
 [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("6_jad6f")]
 position = Vector2(67, 19)
-enabled = false
 portal_name = "1"
 target_scene = "c02_s06"
 target_portal = "1"
diff --git a/scene/ground/scene/c03/s03_瞎子理发店.gd b/scene/ground/scene/c03/s03_瞎子理发店.gd
index e753a071..12adc88e 100644
--- a/scene/ground/scene/c03/s03_瞎子理发店.gd
+++ b/scene/ground/scene/c03/s03_瞎子理发店.gd
@@ -31,6 +31,8 @@ func _on_ground_ready() -> void:
 	closeup刮海报_鬼母子.exit.connect(_check_if_flyer_shaven)
 	_check_if_flyer_shaven()
 	closeup癞子纸人.exit.connect(_on_laizi_exit)
+	if EventManager.get_stage("c03_s03_laizi_braid") >= 2:
+		_setup_beheaded_laizi_paperman()
 
 
 func _check_if_flyer_shaven(_arg = false) -> void:
@@ -42,8 +44,15 @@ func _check_if_flyer_shaven(_arg = false) -> void:
 
 func _on_laizi_exit(_arg = false) -> void:
 	if _arg:
+		_setup_beheaded_laizi_paperman()
+		# TODO 癞子纸人
 		SceneManager.lock_player()
 		# TODO
 		SceneManager.pop_debug_dialog_info("美术&音效", "剪辫子演出")
 		await Util.wait(2.0)
 		SceneManager.unlock_player()
+
+
+func _setup_beheaded_laizi_paperman():
+	$"../DeployLayer/癞子纸人/癞子纸人头套".queue_free()
+	closeup癞子纸人.enabled = false
\ No newline at end of file
diff --git a/scene/ground/script/c03/s02_closeup洋糕点.tscn b/scene/ground/script/c03/s02_closeup洋糕点.tscn
index 497c2a29..8f2d8a91 100644
--- a/scene/ground/script/c03/s02_closeup洋糕点.tscn
+++ b/scene/ground/script/c03/s02_closeup洋糕点.tscn
@@ -9,6 +9,7 @@
 
 [node name="Closeup洋糕点" type="CanvasLayer"]
 script = ExtResource("1_i4mac")
+metadata/_edit_horizontal_guides_ = [38.0, 278.0]
 
 [node name="BG无符" type="TextureRect" parent="."]
 anchors_preset = 15
@@ -45,6 +46,90 @@ texture = ExtResource("4_1bew5")
 expand_mode = 1
 stretch_mode = 5
 
+[node name="Label" type="Label" parent="ContentInspector"]
+z_index = 5
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = 194.0
+offset_top = -109.0
+offset_right = 304.0
+offset_bottom = -61.0
+grow_horizontal = 2
+grow_vertical = 2
+rotation = 0.813367
+text = "南无诃利帝母菩萨摩诃萨
+南无诃利帝母菩萨
+南无诃利"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Label2" type="Label" parent="ContentInspector"]
+z_index = 5
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -259.0
+offset_top = -37.0
+offset_right = -149.0
+offset_bottom = 11.0
+grow_horizontal = 2
+grow_vertical = 2
+rotation = -0.722402
+text = "南无诃利帝母菩萨摩诃萨
+南无诃利帝母菩萨
+南无诃利"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Label3" type="Label" parent="ContentInspector"]
+z_index = 5
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -189.0
+offset_top = 111.0
+offset_right = -79.0
+offset_bottom = 159.0
+grow_horizontal = 2
+grow_vertical = 2
+rotation = -2.31437
+text = "南无诃利帝母菩萨摩诃萨
+南无诃利帝母菩萨
+南无诃利"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Label4" type="Label" parent="ContentInspector"]
+z_index = 5
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = 254.0
+offset_top = 27.0
+offset_right = 364.0
+offset_bottom = 75.0
+grow_horizontal = 2
+grow_vertical = 2
+rotation = -4.03542
+text = "南无诃利帝母菩萨摩诃萨
+南无诃利帝母菩萨
+南无诃利"
+horizontal_alignment = 1
+vertical_alignment = 1
+
 [node name="遮罩" type="TextureRect" parent="."]
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/scene/ground/script/c03/s03_closeup癞子纸人.gd b/scene/ground/script/c03/s03_closeup癞子纸人.gd
index 8433f58b..a1e7256c 100644
--- a/scene/ground/script/c03/s03_closeup癞子纸人.gd
+++ b/scene/ground/script/c03/s03_closeup癞子纸人.gd
@@ -66,7 +66,7 @@ func _try_interact() -> void:
 	# TODO
 	SceneManager.pop_debug_dialog_info("音效", "使用剪刀（惊悚）")
 	$"头".hide()
-	await Util.wait(1.5)
+	await Util.wait(2.0)
 	$"头受伤".hide()
 	SceneManager.disable_prop_item("prop_剪刀")
 	EventManager.set_stage("c03_s03_laizi_braid", 1)
diff --git a/scene/ground/script/c03/s03_closeup癞子纸人.tscn b/scene/ground/script/c03/s03_closeup癞子纸人.tscn
index 563a4852..62f0c14f 100644
--- a/scene/ground/script/c03/s03_closeup癞子纸人.tscn
+++ b/scene/ground/script/c03/s03_closeup癞子纸人.tscn
@@ -62,7 +62,7 @@ texture = ExtResource("5_jijuh")
 
 [node name="EventBinder" type="Node" parent="后脑勺/HoverBraid"]
 script = ExtResource("6_uenj0")
-memo = "[hoverbraid] interacted 时: c03_s03_laizi_braid=2:已剪下(greater)"
+memo = "[hoverbraid] interacted 时: c03_s03_laizi_braid=2:已剪下辫子(greater)"
 trigger_event = &"c03_s03_laizi_braid"
 trigger_mode = "interacted"
 trigger_stage = 2
@@ -70,7 +70,7 @@ metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="EventBinder" type="Node" parent="后脑勺"]
 script = ExtResource("6_uenj0")
-memo = "c03_s03_laizi_braid=[1:已使用剪刀] 时,显示: [后脑勺]
+memo = "c03_s03_laizi_braid=[1:已用剪刀_准备剪辫] 时,显示: [后脑勺]
 "
 updater_event = &"c03_s03_laizi_braid"
 updater_mode = "shower"