feat: add nearby social interactions

2026-07-21 22:19:41 +08:00
parent 0bab768b14
commit 9dee47492c
43 changed files with 1499 additions and 77 deletions
--- a/scenes/ui/AuthScene.gd
+++ b/scenes/ui/AuthScene.gd
@@ -680,6 +680,7 @@ func _registration_texture_rect(nodeName: String, texturePath: String, rect: Rec
 	return textureRect

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	_auth_manager = get_node_or_null("/root/AuthManager")
 	_chat_manager = get_node_or_null("/root/ChatManager")
 	_scene_manager = get_node_or_null("/root/SceneManager")
@@ -1625,6 +1626,15 @@ func _hide_skin_workshop() -> void:
 	if is_instance_valid(skin_workshop_overlay):
 		skin_workshop_overlay.hide()

+func is_escape_dismissible() -> bool:
+	return is_instance_valid(skin_workshop_overlay) and skin_workshop_overlay.visible
+
+func get_escape_priority() -> int:
+	return 900
+
+func request_escape_close() -> void:
+	_hide_skin_workshop()
+
 func _on_workshop_source_pressed() -> void:
 	var err := DisplayServer.file_dialog_show(
 		"选择角色参考图片",
--- a/scenes/ui/CafeCompanionPanel.gd
+++ b/scenes/ui/CafeCompanionPanel.gd
@@ -30,6 +30,7 @@ var _resignConfirmButton: Button
 var _resignCancelButton: Button

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	chatFrame.visible = false
 	purchaseButton.pressed.connect(_on_purchase_pressed)
 	sendButton.pressed.connect(_on_send_pressed)
@@ -238,6 +239,18 @@ func _on_close_pressed() -> void:
 	_waitingForReply = false
 	chatInput.release_focus()

+func is_escape_dismissible() -> bool:
+	return (is_instance_valid(_resignDialog) and _resignDialog.visible) or chatFrame.visible
+
+func get_escape_priority() -> int:
+	return 850
+
+func request_escape_close() -> void:
+	if is_instance_valid(_resignDialog) and _resignDialog.visible:
+		_hide_resign_dialog()
+		return
+	_on_close_pressed()
+
 func _confirm_resign() -> void:
 	var servicePointId := str(_resignTarget.get("service_point_id", "")).strip_edges()
 	if servicePointId.is_empty():
--- a/scenes/ui/CafeCompanionRecruitmentPanel.gd
+++ b/scenes/ui/CafeCompanionRecruitmentPanel.gd
@@ -32,6 +32,7 @@ var _isSubmitting: bool = false
 var _isFetchingModels: bool = false

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	recruitmentFrame.visible = false
 	_setup_protocol_options()
 	_setup_employment_duration_options()
@@ -398,6 +399,15 @@ func _on_close_pressed() -> void:
 	fetchModelsButton.disabled = false
 	tokenInput.clear()

+func is_escape_dismissible() -> bool:
+	return recruitmentFrame.visible
+
+func get_escape_priority() -> int:
+	return 900
+
+func request_escape_close() -> void:
+	_on_close_pressed()
+
 func _set_status(message: String, isError: bool) -> void:
 	statusLabel.text = message
 	statusLabel.add_theme_color_override("font_color", Color(0.68, 0.22, 0.18, 1) if isError else Color(0.32, 0.42, 0.48, 1))
--- a/scenes/ui/ChatUI.gd
+++ b/scenes/ui/ChatUI.gd
@@ -125,6 +125,7 @@ var _send_failure_handled_by_ui: bool = false

 # 准备就绪
 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	_configure_mouse_focus()

 	# 初始隐藏聊天框
@@ -182,6 +183,8 @@ func _get_settings_manager() -> Node:

 # 处理全局输入
 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if event is InputEventMouseButton:
 		_handle_global_mouse_button_input(event as InputEventMouseButton)
 		return
@@ -366,6 +369,15 @@ func hide_chat(immediate: bool = false) -> void:
 	_transition_tween.tween_property(chat_panel, "modulate:a", 0.0, CHAT_TRANSITION_DURATION)
 	_transition_tween.finished.connect(_on_hide_transition_finished)

+func is_escape_dismissible() -> bool:
+	return _is_chat_visible
+
+func get_escape_priority() -> int:
+	return 480
+
+func request_escape_close() -> void:
+	hide_chat()
+
 # 创建隐藏计时器
 func _create_hide_timer() -> void:
 	_hide_timer = Timer.new()
--- a/scenes/ui/CourseBoardPanel.gd
+++ b/scenes/ui/CourseBoardPanel.gd
@@ -29,6 +29,7 @@ var _isOpen: bool = false
 var _transitionTween: Tween

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	visible = false
 	mouse_filter = Control.MOUSE_FILTER_IGNORE
 	set_process(false)
@@ -39,6 +40,8 @@ func _notification(what: int) -> void:
 		_positionPanel()

 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if not _isOpen:
 		return
 	if event is InputEventKey:
@@ -72,6 +75,15 @@ func hide_panel() -> void:
 func is_panel_open() -> bool:
 	return _isOpen

+func is_escape_dismissible() -> bool:
+	return _isOpen
+
+func get_escape_priority() -> int:
+	return 700
+
+func request_escape_close() -> void:
+	hide_panel()
+
 func _buildUi() -> void:
 	_overlay = ColorRect.new()
 	_overlay.name = "courseBoardDimOverlay"
--- a/scenes/ui/DatawhaleHonorRankingPanel.gd
+++ b/scenes/ui/DatawhaleHonorRankingPanel.gd
@@ -96,6 +96,7 @@ var _isLoading: bool = false
 var _debugShowRankSlots: bool = false

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	get_tree().paused = true
 	_disableChatUiMouseInput()
 	_buildUi()
@@ -109,12 +110,23 @@ func _exit_tree() -> void:
 	_restoreChatUiMouseInput()

 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if event is InputEventKey:
 		var keyEvent := event as InputEventKey
 		if keyEvent.pressed and not keyEvent.echo and keyEvent.keycode == KEY_ESCAPE:
 			_onClosePressed()
 			get_viewport().set_input_as_handled()

+func is_escape_dismissible() -> bool:
+	return is_inside_tree()
+
+func get_escape_priority() -> int:
+	return 1000
+
+func request_escape_close() -> void:
+	_onClosePressed()
+
 func _buildUi() -> void:
 	_rootControl = Control.new()
 	_rootControl.name = "RankingPanelRoot"
--- a/scenes/ui/FriendListPanel.gd
+++ b/scenes/ui/FriendListPanel.gd
@@ -38,6 +38,7 @@ var _isOpen: bool = false
 var _hasRequestedFriendList: bool = false

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	mouse_filter = Control.MOUSE_FILTER_IGNORE
 	_build_ui()
 	set_panel_open(false)
@@ -60,6 +61,15 @@ func set_panel_open(open: bool) -> void:
 func is_panel_open() -> bool:
 	return _isOpen

+func is_escape_dismissible() -> bool:
+	return _isOpen
+
+func get_escape_priority() -> int:
+	return 500
+
+func request_escape_close() -> void:
+	set_panel_open(false)
+
 func toggle_panel() -> void:
 	set_panel_open(not _isOpen)

--- a/scenes/ui/MapPanel.gd
+++ b/scenes/ui/MapPanel.gd
@@ -37,13 +37,13 @@ const MAP_CONFIGS: Dictionary = {
 			"YSortWorld",
 		],
 		"markers": [
-			{"label": "码头", "icon": "anchor", "pos": Vector2(0.160, 0.395), "side": "right"},
-			{"label": "总部", "icon": "home", "pos": Vector2(0.505, 0.188), "side": "right"},
-			{"label": "广场", "icon": "whale", "pos": Vector2(0.505, 0.515), "side": "right"},
-			{"label": "小屋", "icon": "home", "pos": Vector2(0.830, 0.400), "side": "right"},
-			{"label": "工坊", "icon": "tool", "pos": Vector2(0.752, 0.760), "side": "left"},
-			{"label": "公告", "icon": "notice", "pos": Vector2(0.288, 0.838), "side": "right"},
-			{"label": "入口", "icon": "gate", "pos": Vector2(0.500, 0.900), "side": "right"},
+			{"label": "码头", "destinationId": "square_dock", "icon": "anchor", "pos": Vector2(0.160, 0.395), "side": "right"},
+			{"label": "总部", "destinationId": "square_headquarters", "icon": "home", "pos": Vector2(0.505, 0.188), "side": "right"},
+			{"label": "广场", "destinationId": "square_center", "icon": "whale", "pos": Vector2(0.505, 0.515), "side": "right"},
+			{"label": "小屋", "destinationId": "square_cottage", "icon": "home", "pos": Vector2(0.830, 0.400), "side": "right"},
+			{"label": "工坊", "destinationId": "square_workshop", "icon": "tool", "pos": Vector2(0.752, 0.760), "side": "left"},
+			{"label": "公告", "destinationId": "square_notice", "icon": "notice", "pos": Vector2(0.288, 0.838), "side": "right"},
+			{"label": "入口", "destinationId": "square_work_zone_gate", "icon": "gate", "pos": Vector2(0.500, 0.900), "side": "right"},
 		],
 	},
 	"WorkZone": {
@@ -57,13 +57,13 @@ const MAP_CONFIGS: Dictionary = {
 			"YSortWorld",
 		],
 		"markers": [
-			{"label": "商城", "icon": "home", "pos": Vector2(0.500, 0.180), "side": "right"},
-			{"label": "咖啡店", "icon": "home", "pos": Vector2(0.092, 0.620), "side": "right"},
-			{"label": "任务", "icon": "notice", "pos": Vector2(0.304, 0.600), "side": "right"},
-			{"label": "课程", "icon": "notice", "pos": Vector2(0.694, 0.500), "side": "left"},
-			{"label": "AI站", "icon": "tool", "pos": Vector2(0.676, 0.785), "side": "left"},
-			{"label": "鲸币", "icon": "whale", "pos": Vector2(0.920, 0.785), "side": "left"},
-			{"label": "入口", "icon": "gate", "pos": Vector2(0.500, 0.900), "side": "right"},
+			{"label": "商城", "destinationId": "work_mall", "icon": "home", "pos": Vector2(0.500, 0.180), "side": "right"},
+			{"label": "咖啡店", "destinationId": "work_cafe_gate", "icon": "home", "pos": Vector2(0.092, 0.620), "side": "right"},
+			{"label": "任务", "destinationId": "work_jobs", "icon": "notice", "pos": Vector2(0.304, 0.600), "side": "right"},
+			{"label": "课程", "destinationId": "work_courses", "icon": "notice", "pos": Vector2(0.694, 0.500), "side": "left"},
+			{"label": "AI站", "destinationId": "work_ai", "icon": "tool", "pos": Vector2(0.676, 0.785), "side": "left"},
+			{"label": "鲸币", "destinationId": "work_exchange", "icon": "whale", "pos": Vector2(0.920, 0.785), "side": "left"},
+			{"label": "入口", "destinationId": "work_entrance", "icon": "gate", "pos": Vector2(0.500, 0.900), "side": "right"},
 		],
 	},
 	"CafeInterior": {
@@ -74,11 +74,19 @@ const MAP_CONFIGS: Dictionary = {
 			"CafeServiceHallBase",
 		],
 		"markers": [
-			{"label": "服务台", "icon": "whale", "pos": Vector2(0.500, 0.465), "side": "right"},
-			{"label": "陪伴区", "icon": "notice", "pos": Vector2(0.240, 0.280), "side": "right"},
-			{"label": "出口", "icon": "gate", "pos": Vector2(0.500, 0.855), "side": "right"},
+			{"label": "服务台", "destinationId": "cafe_counter", "icon": "whale", "pos": Vector2(0.500, 0.465), "side": "right"},
+			{"label": "陪伴区", "destinationId": "cafe_companion", "icon": "notice", "pos": Vector2(0.240, 0.280), "side": "right"},
+			{"label": "出口", "destinationId": "cafe_entrance", "icon": "gate", "pos": Vector2(0.500, 0.855), "side": "right"},
 		],
 	},
+	"PersonalSpace": {
+		"title": "我的房间",
+		"worldSize": Vector2(1024, 768),
+		"sourceNodes": [
+			"RoomBase",
+		],
+		"markers": [],
+	},
 }

 var _panel: PanelContainer
