From 92e943385256c09ab6725795dfd9b4e92d1f2d17 Mon Sep 17 00:00:00 2001
From: cakipaul <cakipaul@gmail.com>
Date: Sat, 5 Jul 2025 00:22:51 +0800
Subject: [PATCH] =?UTF-8?q?demo=200.2.0.2=20hotfix=20=E5=B0=8F=E5=B0=8F?=
 =?UTF-8?q?=E8=9D=B6=E4=BA=92=E5=8A=A8=E6=97=B6=E4=B8=8D=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scene/character/player_animation_config.gd |  4 +--
 scene/ground/scene/c01/s05_院长房间.tscn   |  7 ++++++
 scene/ground/scene/c02/s03_院子.gd         |  2 +-
 scene/ground/scene/c02/s03_院子.tscn       | 29 +++++++++++++++-------
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/scene/character/player_animation_config.gd b/scene/character/player_animation_config.gd
index ad9fb369..9e796093 100644
--- a/scene/character/player_animation_config.gd
+++ b/scene/character/player_animation_config.gd
@@ -135,8 +135,8 @@ var ANIMATION_CONFIG = {
 		MOVEMENT_WALKING: [&"c01_小小蝶_walking_l", &"c01_小小蝶_walking_r"],
 		MOVEMENT_RUNNING: [&"c01_小小蝶_running_l", &"c01_小小蝶_running_r"],
 		# animation_name, left, right
-		ACTION_LOOKUP_WALL:
-		[&"c01_小小蝶_背面抬头", Vector2.ONE, Vector2(-3.0, -37.0), &"c01_小小蝶_抬头_l", &"c01_小小蝶_抬头_r"],
+		# ACTION_LOOKUP_WALL:
+		# [&"c01_小小蝶_背面抬头", Vector2.ONE, Vector2(-3.0, -37.0), &"c01_小小蝶_抬头_l", &"c01_小小蝶_抬头_r"],
 		# 看向橱柜（c01_s07 书店外）
 		5: [&"c01_小小蝶_书店外看向橱窗", Vector2.ONE, Vector2(0, -88.0)],
 		# 敲门（c01_s07 书店外）
diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn
index f4a791e4..b1dcd0eb 100644
--- a/scene/ground/scene/c01/s05_院长房间.tscn
+++ b/scene/ground/scene/c01/s05_院长房间.tscn
@@ -826,11 +826,18 @@ height = 50.0
 position = Vector2(26, 88)
 enable_light = false
 character = "小小蝶"
+player_movement_rect = Rect2(40, -158, 490, 316)
 facing_direction = Vector2(1, 0)
 
 [node name="AudioListener2D" type="AudioListener2D" parent="Ground/MainPlayer" index="6"]
 current = true
 
+[node name="CameraFocusMarker" parent="Ground" index="6"]
+limit_left = 0
+limit_top = -158
+limit_right = 564
+limit_bottom = 158
+
 [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
 position = Vector2(21, 39)
 texture = ExtResource("3_vmr0f")
diff --git a/scene/ground/scene/c02/s03_院子.gd b/scene/ground/scene/c02/s03_院子.gd
index 7180656e..8a1f5cae 100644
--- a/scene/ground/scene/c02/s03_院子.gd
+++ b/scene/ground/scene/c02/s03_院子.gd
@@ -56,7 +56,7 @@ func _on_ground_ready() -> void:
 	# 点燃后～离开前
 	if (
 		ArchiveManager.get_global_value(&"c02_burning")
-		and not EventManager.get_stage(&"c02_burning_end_stage") == 2
+		and EventManager.get_stage(&"c02_burning_end_stage") < 2
 	):
 		new_bg.modulate.a = 1.0
 		# 火灾开始后，无需 enable
diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn
index b6f13ecf..d361af35 100644
--- a/scene/ground/scene/c02/s03_院子.tscn
+++ b/scene/ground/scene/c02/s03_院子.tscn
@@ -287,24 +287,28 @@ data = {
 "oneshot_animation_played": false
 }
 debug_global_data = Dictionary[String, Variant]({
-"c02_ball_game_stage": 1,
+"c02_ball_game_stage": 3,
 "c02_burning": false,
-"c02_burning_end_stage": 0,
+"c02_burning_end_stage": 1,
 "c02_counter_pushed_out": false,
 "c02_eavesdrop_finished": false,
 "c02_got_pliers": 0,
 "c02_madman_hitwall": false,
 "c02_madman_interacted": 0,
 "c02_open_gate_first_failed": false,
-"c02_ready_to_fire": false,
+"c02_ready_to_fire": true,
 "c02_show_grounded_coins": false,
 "c02_the_blind_room_unlocked": false,
 "c02_watched_the_well": false,
-"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"],
+"enabled_items": {
+"prop_小鞋子2": true,
+"prop_火柴": true,
+"prop_老虎钳": true
+},
 "handnote_c02_gate_chain": 1,
 "handnote_c02_map_1Right": 1,
 "handnote_c02_meat_knockDoor": 1,
-"player_x": 700.0
+"player_x": 2000.0
 })
 debug_ground_data = Dictionary[String, Variant]({
 "Ambush保卫科旁边os": {
@@ -781,7 +785,6 @@ position = Vector2(29, -3)
 sprite_frames = ExtResource("34_1tart")
 animation = &"小婵_被霸凌"
 autoplay = "小婵_被霸凌"
-frame = 1
 
 [node name="f1" parent="Ground/DeployLayer/霸凌" instance=ExtResource("33_ycojw")]
 z_index = 10
@@ -789,7 +792,7 @@ position = Vector2(-11, 1)
 sprite_frames = ExtResource("34_1tart")
 animation = &"霸凌1"
 autoplay = "霸凌1"
-frame = 3
+frame = 6
 
 [node name="Sfx2D霸凌童谣" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/霸凌/f1"]
 process_mode = 1
@@ -807,7 +810,7 @@ position = Vector2(23, 11)
 sprite_frames = ExtResource("34_1tart")
 animation = &"霸凌2"
 autoplay = "霸凌2"
-frame = 3
+frame = 4
 
 [node name="f3" parent="Ground/DeployLayer/霸凌" instance=ExtResource("33_ycojw")]
 z_index = 10
@@ -815,7 +818,7 @@ position = Vector2(57, 7)
 sprite_frames = ExtResource("34_1tart")
 animation = &"霸凌3"
 autoplay = "霸凌3"
-frame = 3
+frame = 1
 
 [node name="Ambush点火游戏阻挡右移" parent="Ground/DeployLayer/霸凌" instance=ExtResource("25_iyaiw")]
 position = Vector2(-116, -13)
@@ -1004,6 +1007,7 @@ position = Vector2(2229, 41)
 sprite_frames = ExtResource("34_1tart")
 animation = &"霸凌3-发抖"
 autoplay = "霸凌3-发抖"
+frame = 1
 
 [node name="Pro小孩喊着火啦3" parent="Ground/DeployLayer/火灾" instance=ExtResource("33_ycojw")]
 z_index = 9
@@ -1106,8 +1110,15 @@ texture = SubResource("GradientTexture2D_plfv5")
 
 [node name="MainPlayer" parent="Ground" index="5"]
 position = Vector2(2128, 93)
+player_movement_rect = Rect2(17, -158, 2233, 316)
 facing_direction = Vector2(1, 0)
 
+[node name="CameraFocusMarker" parent="Ground" index="6"]
+limit_left = 0
+limit_top = -158
+limit_right = 2380
+limit_bottom = 158
+
 [node name="BGParallaxLayer" parent="Ground/ParallaxForeground" index="0"]
 use_parent_material = true