diff --git a/asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg b/asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg new file mode 100644 index 00000000..2cf18dff Binary files /dev/null and b/asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg differ diff --git a/asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg.import b/asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg.import new file mode 100644 index 00000000..3443843b --- /dev/null +++ b/asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://owp3occawow5" +path="res://.godot/imported/sfx_拖箱子.ogg-8ff2deb8a5ad1c41bd9a5092a16fdcc5.oggvorbisstr" + +[deps] + +source_file="res://asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg" +dest_files=["res://.godot/imported/sfx_拖箱子.ogg-8ff2deb8a5ad1c41bd9a5092a16fdcc5.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scene/ground/scene/c02/s10_空房间.gd b/scene/ground/scene/c02/s10_空房间.gd index 1145ee9d..3bffa3bf 100644 --- a/scene/ground/scene/c02/s10_空房间.gd +++ b/scene/ground/scene/c02/s10_空房间.gd @@ -28,7 +28,7 @@ var wood_puppet: Pickable2D var catty_head: Pickable2D var door: Portal2D var portal_note: Note2D - +@onready var sfx_drag_box := $"Sfx拖箱子" as Sfx func _on_ground_ready() -> void: xiao_chan_sprite = $"../DeployLayer/大头小蝉" @@ -173,12 +173,17 @@ func _on_counter_interacted(): player.position_updated.connect(on_player_moved_counter) pushing_counter = !pushing_counter +var _player_last_pos: Vector2 func on_player_moved_counter(global_pos: Vector2): var x = global_pos.x + player_pull_offset_x ArchiveManager.set_global_entry(&"c02_counter_x", x) counter.global_position.x = x after_counter_moved() + if _player_last_pos != global_pos: + _player_last_pos = global_pos + if not sfx_drag_box.playing: + sfx_drag_box.play() func _input(event: InputEvent) -> void: diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index 5697c264..8bec89eb 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=3 uid="uid://dny21yhtuteap"] +[gd_scene load_steps=35 format=3 uid="uid://dny21yhtuteap"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_w7j0m"] [ext_resource type="Script" uid="uid://dkkey7qillk15" path="res://scene/ground/scene/c02/s10_空房间.gd" id="2_egtqi"] @@ -15,6 +15,7 @@ [ext_resource type="Texture2D" uid="uid://dg43u88jwlbpu" path="res://asset/art/prop/c02/新小猫头.png" id="8_3ftnp"] [ext_resource type="AudioStream" uid="uid://b8sbtn3l37uh" path="res://asset/audio/sfx/旧版/c02/红屏.ogg" id="8_apn51"] [ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="8_to1d1"] +[ext_resource type="AudioStream" uid="uid://owp3occawow5" path="res://asset/audio/sfx/交互/第一章/sfx_拖箱子.ogg" id="9_alb6s"] [ext_resource type="Texture2D" uid="uid://cdsq0ylmgtfq0" path="res://asset/art/prop/c02/小蝉人偶.png" id="12_27dvh"] [ext_resource type="PackedScene" uid="uid://cxw5rovg5mu1a" path="res://scene/ground/script/c02/s00_煤油灯.tscn" id="13_27dvh"] [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="14_3ftnp"] @@ -124,6 +125,12 @@ bus = &"game_sfx" script = ExtResource("6_6uftv") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" +[node name="Sfx拖箱子" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="5"] +stream = ExtResource("9_alb6s") +bus = &"game_sfx" +script = ExtResource("6_6uftv") +metadata/_custom_type_script = "uid://rq6w1vuhuq1m" + [node name="BGSprite2D" parent="Ground" index="2"] position = Vector2(26, 0) texture = ExtResource("3_ox8et") diff --git a/scene/ground/script/c02/老鼠精画像.tscn b/scene/ground/script/c02/老鼠精画像.tscn index d99347bc..c4811b95 100644 --- a/scene/ground/script/c02/老鼠精画像.tscn +++ b/scene/ground/script/c02/老鼠精画像.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://cdf2qe8l7323i"] +[gd_scene load_steps=8 format=3 uid="uid://cdf2qe8l7323i"] [ext_resource type="Script" uid="uid://dyk58stu5enia" path="res://scene/ground/script/c02/老鼠精画像.gd" id="1_l77sh"] [ext_resource type="Texture2D" uid="uid://d1xr7g5huv5or" path="res://asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png" id="2_eyynm"] @@ -6,6 +6,7 @@ [ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_lpmq3"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_u15ce"] [ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="4_l77sh"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="7_u15ce"] [node name="老鼠精画像" type="CanvasLayer"] script = ExtResource("1_l77sh") @@ -58,3 +59,13 @@ grow_vertical = 2 text = "c02_保卫科老鼠精" horizontal_alignment = 1 autowrap_mode = 3 + +[node name="遮罩" type="TextureRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("7_u15ce") +expand_mode = 5 +stretch_mode = 5