@@ -90,8 +98,13 @@ var _mapCamera: Camera2D
 var _titleLabel: Label
 var _markerNodes: Array[Control] = []
 var _isOpen: bool = false
+var _travelDestinations: Dictionary = {}
+var _travelLocked: bool = false
+var _destinationMenu: PopupMenu
+var _destinationMenuIds: Dictionary = {}

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	mouse_filter = Control.MOUSE_FILTER_IGNORE
 	_build_ui()
 	set_panel_open(false)
@@ -107,6 +120,8 @@ func _notification(what: int) -> void:
 		_anchor_panel()

 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if not _isOpen:
 		return
 	if event is InputEventKey:
@@ -123,10 +138,20 @@ func set_panel_open(open: bool) -> void:
 		_panel.visible = _isOpen
 	if _isOpen:
 		_rebuild_minimap_world()
+		_load_travel_destinations()

 func is_panel_open() -> bool:
 	return _isOpen

+func is_escape_dismissible() -> bool:
+	return _isOpen
+
+func get_escape_priority() -> int:
+	return 600
+
+func request_escape_close() -> void:
+	set_panel_open(false)
+
 func toggle_panel() -> void:
 	set_panel_open(not _isOpen)

@@ -152,6 +177,9 @@ func _build_ui() -> void:

 	content.add_child(_build_header())
 	content.add_child(_build_map_view())
