xiangwang25/whale-town-front-v2
1
0
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add nearby social interactions

Browse Source
This commit is contained in:
ANG-Server
2026-07-21 22:19:41 +08:00
parent 0bab768b14
commit 9dee47492c
43 changed files with 1499 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scenes/Maps/CafeInterior.gd
View File

@@ -23,6 +23,7 @@ const COMPANION_NAMEPLATE_VISUAL_MAX_WIDTH: int = 118
const COMPANION_NAMEPLATE_VISUAL_CHAR_WIDTH: int = 12
const NPC_NAMEPLATE_OFFSET_Y: float = -136.0
const HIRED_PLAYER_NAMEPLATE_OFFSET_Y: float = -96.0
const InteractionAnchorUtil = preload("res://_Core/utils/InteractionAnchor.gd")
@onready var player: PlayerController = $YSortWorld/Characters/Players/Player
@onready var playerCamera: Camera2D = $YSortWorld/Characters/Players/Player/Camera2D
@@ -38,6 +39,7 @@ var _isChangingScene: bool = false
var _lastRecruitmentClickMsec: int = 0
func _ready() -> void:
add_to_group("whaletown_interactable")
_align_service_occupants()
_configure_static_companion_nameplates()
_apply_spawn_point()
@@ -45,6 +47,15 @@ func _ready() -> void:
_connect_exit_area()
_connect_recruitment_area()
_connect_cafe_companion_events()
_discover_destination()
func _discover_destination() -> void:
var destination_id := SceneManager.get_next_destination_id()
if destination_id.is_empty():
destination_id = "cafe_entrance"
var socialManager := get_node_or_null("/root/SocialManager")
if socialManager != null and socialManager.has_method("discover_destination"):
socialManager.call("discover_destination", destination_id)
func _exit_tree() -> void:
var eventSystem := get_node_or_null("/root/EventSystem")
@@ -56,6 +67,8 @@ func _align_service_occupants() -> void:
cafeWhaleBaristaNpc.global_position = serviceIdlePoint01.global_position
func _apply_spawn_point() -> void:
if player.has_scene_position_override:
return
var spawnName: String = SceneManager.get_next_spawn_name()
var markerName: String = spawnName if not spawnName.is_empty() else "DefaultSpawn"
var marker := $Markers.get_node_or_null(markerName) as Marker2D
@@ -75,8 +88,7 @@ func _configure_camera() -> void:
playerCamera.limit_smoothed = true
func _connect_exit_area() -> void:
if not exitToWorkZoneArea.body_entered.is_connected(_on_exit_area_body_entered):
exitToWorkZoneArea.body_entered.connect(_on_exit_area_body_entered)
exitToWorkZoneArea.collision_mask = 0
func _connect_recruitment_area() -> void:
cafeRecruitmentLogoArea.input_pickable = true
@@ -92,7 +104,30 @@ func _connect_cafe_companion_events() -> void:
eventSystem.call("connect_event", EventNames.CAFE_COMPANION_EMPLOYMENT_RESIGNED, _on_cafe_companion_employment_resigned, self)
func _on_exit_area_body_entered(body: Node2D) -> void:
if _isChangingScene or body != player:
return
func get_interaction_actions(local_player: Node2D) -> Array[Dictionary]:
if _isChangingScene or exitToWorkZoneArea == null:
return []
var anchor_position: Vector2 = InteractionAnchorUtil.get_position(exitToWorkZoneArea)
var distance: float = anchor_position.distance_to(local_player.global_position)
if distance > 160.0:
return []
return [{
"id": "cafe_exit",
"title": "离开咖啡馆",
"distance": distance,
"priority": 20,
"callback": Callable(self, "_leave_to_work_zone"),
}]
func get_interaction_marker_positions() -> Array[Vector2]:
if exitToWorkZoneArea == null:
return []
return [InteractionAnchorUtil.get_position(exitToWorkZoneArea)]
func _leave_to_work_zone() -> void:
if _isChangingScene:
return
_isChangingScene = true
SceneManager.set_next_scene_position(WORK_ZONE_CAFE_RETURN_POSITION)