合并主场景和个人小屋

_Core/systems/EventSystem.gd

@@ -27,13 +27,6 @@ extends Node
 # 结构: {event_name: [{"callback": Callable, "target": Node}, ...]}
 var event_listeners: Dictionary = {}
 
-# ============ 生命周期方法 ============
-
-# 初始化事件系统
-# 在节点准备就绪时调用
-func _ready():
-	print("EventSystem 初始化完成")
-
 # ============ 事件监听器管理 ============
 
 # 注册事件监听器
@@ -59,6 +52,11 @@ func connect_event(event_name: String, callback: Callable, target: Node = null):
 	if not event_listeners.has(event_name):
 		event_listeners[event_name] = []
 	
+	# 避免重复注册同一个监听器
+	for listener in event_listeners[event_name]:
+		if listener.callback == callback and listener.target == target:
+			return
+
 	# 创建监听器信息
 	var listener_info = {
 		"callback": callback,
@@ -67,7 +65,6 @@ func connect_event(event_name: String, callback: Callable, target: Node = null):
 	
 	# 添加到监听器列表
 	event_listeners[event_name].append(listener_info)
-	print("注册事件监听器: ", event_name, " -> ", callback)
 
 # 移除事件监听器
 # 
@@ -93,7 +90,6 @@ func disconnect_event(event_name: String, callback: Callable, target: Node = nul
 		# 匹配callback和target
 		if listener.callback == callback and listener.target == target:
 			listeners.remove_at(i)
-			print("移除事件监听器: ", event_name, " -> ", callback)
 			break
 
 # ============ 事件发送 ============
@@ -117,13 +113,11 @@ func disconnect_event(event_name: String, callback: Callable, target: Node = nul
 # - 事件发送是同步的，所有监听器会立即执行
 # - 如果监听器执行出错，不会影响其他监听器
 func emit_event(event_name: String, data: Variant = null):
-	print("发送事件: ", event_name, " 数据: ", data)
-	
 	# 检查是否有监听器
 	if not event_listeners.has(event_name):
 		return
 	
-	var listeners = event_listeners[event_name]
+	var listeners = event_listeners[event_name].duplicate()
 	for listener_info in listeners:
 		var target = listener_info.target
 		var callback = listener_info.callback
@@ -161,7 +155,6 @@ func cleanup_invalid_listeners():
 			# 如果目标节点无效，移除监听器
 			if target != null and not is_instance_valid(target):
 				listeners.remove_at(i)
-				print("清理无效监听器: ", event_name)
 
 # ============ 查询方法 ============
 
@@ -192,4 +185,3 @@ func get_listener_count(event_name: String) -> int:
 # - 使用前请确保所有模块都能正确处理监听器丢失
 func clear_all_listeners():
 	event_listeners.clear()
-	print("清空所有事件监听器")

_Core/systems/GridSystem.gd

@@ -131,13 +131,14 @@ static func get_grid_rect(grid_pos: Vector2i) -> Rect2:
 	var world_pos = grid_to_world(grid_pos)
 	return Rect2(world_pos, Vector2(GRID_SIZE, GRID_SIZE))
 
-# 打印网格信息（调试用）
-static func print_grid_info(world_pos: Vector2) -> void:
+# 获取网格信息（调试辅助）
+static func print_grid_info(world_pos: Vector2) -> Dictionary:
 	var grid_pos = world_to_grid(world_pos)
 	var snapped_pos = snap_to_grid(world_pos)
 	var center_pos = grid_to_world_center(grid_pos)
-	
-	print("世界坐标: ", world_pos)
-	print("网格坐标: ", grid_pos)
-	print("吸附位置: ", snapped_pos)
-	print("网格中心: ", center_pos)
+	return {
+		"world_position": world_pos,
+		"grid_position": grid_pos,
+		"snapped_position": snapped_pos,
+		"center_position": center_pos
+	}