+	_destinationMenu = PopupMenu.new()
+	_destinationMenu.id_pressed.connect(_on_destination_menu_selected)
+	add_child(_destinationMenu)

 func _build_header() -> Control:
 	var header := HBoxContainer.new()
@@ -173,6 +201,20 @@ func _build_header() -> Control:
 	title.add_theme_font_size_override("font_size", 24)
 	header.add_child(title)

+	var destinationButton := Button.new()
+	destinationButton.text = "目的地"
+	destinationButton.tooltip_text = "查看全部快速传送目的地"
+	destinationButton.custom_minimum_size = Vector2(76, 38)
+	destinationButton.focus_mode = Control.FOCUS_NONE
+	destinationButton.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
+	destinationButton.add_theme_font_size_override("font_size", 14)
+	destinationButton.add_theme_color_override("font_color", ACCENT_COLOR)
+	destinationButton.add_theme_stylebox_override("normal", _create_round_style(Color(0.902, 0.962, 0.995, 1.0), 14))
+	destinationButton.add_theme_stylebox_override("hover", _create_round_style(Color(0.818, 0.925, 0.980, 1.0), 14))
+	destinationButton.add_theme_stylebox_override("focus", StyleBoxEmpty.new())
+	destinationButton.pressed.connect(func() -> void: _show_destination_menu(destinationButton))
+	header.add_child(destinationButton)
+
 	var closeButton := Button.new()
 	closeButton.text = "×"
 	closeButton.tooltip_text = "关闭地图"
