Merge remote-tracking branch 'origin/demo'

scene/ground/scene/c02/s06_二楼.gd

@@ -194,6 +194,8 @@ func _c02_final_show():
 		closeup.display()
 		closeup.exit.connect(_on_exit_final_show, CONNECT_ONE_SHOT)
 		await Util.wait(1.5)
+		# 结尾演出时直接解锁地图
+		EventManager.set_stage_if_greater(&"handnote_c02_map_2", 1)
 		play("RESET")
 
 

scene/ground/script/c02/event_2d叼纸小猫.gd

@@ -17,7 +17,7 @@ func _on_global_stage_updated(e: StringName, s: int):
 
 func _on_ground_ready(_ground: Ground2D):
 	if $"Inspectable小猫纸条".icount > 0:
-		EventManager.set_stage_if_greater(pre_event_name, 4)
+		EventManager.set_stage_if_greater(event_name, 4)
 	# else:
 	# 	$"Pickable小猫纸条".triggered.connect(EventManager.set_stage.bind(event_name, 4))