diff --git a/asset/art/scene/c02/s04_保卫科/血迹.png b/asset/art/scene/c02/s04_保卫科/血迹.png new file mode 100644 index 00000000..9a842b76 Binary files /dev/null and b/asset/art/scene/c02/s04_保卫科/血迹.png differ diff --git a/asset/art/scene/c02/s04_保卫科/血迹.png.import b/asset/art/scene/c02/s04_保卫科/血迹.png.import new file mode 100644 index 00000000..b60da619 --- /dev/null +++ b/asset/art/scene/c02/s04_保卫科/血迹.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpqcmpixriw8p" +path="res://.godot/imported/血迹.png-06d34100d6900976d08b8b76868b322c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s04_保卫科/血迹.png" +dest_files=["res://.godot/imported/血迹.png-06d34100d6900976d08b8b76868b322c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/dialogue/inspect_content.csv b/asset/dialogue/inspect_content.csv index 38e7b0dc..2e1b71b9 100644 --- a/asset/dialogue/inspect_content.csv +++ b/asset/dialogue/inspect_content.csv @@ -28,11 +28,11 @@ c02_保卫科花名册6,三〇一三 （看不清）,,,,3013 (Illegible) c02_保卫科花名册7,把我的鞋子拿给老鼠，老鼠会引开那个疯男人,,,,"Give my shoes to the rats, the rats will lure away that crazy man" c02_保卫科花名册8,不要相信墙里的东西！,,,,Don't trust what's in the wall! c03_保卫科花名册1,一〇一四 空,,,, -c03_保卫科花名册2,一〇一五 *** **,,,, +c03_保卫科花名册2,一〇一五 （看不清）,,,, c03_保卫科花名册3,二〇一三 张文开,,,, -c03_保卫科花名册4,二〇一五 *** 方小蝉,,,, -c03_保卫科花名册5,三〇一二 **,,,, -c03_保卫科花名册6,三** ***,,,, +c03_保卫科花名册4,二〇一五 （看不清） 方小蝉,,,, +c03_保卫科花名册5,三〇一二 （看不清）,,,, +c03_保卫科花名册6,三（看不清）,,,, c03_保卫科花名册7,多言数穷，不如守中,,,, c02_小猫纸条,大哥！今晚老地方见 /井\,,,,Big brother! Meet at the usual place tonight /well\ c02_议论文字1,你说的是真的啊？,,,,Is what you're saying really true? diff --git a/asset/dialogue/inspect_content.dialogue b/asset/dialogue/inspect_content.dialogue index bb1a5081..aa679783 100644 --- a/asset/dialogue/inspect_content.dialogue +++ b/asset/dialogue/inspect_content.dialogue @@ -45,12 +45,11 @@ ~ c03_保卫科花名册 一〇一四 空 [ID:c03_保卫科花名册1] -一〇一五 *** ** [ID:c03_保卫科花名册2] +一〇一五 （看不清） [ID:c03_保卫科花名册2] 二〇一三 张文开 [ID:c03_保卫科花名册3] -二〇一五 *** 方小蝉 [ID:c03_保卫科花名册4] - -三〇一二 ** [ID:c03_保卫科花名册5] -三** *** [ID:c03_保卫科花名册6] +二〇一五 （看不清） 方小蝉 [ID:c03_保卫科花名册4] +三〇一二 （看不清） [ID:c03_保卫科花名册5] +三（看不清） [ID:c03_保卫科花名册6] 多言数穷，不如守中 [ID:c03_保卫科花名册7] => END diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 2c64ce55..9aafe188 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -227,7 +227,7 @@ c02_保卫科花名册os,登记簿？{br}刚才那个小孩在上面写了些什 c02_保卫科花名册首次互动结束,3012？上面有我的名字，看来确实是这里... {br}先去三楼看看吧,,,,,"3012? My name is on it, so this really is the place...{br}Let me go check the third floor first" c02_保卫科祭台os,祭台是专门供奉这只大老鼠的？,,,,,Is this altar specifically for worshipping this big rat? c02_保卫科老鼠精,鼠歌 {br}{br}天地小如喉，{br}红轮自吞吐。{br}多少世间人，{br}都被红轮误。,,,,,"Rat Song{br}{br}Heaven and earth small as a throat,{br}The red wheel swallows itself.{br}How many worldly people{br}Are misled by the red wheel." -c02_保卫科老鼠精_第二章,莫被红轮误莫被红轮误{br}莫被红轮误莫被红轮误{br}莫被红轮误莫被红轮误,,,,, +c02_保卫科老鼠精_第二章,莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误,,,,, c02_小手还能换什么,...还有什么东西能跟它交换呢？,,,,,...what else can I trade with it? c02_小手出现摔倒,？！,,,,,?! c02_小手是什么鬼,这是什么鬼东西，它是在讨要什么,,,,,What the hell is this thing? What is it asking for? @@ -341,5 +341,5 @@ c03_s12_label7,[wave]反正...都一样吧[/wave],,,,, c03_s12_label8,[wave]又嫩又甜[/wave],,,,, c03_李癞胖演出结束,怎么突然出现这么多人？{br}要不跟过去看看？,,,,, c03_冷飕飕风吹过,...{br}这股风...,,,,, -c03_保卫科_李癞拜老鼠精,？！{br}他们这是...在拜老鼠精？,,,,, +c03_保卫科_李癞拜老鼠精,？！{br}他们这是...在拜那幅像？,,,,, c03_小手洞1,洞里有很浓的血腥味...,,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 66682d44..4fc83497 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -291,7 +291,7 @@ 3012？上面有我的名字，看来确实是这里... {br}先去三楼看看吧[ID:c02_保卫科花名册首次互动结束] 祭台是专门供奉这只大老鼠的？ [ID:c02_保卫科祭台os] 鼠歌 {br}{br}天地小如喉，{br}红轮自吞吐。{br}多少世间人，{br}都被红轮误。 [ID:c02_保卫科老鼠精] -莫被红轮误莫被红轮误{br}莫被红轮误莫被红轮误{br}莫被红轮误莫被红轮误 [ID:c02_保卫科老鼠精_第二章] +莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误莫被红轮误 [ID:c02_保卫科老鼠精_第二章] #小手 ...还有什么东西能跟它交换呢？ [ID:c02_小手还能换什么] ？！ [ID:c02_小手出现摔倒] @@ -428,7 +428,7 @@ # 李癞胖演出结束 怎么突然出现这么多人？{br}要不跟过去看看？[ID:c03_李癞胖演出结束] ...{br}这股风...[ID:c03_冷飕飕风吹过] -？！{br}他们这是...在拜老鼠精？[ID:c03_保卫科_李癞拜老鼠精] +？！{br}他们这是...在拜那幅像？[ID:c03_保卫科_李癞拜老鼠精] # 小手 洞里有很浓的血腥味...[ID:c03_小手洞1] => END diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index c8e6e274..98f7470d 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/scene/ground/scene/c02/s04_保卫科.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=3 uid="uid://bivc5cdap370p"] +[gd_scene load_steps=38 format=3 uid="uid://bivc5cdap370p"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_2jej0"] [ext_resource type="Script" uid="uid://dmhh4g47bdxxy" path="res://scene/ground/scene/c02/s04_保卫科.gd" id="2_jyere"] @@ -6,7 +6,6 @@ [ext_resource type="AudioStream" uid="uid://b2mudqvq1dmng" path="res://asset/audio/sfx/环境音/白噪音/白噪声房间里1.ogg" id="3_g8amr"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_cq2m4"] [ext_resource type="SpriteFrames" uid="uid://c2sjavnptjn" path="res://asset/art/gif/c02_保卫科/c02_保卫科_frames.tres" id="4_svuj3"] -[ext_resource type="AudioStream" uid="uid://cukox0pnlbd1a" path="res://asset/audio/mixkit/mixkit-female-astonished-gasp-964.ogg" id="5_c6o7a"] [ext_resource type="Texture2D" uid="uid://bnyf8m63ltgh0" path="res://asset/art/scene/c02/s04_保卫科/l_香.png" id="5_cy26p"] [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="6_66gue"] [ext_resource type="PackedScene" uid="uid://b8i6tqwdvvddy" path="res://scene/ground/script/c02/花名册.tscn" id="6_fvlg0"] @@ -34,8 +33,10 @@ [ext_resource type="SpriteFrames" uid="uid://cmvr3lbwe3h7p" path="res://asset/art/gif/c03_特写与游戏动画/c03_特写与游戏动画_frames.tres" id="30_hfptv"] [ext_resource type="Script" uid="uid://cphfob11f7atx" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.gd" id="31_16fvg"] [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="32_hfptv"] +[ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="32_rs2ug"] [ext_resource type="Texture2D" uid="uid://sm603s1un01x" path="res://asset/art/prop/c02/老虎钳物品.png" id="33_16fvg"] [ext_resource type="AudioStream" uid="uid://d0luawc546uoq" path="res://asset/audio/sfx/交互/第二章/sfx_s03_剪头惊悚.ogg" id="33_bjh7v"] +[ext_resource type="Texture2D" uid="uid://cpqcmpixriw8p" path="res://asset/art/scene/c02/s04_保卫科/血迹.png" id="36_rs2ug"] [node name="S04" type="Node2D"] @@ -90,47 +91,60 @@ target_portal = "1" [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(551, 22) -[node name="Local寻人启事" parent="Ground/DeployLayer" index="2" instance=ExtResource("19_k74x7")] +[node name="血迹" type="Sprite2D" parent="Ground/DeployLayer" index="2"] +self_modulate = Color(0.585062, 0.585062, 0.585062, 1) +position = Vector2(203, 107) +texture = ExtResource("36_rs2ug") + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/血迹"] +script = ExtResource("23_cq2m4") +updater_event = &"c03_lilai_worship_mouse" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([3]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="Local寻人启事" parent="Ground/DeployLayer" index="3" instance=ExtResource("19_k74x7")] position = Vector2(116, -1) texture = ExtResource("20_g8amr") texture_cover = ExtResource("21_cq2m4") content_key = "c02_寻人启事_完整" -[node name="Ambush进门看到小蝉" parent="Ground/DeployLayer" index="3" instance=ExtResource("7_ypth3")] +[node name="Ambush进门看到小蝉" parent="Ground/DeployLayer" index="4" instance=ExtResource("7_ypth3")] unique_name_in_owner = true position = Vector2(72, 51) hook_method = "xiaochan_disappear" -[node name="涂鸦提示" type="Sprite2D" parent="Ground/DeployLayer" index="4"] +[node name="涂鸦提示" type="Sprite2D" parent="Ground/DeployLayer" index="5"] position = Vector2(275, 13) texture = ExtResource("6_gk1h4") -[node name="小钳子提示" type="Sprite2D" parent="Ground/DeployLayer" index="5"] +[node name="小钳子提示" type="Sprite2D" parent="Ground/DeployLayer" index="6"] position = Vector2(270, -3) texture = ExtResource("9_k74x7") -[node name="Closeup折锡纸" parent="Ground/DeployLayer" index="6" instance=ExtResource("6_66gue")] +[node name="Closeup折锡纸" parent="Ground/DeployLayer" index="7" instance=ExtResource("6_66gue")] unique_name_in_owner = true position = Vector2(189, 15) packed_scene = ExtResource("7_fvlg0") on_display_hide_hud = true first_interact_os_key = "c02_保卫科祭台os" -[node name="Closeup老鼠精" parent="Ground/DeployLayer" index="7" instance=ExtResource("6_66gue")] +[node name="Closeup老鼠精" parent="Ground/DeployLayer" index="8" instance=ExtResource("6_66gue")] light_mask = 5 position = Vector2(207.5, -40.5) texture = ExtResource("11_ffvrp") packed_scene = ExtResource("8_cm3g6") on_display_hide_hud = true -[node name="Closeup花名册" parent="Ground/DeployLayer" index="8" instance=ExtResource("6_66gue")] +[node name="Closeup花名册" parent="Ground/DeployLayer" index="9" instance=ExtResource("6_66gue")] unique_name_in_owner = true position = Vector2(351, 31) packed_scene = ExtResource("6_fvlg0") on_display_hide_hud = true first_interact_os_key = "c02_保卫科花名册os" -[node name="煤油灯" type="Sprite2D" parent="Ground/DeployLayer" index="9"] +[node name="煤油灯" type="Sprite2D" parent="Ground/DeployLayer" index="10"] position = Vector2(370, 39) [node name="灯光" type="AnimatedSprite2D" parent="Ground/DeployLayer/煤油灯"] @@ -147,7 +161,7 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("9_a43aq") -[node name="小手讨东西" parent="Ground/DeployLayer" index="10" instance=ExtResource("10_a43aq")] +[node name="小手讨东西" parent="Ground/DeployLayer" index="11" instance=ExtResource("10_a43aq")] position = Vector2(295, -6) [node name="EventBinder" type="Node" parent="Ground/DeployLayer/小手讨东西"] @@ -158,12 +172,12 @@ updater_ease_duration = 0.0 updater_stages = Array[int]([0, 1, 2]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" -[node name="小蝉写字" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="11"] +[node name="小蝉写字" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="12"] position = Vector2(351, 51) sprite_frames = ExtResource("20_47ju4") animation = &"c00_头套小婵_write" -[node name="老鼠精_第二章" type="Sprite2D" parent="Ground/DeployLayer" index="12"] +[node name="老鼠精_第二章" type="Sprite2D" parent="Ground/DeployLayer" index="13"] self_modulate = Color(0.493545, 0.493546, 0.493546, 1) position = Vector2(206.5, -41.5) texture = ExtResource("23_vppvs") @@ -201,42 +215,6 @@ position = Vector2(88.5, 28.5) title_filter = "c03" note_key = "c03_小手洞1" -[node name="Event李癞拜老鼠精" type="Node2D" parent="Ground/DeployLayer" index="13"] -script = ExtResource("29_0iy73") -event_name = &"c03_lilai_worship_mouse" -event_stages = Array[int]([1, 2, 3]) -metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" - -[node name="Pro李癞拜老鼠精" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event李癞拜老鼠精"] -visible = false -position = Vector2(214, 35) -sprite_frames = ExtResource("30_hfptv") -animation = &"李癞拜老鼠精" -autoplay = "李癞拜老鼠精" -script = ExtResource("31_16fvg") -metadata/_custom_type_script = "uid://cphfob11f7atx" - -[node name="Pro陆仁剪舌头" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event李癞拜老鼠精"] -visible = false -position = Vector2(212, 30) -sprite_frames = ExtResource("30_hfptv") -animation = &"陆仁剪李氏舌头" -script = ExtResource("31_16fvg") -autostart = false -metadata/_custom_type_script = "uid://cphfob11f7atx" - -[node name="Sfx拔舌头" type="AudioStreamPlayer" parent="Ground/DeployLayer/Event李癞拜老鼠精"] -stream = ExtResource("5_c6o7a") -bus = &"game_sfx" -script = ExtResource("4_cq2m4") -metadata/_custom_type_script = "uid://rq6w1vuhuq1m" - -[node name="Sfx拔舌头amb" type="AudioStreamPlayer" parent="Ground/DeployLayer/Event李癞拜老鼠精"] -stream = ExtResource("33_bjh7v") -bus = &"game_sfx" -script = ExtResource("4_cq2m4") -metadata/_custom_type_script = "uid://rq6w1vuhuq1m" - [node name="Pickable老虎钳" parent="Ground/DeployLayer" index="14" instance=ExtResource("32_hfptv")] position = Vector2(171, 78) as_important_item = true @@ -256,6 +234,57 @@ updater_stage_mode = "exclude" updater_stages = Array[int]([0, 1]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" +[node name="Event李癞拜老鼠精" type="Node2D" parent="Ground/DeployLayer" index="15"] +script = ExtResource("29_0iy73") +event_name = &"c03_lilai_worship_mouse" +event_stages = Array[int]([1, 2, 3]) +metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" + +[node name="Pro李癞拜老鼠精" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event李癞拜老鼠精"] +visible = false +position = Vector2(214, 35) +sprite_frames = ExtResource("30_hfptv") +animation = &"李癞拜老鼠精" +autoplay = "李癞拜老鼠精" +script = ExtResource("31_16fvg") +metadata/_custom_type_script = "uid://cphfob11f7atx" + +[node name="PointLight拜老鼠" type="PointLight2D" parent="Ground/DeployLayer/Event李癞拜老鼠精"] +visible = false +position = Vector2(205, 18) +energy = 0.6 +texture = ExtResource("32_rs2ug") +texture_scale = 0.5 + +[node name="PointLight剪舌头" type="PointLight2D" parent="Ground/DeployLayer/Event李癞拜老鼠精"] +visible = false +position = Vector2(195, 68) +scale = Vector2(1.5, 1) +energy = 3.0 +texture = ExtResource("32_rs2ug") +texture_scale = 0.52 + +[node name="Pro陆仁剪舌头" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event李癞拜老鼠精"] +visible = false +position = Vector2(212, 30) +sprite_frames = ExtResource("30_hfptv") +animation = &"陆仁剪李氏舌头" +script = ExtResource("31_16fvg") +autostart = false +metadata/_custom_type_script = "uid://cphfob11f7atx" + +[node name="血迹" type="Sprite2D" parent="Ground/DeployLayer/Event李癞拜老鼠精/Pro陆仁剪舌头"] +self_modulate = Color(0.585062, 0.585062, 0.585062, 1) +show_behind_parent = true +position = Vector2(-9, 77) +texture = ExtResource("36_rs2ug") + +[node name="Sfx拔舌头" type="AudioStreamPlayer" parent="Ground/DeployLayer/Event李癞拜老鼠精"] +stream = ExtResource("33_bjh7v") +bus = &"game_sfx" +script = ExtResource("4_cq2m4") +metadata/_custom_type_script = "uid://rq6w1vuhuq1m" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(447, 98) player_movement_rect = Rect2(66, -158, 429, 316) diff --git a/scene/ground/script/c02/s04_event李癞拜老鼠精.gd b/scene/ground/script/c02/s04_event李癞拜老鼠精.gd index 5fa825bc..a43d9818 100644 --- a/scene/ground/script/c02/s04_event李癞拜老鼠精.gd +++ b/scene/ground/script/c02/s04_event李癞拜老鼠精.gd @@ -22,21 +22,32 @@ func _on_ground_ready(_ground: Ground2D) -> void: func _on_pre_stage_updated() -> void: pass +@onready var pro_worship_sprite = $"Pro李癞拜老鼠精" as ProAnimatedSprite2D +@onready var light_worship = $"PointLight拜老鼠" as PointLight2D +@onready var light_cut_tounge = $"PointLight剪舌头" as PointLight2D func _on_stage_updated() -> void: - $"Pro李癞拜老鼠精".visible = stage == 1 + pro_worship_sprite.visible = stage == 1 if stage == 1: # 开始演出 SceneManager.get_player().set_facing_direction(Vector2.LEFT) SceneManager.lock_player() - await Util.wait(3.0) + light_worship.show() + light_worship.energy = 0.0 + var tween = create_tween() + tween.tween_property(light_worship, "energy", 0.6, 0.7) + await Util.wait(4.0) + tween = create_tween() + tween.tween_property(light_worship, "energy", 0.0, 0.7) + tween.parallel().tween_property(pro_worship_sprite, "modulate:a", 0.0, 1.0) + await tween.finished EventManager.set_stage_if_greater("c03_lilai_worship_mouse", 2) SceneManager.pop_os_with_str("c03_保卫科_李癞拜老鼠精") SceneManager.unlock_player() elif stage == 2: var portal = $"../portal_left" as Portal2D portal.before_pre_transport_wait.connect(_on_exit_room) - portal.pre_transport_wait_time = 2.0 + portal.pre_transport_wait_time = 1.0 func _on_exit_room() -> void: @@ -44,6 +55,16 @@ func _on_exit_room() -> void: EventManager.set_stage_if_greater("c03_lilai_worship_mouse", 3) var sprite = $"Pro陆仁剪舌头" as ProAnimatedSprite2D sprite.show() - $"Sfx拔舌头amb".global_play() - Util.timer(0.5, $"Sfx拔舌头".global_play) + sprite.play() + $"Sfx拔舌头".global_play() + # Util.timer(0.5, $"Sfx拔舌头".global_play) SceneManager.pop_debug_dialog_info("音效", "惊悚: 拔舌头") + + light_cut_tounge.show() + light_cut_tounge.energy = 0.0 + var tween = create_tween() + tween.tween_property(light_cut_tounge, "energy", 3.0, 0.1) + tween.tween_property(light_cut_tounge, "energy", 1.0, 0.05) + tween.tween_property(light_cut_tounge, "energy", 3.0, 0.05) + tween.tween_property(light_cut_tounge, "energy", 0.5, 0.05) + tween.tween_property(light_cut_tounge, "energy", 3.0, 0.05) diff --git a/scene/ground/script/c03/s04_closeup整理麻将游戏.tscn b/scene/ground/script/c03/s04_closeup整理麻将游戏.tscn index 99961afc..8cb80e74 100644 --- a/scene/ground/script/c03/s04_closeup整理麻将游戏.tscn +++ b/scene/ground/script/c03/s04_closeup整理麻将游戏.tscn @@ -27,15 +27,12 @@ [ext_resource type="FontFile" uid="uid://bnxdsxp7dst7f" path="res://asset/font/锐字太空混元像素简繁-闪 超黑_mianfeiziti.com.ttf" id="25_52d31"] [ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="26_u3cv7"] -[sub_resource type="AudioStreamInteractive" id="AudioStreamInteractive_u3cv7"] -clip_count = 2 -clip_0/name = &"八音盒打开" -clip_0/stream = ExtResource("2_aqudu") -clip_0/auto_advance = 1 -clip_0/next_clip = 1 -clip_1/name = &"瞎子房间癞子呼吸" -clip_1/stream = ExtResource("3_52d31") -clip_1/auto_advance = 0 +[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_u3cv7"] +stream_count = 2 +stream_0/stream = ExtResource("2_aqudu") +stream_0/volume = 0.0 +stream_1/stream = ExtResource("3_52d31") +stream_1/volume = -15.0 [sub_resource type="Animation" id="Animation_2kqht"] length = 0.001 @@ -265,7 +262,7 @@ script = ExtResource("1_npctd") metadata/_edit_horizontal_guides_ = [278.0] [node name="SfxEnterScene" type="AudioStreamPlayer" parent="."] -stream = SubResource("AudioStreamInteractive_u3cv7") +stream = SubResource("AudioStreamSynchronized_u3cv7") bus = &"game_sfx" script = ExtResource("3_oarv7") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ux/prop_hud.gd b/scene/ux/prop_hud.gd index b12fe35f..f352f422 100644 --- a/scene/ux/prop_hud.gd +++ b/scene/ux/prop_hud.gd @@ -594,7 +594,7 @@ func inspect_item(prop_key: String, display_obtained := true, inspect_content := if inspect_content: var content = get_item_description(prop_key) var wide = len(content) > 150 - inspector.pop_standard_inspection(texture, null, content, false, wide) + inspector.pop_standard_inspection(texture, null, content, not wide, wide) else: inspector.pop_prop_inspection(prop_key, texture, display_obtained) diff --git a/scene/ux/prop_inspector.tscn b/scene/ux/prop_inspector.tscn index 7ba62454..f50664e6 100644 --- a/scene/ux/prop_inspector.tscn +++ b/scene/ux/prop_inspector.tscn @@ -53,7 +53,6 @@ grow_vertical = 2 size_flags_vertical = 4 mouse_filter = 2 texture = ExtResource("2_wr575") -stretch_mode = 5 stretch_mode = 3 [node name="NotesBG" type="TextureRect" parent="."]