@@ -263,6 +305,16 @@ func _create_marker(marker: Dictionary) -> Control:
 	button.add_theme_stylebox_override("hover", _create_marker_style(Color(0.925, 0.966, 0.996, 0.98), ACCENT_COLOR))
 	button.add_theme_stylebox_override("pressed", _create_marker_style(Color(0.858, 0.925, 0.980, 0.98), ACCENT_COLOR.darkened(0.05)))
 	button.add_theme_stylebox_override("focus", StyleBoxEmpty.new())
+	var destinationId := str(marker.get("destinationId", "")).strip_edges()
+	var destination: Dictionary = _travelDestinations.get(destinationId, {})
+	var unlocked := destinationId.is_empty() or _travelDestinations.is_empty() or bool(destination.get("unlocked", false))
+	button.disabled = not unlocked or _travelLocked
+	button.tooltip_text = "点击快速传送" if unlocked else "首次到访后解锁"
+	if not unlocked:
+		button.modulate = Color(0.66, 0.69, 0.72, 0.72)
+		button.pressed.connect(func() -> void: return)
+	else:
+		button.pressed.connect(func() -> void: _request_travel(destinationId))

 	var row := HBoxContainer.new()
 	row.mouse_filter = Control.MOUSE_FILTER_IGNORE
@@ -281,7 +333,7 @@ func _create_marker(marker: Dictionary) -> Control:

 	var label := Label.new()
 	label.mouse_filter = Control.MOUSE_FILTER_IGNORE
-	label.text = str(marker.get("label", "地点"))
+	label.text = ("🔒 " if not unlocked else "") + str(marker.get("label", "地点"))
 	label.add_theme_color_override("font_color", TEXT_COLOR)
 	label.add_theme_font_size_override("font_size", 14)
 	row.add_child(label)
@@ -295,6 +347,117 @@ func _create_marker(marker: Dictionary) -> Control:
 	)
 	return button

+func _load_travel_destinations() -> void:
+	var api := get_node_or_null("/root/ApiClient")
+	if api == null:
+		return
+	api.call("get_json", "/world/travel-destinations", func(success: bool, response: Dictionary, _error: Dictionary) -> void:
+		if not success:
+			return
+		var data_variant: Variant = response.get("data", [])
+		if not (data_variant is Array):
+			return
+		_travelDestinations.clear()
+		for entry in data_variant as Array:
+			if entry is Dictionary:
+				var destination: Dictionary = entry
+				_travelDestinations[str(destination.get("id", ""))] = destination
+		_render_markers()
+	, true)
+
+func _show_destination_menu(origin: Control) -> void:
+	if not is_instance_valid(_destinationMenu):
+		return
+	_destinationMenu.clear()
+	_destinationMenuIds.clear()
+	if _travelDestinations.is_empty():
+		_destinationMenu.add_item("正在读取目的地…", 0)
+		_destinationMenu.set_item_disabled(0, true)
+	else:
+		var destinations: Array[Dictionary] = []
+		for destination_variant in _travelDestinations.values():
+			if destination_variant is Dictionary:
+				destinations.append(destination_variant as Dictionary)
+		destinations.sort_custom(func(a: Dictionary, b: Dictionary) -> bool:
+			var map_order := {"whale_port": 0, "work_zone": 1, "whale_cafe": 2, "personal_space": 3}
+			var order_a := int(map_order.get(str(a.get("mapId", "")), 9))
+			var order_b := int(map_order.get(str(b.get("mapId", "")), 9))
+			if order_a != order_b:
+				return order_a < order_b
+			return str(a.get("label", "")).naturalnocasecmp_to(str(b.get("label", ""))) < 0
+		)
+		var current_map := ""
+		var menu_id := 1
+		for destination in destinations:
+			var map_id := str(destination.get("mapId", ""))
+			if map_id != current_map:
+				if not current_map.is_empty():
+					_destinationMenu.add_separator()
+				_destinationMenu.add_item("— %s —" % _map_label(map_id), menu_id)
+				_destinationMenu.set_item_disabled(_destinationMenu.item_count - 1, true)
+				menu_id += 1
+				current_map = map_id
+			var unlocked := bool(destination.get("unlocked", false))
+			_destinationMenu.add_item(("" if unlocked else "🔒 ") + str(destination.get("label", "地点")), menu_id)
+			_destinationMenu.set_item_disabled(_destinationMenu.item_count - 1, not unlocked or _travelLocked)
+			_destinationMenuIds[menu_id] = str(destination.get("id", ""))
+			menu_id += 1
+	_destinationMenu.reset_size()
+	_destinationMenu.position = Vector2i(origin.get_screen_position() + Vector2(0.0, origin.size.y))
+	_destinationMenu.popup()
+
+func _on_destination_menu_selected(menu_id: int) -> void:
+	var destination_id := str(_destinationMenuIds.get(menu_id, ""))
+	if not destination_id.is_empty():
+		_request_travel(destination_id)
+
+func _request_travel(destinationId: String) -> void:
+	if destinationId.is_empty() or _travelLocked:
+		return
+	var socialManager := get_node_or_null("/root/SocialManager")
+	if socialManager == null or not socialManager.has_method("request_travel"):
+		return
+	_travelLocked = true
+	_render_markers()
+	socialManager.call("request_travel", destinationId, Callable(self, "_on_travel_authorized"))
+
+func _on_travel_authorized(success: bool, destination: Dictionary) -> void:
+	if not success:
+		await get_tree().create_timer(1.0).timeout
+		_travelLocked = false
+		_render_markers()
+		return
+	var mapId := str(destination.get("mapId", ""))
+	var position := _scene_position_for_destination(mapId, Vector2(float(destination.get("x", 0.0)), float(destination.get("y", 0.0))))
+	var sceneName: String = str({"whale_port": "square", "work_zone": "work_zone", "whale_cafe": "cafe_interior", "personal_space": "personal_space"}.get(mapId, ""))
+	if sceneName.is_empty():
+		await get_tree().create_timer(1.0).timeout
+		_travelLocked = false
+		_render_markers()
+		return
+	set_panel_open(false)
+	SceneManager.set_next_destination_id(str(destination.get("id", "")))
+	SceneManager.set_next_scene_position(position)
+	SceneManager.change_scene(sceneName)
+
+func _scene_position_for_destination(map_id: String, map_position: Vector2) -> Vector2:
+	# 服务端旅行目录使用小地图坐标；游戏场景则以地图中心为原点。
+	var origin := {
+		"whale_port": Vector2(1280, 960),
+		"work_zone": Vector2(1280, 960),
+		"whale_cafe": Vector2(768, 512),
+		"personal_space": Vector2(768, 512),
+	}.get(map_id, Vector2.ZERO) as Vector2
+	return map_position - origin
+
+func _map_label(map_id: String) -> String:
+	return {
+		"whale_port": "中心广场",
+		"work_zone": "打工区",
+		"whale_cafe": "鲸鱼咖啡馆",
+		"personal_space": "我的房间",
+	}.get(map_id, map_id)
+
 func _anchor_panel() -> void:
 	_panel.set_anchors_preset(Control.PRESET_TOP_RIGHT)
 	_panel.offset_left = -PANEL_SIZE.x - PANEL_MARGIN_RIGHT
--- a/scenes/ui/NoticeDialog.gd
+++ b/scenes/ui/NoticeDialog.gd
@@ -24,6 +24,7 @@ var _chatUiPrevMouseFilter: Control.MouseFilter = Control.MOUSE_FILTER_STOP
 var _chatUiMouseDisabled: bool = false

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	get_tree().paused = true
 	_disableChatUiMouseInput()

@@ -39,6 +40,15 @@ func _ready() -> void:
 func _exit_tree() -> void:
 	_restoreChatUiMouseInput()

+func is_escape_dismissible() -> bool:
+	return is_inside_tree()
+
+func get_escape_priority() -> int:
+	return 1000
+
+func request_escape_close() -> void:
+	_onClosePressed()
+
 func _setupDots() -> void:
 	for child in dotsContainer.get_children():
 		child.queue_free()
--- a/scenes/ui/PlayerHud.gd
+++ b/scenes/ui/PlayerHud.gd
@@ -8,7 +8,7 @@ extends Control
 # ============================================================================

 const HUD_MARGIN: Vector2 = Vector2(16, 16)
-const SHORTCUT_BAR_SIZE: Vector2 = Vector2(350, 86)
+const SHORTCUT_BAR_SIZE: Vector2 = Vector2(406, 86)
 const PLAYER_PROFILE_BUTTON_SIZE: Vector2 = Vector2(210, 78)
 const PLAYER_AVATAR_SIZE: Vector2 = Vector2(58, 58)
 const HUD_SEPARATION: int = 18
@@ -95,6 +95,7 @@ func _build_shortcut_bar() -> PanelContainer:
 	row.add_child(_create_shortcut_button("task", "任务", _on_task_pressed))
 	row.add_child(_create_shortcut_button("backpack", "背包", _on_backpack_pressed))
 	row.add_child(_create_shortcut_button("friends", "好友", _on_friends_pressed))
+	row.add_child(_create_shortcut_button("activity", "通知", _on_notifications_pressed))
 	row.add_child(_create_shortcut_button("settings", "设置", _on_settings_pressed))

 	return panel
@@ -379,6 +380,11 @@ func _on_map_pressed() -> void:
 	if eventSystem != null:
 		eventSystem.call("emit_event", EventNames.HUD_MAP_TOGGLE, {})

+func _on_notifications_pressed() -> void:
+	var socialManager := get_node_or_null("/root/SocialManager")
+	if socialManager != null and socialManager.has_method("toggle_notifications"):
+		socialManager.call("toggle_notifications")
+
 func _on_task_pressed() -> void:
 	_emit_status_message("任务入口稍后接入")

--- a/scenes/ui/SettingsPanel.gd
+++ b/scenes/ui/SettingsPanel.gd
@@ -38,6 +38,7 @@ const DEFAULT_SETTINGS: Dictionary = {
 	"ui_scale": 1.00,
 	"fullscreen": false,
 	"show_interaction_hints": true,
+	"show_interaction_points": false,
 	"show_name_always": false,
 	"show_chat_bubbles": true,
 	"world_notifications": true,
@@ -45,6 +46,7 @@ const DEFAULT_SETTINGS: Dictionary = {
 	"friend_request_notifications": true,
 	"allow_nearby_private": true,
 	"allow_nearby_friend_requests": true,
+	"allow_nearby_profile": true,
 	"mute_ui_sfx": false,
 }

@@ -73,6 +75,7 @@ var _transitionTween: Tween
 var _avatarUploadPending: bool = false

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	visible = false
 	mouse_filter = Control.MOUSE_FILTER_IGNORE
 	set_process(false)
@@ -95,6 +98,8 @@ func _notification(what: int) -> void:
 		_position_panel()

 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if not _isOpen:
 		return
 	if event is InputEventKey:
@@ -136,6 +141,15 @@ func hide_panel(saveBeforeClose: bool = false) -> void:
 func is_panel_open() -> bool:
 	return _isOpen

+func is_escape_dismissible() -> bool:
+	return _isOpen
+
+func get_escape_priority() -> int:
+	return 700
+
+func request_escape_close() -> void:
+	hide_panel(true)
+
 func _build_ui() -> void:
 	_overlay = ColorRect.new()
 	_overlay.name = "SettingsDimOverlay"
@@ -344,6 +358,7 @@ func _render_basic_content() -> void:
 	_content.add_child(_create_section("基础设置", [
 		_create_toggle_row("window", "全屏显示", "fullscreen", "适合专注游玩，窗口模式方便调试"),
 		_create_toggle_row("eye", "显示互动提示", "show_interaction_hints", "靠近 NPC、好友或公告板时显示按键提示"),
+		_create_toggle_row("eye", "显示交互点", "show_interaction_points", "用白色圆圈直接标出当前地图内的交互目标"),
 		_create_toggle_row("account", "始终显示名字", "show_name_always", "关闭时只在需要时显示玩家名称"),
 	]))
 	_content.add_child(_create_section("音频设置", [
@@ -365,25 +380,27 @@ func _render_chat_content() -> void:
 	_content.add_child(_create_section("聊天与社交", [
 		_create_toggle_row("chat", "世界频道提醒", "world_notifications", "收到世界频道消息时保留轻提示"),
 		_create_toggle_row("chat", "私聊提醒", "private_notifications", "好友或附近玩家私聊时提示"),
-		_create_toggle_row("account", "好友请求提醒", "friend_request_notifications", "对方按 F 发起好友申请时显示在好友列表"),
+		_create_toggle_row("account", "好友请求提醒", "friend_request_notifications", "附近玩家发起好友申请时显示在好友列表"),
 		_create_toggle_row("chat", "显示聊天气泡", "show_chat_bubbles", "气泡发送会同时进入世界频道"),
 	]))
 	_content.add_child(_create_section("附近玩家权限", [
+		_create_toggle_row("eye", "允许查看我的名片", "allow_nearby_profile", "关闭后陌生玩家无法在附近打开你的社区名片"),
 		_create_toggle_row("chat", "允许附近私聊", "allow_nearby_private", "附近玩家按 E 可以发起悄悄话"),
-		_create_toggle_row("account", "允许好友申请", "allow_nearby_friend_requests", "附近玩家按 F 可以发送好友申请"),
+		_create_toggle_row("account", "允许好友申请", "allow_nearby_friend_requests", "附近玩家可通过互动列表发送好友申请"),
 	]))

 func _render_controls_content() -> void:
 	_content.add_child(_create_section("操作说明", [
 		_create_key_row("W A S D", "移动角色"),
-		_create_key_row("方向键", "备用移动"),
-		_create_key_row("E", "互动 / 附近私聊"),
-		_create_key_row("F", "发送好友申请"),
+		_create_key_row("方向键", "附近互动列表选择"),
+		_create_key_row("E", "执行选中的互动"),
+		_create_key_row("Esc", "关闭当前界面或结束当前互动"),
 		_create_key_row("T", "打开聊天输入"),
 		_create_key_row("Enter", "发送聊天消息"),
 	]))
 	_content.add_child(_create_section("操作辅助", [
 		_create_toggle_row("eye", "显示互动提示", "show_interaction_hints", "靠近可交互目标时显示按键提示"),
+		_create_toggle_row("eye", "显示交互点", "show_interaction_points", "用白色圆圈直接标出当前地图内的交互目标"),
 		_create_hint_row("当前版本使用固定键位；这里的开关会控制地图内的互动提示显示。"),
 	]))

--- a/scenes/ui/WelcomeDialog.gd
+++ b/scenes/ui/WelcomeDialog.gd
@@ -11,7 +11,7 @@ const GUIDE_PAGES: Array[Dictionary] = [
 		"image_path": "res://assets/maps/square/v1/props/center_whale_fountain_v2_hd_clean.png",
 	},
 	{
-		"text": "操作提示：\n\n- 按 [color=#ffaa00]E[/color] 键可以与 NPC、公告板和信息板互动。\n- 靠近目标后面向它，再按互动键。\n- 输入框获得焦点时，角色移动会暂停响应。",
+		"text": "操作提示：\n\n- 按 [color=#ffaa00]E[/color] 键可以与 NPC、公告板和信息板互动。\n- 靠近目标后面向它，再按互动键。\n- 按 [color=#ffaa00]Esc[/color] 可以关闭当前界面或结束当前互动。\n- 输入框获得焦点时，角色移动会暂停响应。",
 		"image_path": "res://assets/maps/square/v1/props/bottom_entrance_right_service_props_v2_hd_clean.png",
 	},
 ]
@@ -38,6 +38,7 @@ var _guideCurrentPage: int = 0
 var _guideTween: Tween

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	_disableChatUiMouseInput()

 	var closeButton := find_child("CloseButton", true, false) as Button
@@ -52,8 +53,20 @@ func _exit_tree() -> void:
 	_restoreChatUiMouseInput()

 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if event.is_action_pressed("ui_cancel"):
 		queue_free()
+		get_viewport().set_input_as_handled()
+
+func is_escape_dismissible() -> bool:
+	return is_inside_tree()
+
+func get_escape_priority() -> int:
+	return 980
+
+func request_escape_close() -> void:
+	queue_free()

 func _onClosePressed() -> void:
 	queue_free()
--- a/scenes/ui/mall/MallPanel.gd
+++ b/scenes/ui/mall/MallPanel.gd
@@ -62,6 +62,7 @@ var _transitionTween: Tween
 var _toastTween: Tween

 func _ready() -> void:
+	add_to_group("whaletown_escape_dismissible")
 	visible = false
 	mouse_filter = Control.MOUSE_FILTER_IGNORE
 	set_process(false)
@@ -82,6 +83,8 @@ func _notification(what: int) -> void:
 		_position_panel()

 func _input(event: InputEvent) -> void:
+	if get_viewport().is_input_handled():
+		return
 	if not _isOpen:
 		return
 	if event is InputEventKey:
@@ -120,6 +123,18 @@ func hide_panel() -> void:
 func is_panel_open() -> bool:
 	return _isOpen

+func is_escape_dismissible() -> bool:
+	return _isOpen
+
+func get_escape_priority() -> int:
+	return 700
+
+func request_escape_close() -> void:
+	if is_instance_valid(_confirmDialog) and _confirmDialog.visible:
+		_hide_confirm_dialog()
+		return
+	hide_panel()
+
 func _build_ui() -> void:
 	_overlay = ColorRect.new()
 	_overlay.name = "mallDimOverlay"