diff --git a/asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png b/asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png index bf0e4569..1bb8cb86 100644 Binary files a/asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png and b/asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png differ diff --git a/asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png similarity index 100% rename from asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png rename to asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png diff --git a/asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png.import b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png.import similarity index 66% rename from asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png.import rename to asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png.import index 7d15756f..6b97ed9b 100644 --- a/asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png.import +++ b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d1seskftkw08q" -path="res://.godot/imported/ux_特写.png-1bf2ad5cea03c36104dde1b0e1871ce8.ctex" +path="res://.godot/imported/ux_盒子猫初次特写.png-45d69af7b2220ef3d2f7625659dede96.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png" -dest_files=["res://.godot/imported/ux_特写.png-1bf2ad5cea03c36104dde1b0e1871ce8.ctex"] +source_file="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png" +dest_files=["res://.godot/imported/ux_盒子猫初次特写.png-45d69af7b2220ef3d2f7625659dede96.ctex"] [params] diff --git a/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png new file mode 100644 index 00000000..8340f4c7 Binary files /dev/null and b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png differ diff --git a/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png.import b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png.import new file mode 100644 index 00000000..f05620b4 --- /dev/null +++ b/asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://k6164drvkbg8" +path="res://.godot/imported/ux_盒子猫结束特写.png-6681c8f956e2edc234ef8accba73330a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png" +dest_files=["res://.godot/imported/ux_盒子猫结束特写.png-6681c8f956e2edc234ef8accba73330a.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 c2fa058b..c2827a5b 100644 --- a/asset/dialogue/inspect_content.csv +++ b/asset/dialogue/inspect_content.csv @@ -25,5 +25,5 @@ c02_保卫科花名册3,二零一二 张文开,,, c02_保卫科花名册4,二零一三 方启钊 方小蝉,,, c02_保卫科花名册5,三零一二(看不清),,, c02_保卫科花名册6,三零一三(看不清),,, -c02_保卫科花名册7,墙里有东西!,,, -c02_保卫科花名册8,血脚印,脏(看不清)都给我滚出去!,,, +c02_保卫科花名册7,墙里有脏东西!,,, +c02_保卫科花名册8,把我的鞋子拿给老鼠,引开那个疯男人!,,, diff --git a/asset/dialogue/inspect_content.dialogue b/asset/dialogue/inspect_content.dialogue index 5a87c815..1776179b 100644 --- a/asset/dialogue/inspect_content.dialogue +++ b/asset/dialogue/inspect_content.dialogue @@ -39,6 +39,7 @@ 三零一二(看不清) [ID:c02_保卫科花名册5] 三零一三(看不清) [ID:c02_保卫科花名册6] -墙里有东西! [ID:c02_保卫科花名册7] -血脚印,脏(看不清)都给我滚出去! [ID:c02_保卫科花名册8] +墙里有脏东西! [ID:c02_保卫科花名册7] +把我的鞋子拿给老鼠,引开那个疯男人! [ID:c02_保卫科花名册8] => END + diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 81c265f4..45ff434d 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -10,6 +10,7 @@ c02_小蝉寻人启事_脸部破碎,寻人启事...画像和字迹都看不清 小猫玩具发光,嗯?玩具在发光,,,,, setting_画册,画册(G),,,,, notes_干掉的血迹,干掉的血迹,,,,, +c02_瞎子卧室_血脚印,这画上的脚印和刚刚看到的一样。,,,,, index_新游戏,新游戏,,,,,New Game index_继续游戏,继续游戏,,,,,Resume index_退出游戏,退出游戏,,,,,Exit @@ -169,8 +170,8 @@ c02_二楼老鼠洞,到处都是老鼠洞,怕不是整栋楼都被老鼠打通 c02_二楼血脚印,又是这种小小尖尖的血脚印...,,,,, c02_离开红色演出,刚才那些...到底是怎么回事?,,,,, c02_瞎子卧室_八卦图,「乾三连,坤六断;震仰盂,艮覆碗;离中虚,坎中满;兑上缺,巽下断」
咦,这口诀是谁教我的来着...,,,,, -c02_瞎子卧室_血脚印,这画上的脚印和刚刚看到的一样。,,,,, c02_瞎子卧室_十字架,院长房间里也有一个类似的十字架。,,,,, +c02_小蝉恨他们,我恨他们!,,,,, c02_火灾等待准备,还没准备好点火呢,,,,, c02_霸凌救小蝉开始,啊!我得想办法帮帮那个小女孩...,,,,, c02_点火前阻止右移,没时间浪费了!想想办法救出小蝉...,,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index e2fc2ce5..c2920bd1 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -213,8 +213,8 @@ # c02 瞎子卧室 刚才那些...到底是怎么回事? [ID:c02_离开红色演出] 「乾三连,坤六断;震仰盂,艮覆碗;离中虚,坎中满;兑上缺,巽下断」
咦,这口诀是谁教我的来着... [ID:c02_瞎子卧室_八卦图] -这画上的脚印和刚刚看到的一样。 [ID:c02_瞎子卧室_血脚印] 院长房间里也有一个类似的十字架。[ID:c02_瞎子卧室_十字架] +我恨他们![ID:c02_小蝉恨他们] # c02 火灾 还没准备好点火呢 [ID:c02_火灾等待准备] 啊!我得想办法帮帮那个小女孩... [ID:c02_霸凌救小蝉开始] diff --git a/scene/entity/ux/content_inspector.gd b/scene/entity/ux/content_inspector.gd index f06a7dba..21220518 100644 --- a/scene/entity/ux/content_inspector.gd +++ b/scene/entity/ux/content_inspector.gd @@ -37,6 +37,8 @@ func _setup_content(): func _unhandled_input(event: InputEvent) -> void: + if not visible: + return if event.is_action_pressed("interact"): if not visible: visible = true diff --git a/scene/entity/ux/content_inspector.tscn b/scene/entity/ux/content_inspector.tscn index 26aea139..3c193e7d 100644 --- a/scene/entity/ux/content_inspector.tscn +++ b/scene/entity/ux/content_inspector.tscn @@ -13,6 +13,7 @@ grow_vertical = 2 script = ExtResource("1_4n727") [node name="TipContainer" type="MarginContainer" parent="."] +z_index = 100 layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 diff --git a/scene/ground/scene/c02/s08_animation.gd b/scene/ground/scene/c02/s08_animation.gd index d0885122..2de5da23 100644 --- a/scene/ground/scene/c02/s08_animation.gd +++ b/scene/ground/scene/c02/s08_animation.gd @@ -58,7 +58,7 @@ func _on_ground_ready() -> void: $"../DeployLayer/portal_left".status = "opened" # 玩过小猫游戏,画框内容更新 禁止再进入 boxcat_portal.get_node("Sprite2D").texture = preload("uid://b8sv81cw7mcn4") # e_墙上纸张_blood - $"../DeployLayer/Note画上脚印".enabled = true + $"../DeployLayer/Closeup讨厌他们".enabled = true if data["first_entered"]: set_data("first_entered", false) diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn index 74872b5f..07b1b667 100644 --- a/scene/ground/scene/c02/s08_瞎子卧室.tscn +++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=3 uid="uid://ce2vyyg2reg52"] +[gd_scene load_steps=40 format=3 uid="uid://ce2vyyg2reg52"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_judx3"] [ext_resource type="Script" uid="uid://hbbgymjs5xte" path="res://scene/ground/scene/c02/s08_animation.gd" id="2_m4uw8"] @@ -25,6 +25,7 @@ [ext_resource type="Texture2D" uid="uid://bmid3iu2ch35o" path="res://asset/art/scene/c02/s08_瞎子卧室/八卦图.png" id="12_1ws4i"] [ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="13_t3h08"] [ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="14_1ws4i"] +[ext_resource type="PackedScene" uid="uid://cxv7vdgwb8lqb" path="res://scene/ground/script/c02/s08_画特写2.tscn" id="16_nub1x"] [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="17_5fx68"] [ext_resource type="Texture2D" uid="uid://dcot0rove27rd" path="res://asset/art/scene/c02/s08_瞎子卧室/e_粘鼠板.png" id="18_dkqw0"] [ext_resource type="AudioStream" uid="uid://mff0udi3glb4" path="res://asset/audio/sfx/交互/第一章/瞎子房间癞子呼吸.wav" id="20_ujhuc"] @@ -142,7 +143,7 @@ bus = &"game_sfx" script = ExtResource("3_t3h08") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" -[node name="BGSprite2D" parent="Ground" index="1"] +[node name="BGSprite2D" parent="Ground" index="2"] texture = ExtResource("3_iares") [node name="ColorMask" type="ColorRect" parent="Ground/BGSprite2D" index="0"] @@ -202,11 +203,10 @@ position = Vector2(214, -19) packed_scene = ExtResource("11_mc126") enabled = false -[node name="Note画上脚印" parent="Ground/DeployLayer" index="4" instance=ExtResource("14_1ws4i")] +[node name="Closeup讨厌他们" parent="Ground/DeployLayer" index="4" instance=ExtResource("10_a48k2")] position = Vector2(214, -19) +packed_scene = ExtResource("16_nub1x") enabled = false -title_filter = "c02" -note_key = "c02_瞎子卧室_血脚印" [node name="灯座Sprite2D" type="Sprite2D" parent="Ground/DeployLayer" index="5"] position = Vector2(169, 18) @@ -332,6 +332,7 @@ texture = ExtResource("12_1ws4i") position = Vector2(105, 70) texture = ExtResource("18_dkqw0") sign_mark_offset = Vector2(0, -9.34) +action_key = 4 prop_key = "prop_粘鼠板" [node name="下洞黑化Light" type="PointLight2D" parent="Ground/AmbientLayer" index="0"] @@ -352,7 +353,7 @@ occluder = SubResource("OccluderPolygon2D_vjjde") [node name="LightOccluder2DDown" type="LightOccluder2D" parent="Ground/AmbientLayer/下洞口Occluder"] occluder = SubResource("OccluderPolygon2D_qem0g") -[node name="MainPlayer" parent="Ground" index="4"] +[node name="MainPlayer" parent="Ground" index="5"] position = Vector2(513, 88) lock_move_right = true character = "吕萍爬行" @@ -378,7 +379,7 @@ position = Vector2(1, 147) [node name="PlayerLine2D" parent="Ground/ParallaxForeground" index="2"] points = PackedVector2Array(580, 150, 690, 150) -[node name="DirectionalLight2D" parent="Ground" index="7"] +[node name="DirectionalLight2D" parent="Ground" index="8"] visible = false energy = 0.9 blend_mode = 1 diff --git a/scene/ground/script/c02/s08_画特写.tscn b/scene/ground/script/c02/s08_画特写.tscn index 78e2eb15..e01b9cf9 100644 --- a/scene/ground/script/c02/s08_画特写.tscn +++ b/scene/ground/script/c02/s08_画特写.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://dd8dfoik0ig3y"] [ext_resource type="Script" uid="uid://dnrql1t0j6v8i" path="res://scene/ground/script/c02/通用特写脚本.gd" id="1_jgyts"] -[ext_resource type="Texture2D" uid="uid://d1seskftkw08q" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_特写.png" id="2_jo6o1"] +[ext_resource type="Texture2D" uid="uid://d1seskftkw08q" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png" id="2_jo6o1"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="3_myoho"] [node name="s08_画特写" type="CanvasLayer"] diff --git a/scene/ground/script/c02/s08_画特写2.tscn b/scene/ground/script/c02/s08_画特写2.tscn new file mode 100644 index 00000000..9ffc3eec --- /dev/null +++ b/scene/ground/script/c02/s08_画特写2.tscn @@ -0,0 +1,70 @@ +[gd_scene load_steps=8 format=3 uid="uid://cxv7vdgwb8lqb"] + +[ext_resource type="Script" uid="uid://dnrql1t0j6v8i" path="res://scene/ground/script/c02/通用特写脚本.gd" id="1_2sinf"] +[ext_resource type="Texture2D" uid="uid://k6164drvkbg8" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png" id="2_qrck0"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop_and_bag/特写通用遮罩.png" id="3_7dv3t"] +[ext_resource type="Texture2D" uid="uid://tcjm158n8hnw" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/小脚脚印.png" id="4_tja8r"] +[ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="5_75okh"] +[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="6_ybyuk"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="7_tja8r"] + +[node name="s08_盒子猫初次特写" type="CanvasLayer"] +script = ExtResource("1_2sinf") + +[node name="TextureRect" type="TextureRect" parent="."] +offset_right = 40.0 +offset_bottom = 40.0 +texture = ExtResource("2_qrck0") + +[node name="遮罩" type="TextureRect" parent="."] +offset_left = -35.0 +offset_top = -3.0 +offset_right = 585.0 +offset_bottom = 313.0 +texture = ExtResource("3_7dv3t") + +[node name="TextureFootprint" type="TextureRect" parent="."] +light_mask = 49 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -50.5 +offset_top = -68.5 +offset_right = 50.5 +offset_bottom = 68.5 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("4_tja8r") + +[node name="PointLight2D" type="PointLight2D" parent="TextureFootprint"] +light_mask = 33 +position = Vector2(45.5, 72.5) +range_item_cull_mask = 32 +texture = ExtResource("5_75okh") + +[node name="ContentInspector" parent="." instance=ExtResource("6_ybyuk")] + +[node name="遮罩" type="TextureRect" parent="ContentInspector"] +offset_left = -35.0 +offset_top = -3.0 +offset_right = 585.0 +offset_bottom = 313.0 +texture = ExtResource("7_tja8r") + +[node name="Label" type="Label" parent="ContentInspector"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -36.5 +offset_top = -7.0 +offset_right = 36.5 +offset_bottom = 7.0 +grow_horizontal = 2 +grow_vertical = 2 +text = "c02_小蝉恨他们" diff --git a/scene/ground/script/c02/花名册.gd b/scene/ground/script/c02/花名册.gd index e87e9470..a62cce15 100644 --- a/scene/ground/script/c02/花名册.gd +++ b/scene/ground/script/c02/花名册.gd @@ -20,5 +20,4 @@ func _on_button_pressed() -> void: if click_count == 1: button.texture_normal = texture_dict["1"] button.set_anchors_preset(Control.PRESET_CENTER) - else: - $HBoxContainer.visible = click_count % 2 == 0 + $ContentInspector.visible = true diff --git a/scene/ground/script/c02/花名册.tscn b/scene/ground/script/c02/花名册.tscn index 55adca66..f6eadfb1 100644 --- a/scene/ground/script/c02/花名册.tscn +++ b/scene/ground/script/c02/花名册.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=5 format=3 uid="uid://b8i6tqwdvvddy"] +[gd_scene load_steps=6 format=3 uid="uid://b8i6tqwdvvddy"] [ext_resource type="Script" uid="uid://cmapmn0v70p4l" path="res://scene/ground/script/c02/花名册.gd" id="1_jin3n"] [ext_resource type="Texture2D" uid="uid://cypvxj1vsl5yk" path="res://asset/art/scene/c02/s04_保卫科/花名册/bg_花名册桌面.png" id="2_v047l"] [ext_resource type="Texture2D" uid="uid://sx3i3lkt2vfd" path="res://asset/art/scene/c02/s04_保卫科/花名册/花名册封皮.png" id="3_myeas"] +[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="4_1s4sv"] [ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop_and_bag/inspect背景遮罩.png" id="4_myeas"] -[node name="折锡纸" type="CanvasLayer"] +[node name="花名册" type="CanvasLayer"] script = ExtResource("1_jin3n") [node name="TextureRect" type="TextureRect" parent="."] @@ -30,24 +31,28 @@ grow_horizontal = 2 grow_vertical = 2 texture_normal = ExtResource("3_myeas") -[node name="HBoxContainer" type="TextureRect" parent="."] +[node name="ContentInspector" parent="." instance=ExtResource("4_1s4sv")] visible = false +mouse_filter = 2 + +[node name="HBoxContainer" type="TextureRect" parent="ContentInspector"] custom_minimum_size = Vector2(200, 0) +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -125.0 -offset_top = -48.0 -offset_right = 125.0 -offset_bottom = 48.0 +offset_left = -282.0 +offset_top = -120.0 +offset_right = 282.0 +offset_bottom = 120.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 texture = ExtResource("4_myeas") -[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="ContentInspector/HBoxContainer"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -62,34 +67,34 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -[node name="Label1" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label1" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册1" -[node name="Label2" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label2" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册2" -[node name="Label3" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label3" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册3" -[node name="Label4" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label4" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册4" -[node name="Label5" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label5" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册5" -[node name="Label6" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label6" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册6" -[node name="Label7" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label7" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册7" -[node name="Label8" type="Label" parent="HBoxContainer/VBoxContainer"] +[node name="Label8" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"] layout_mode = 2 text = "c02_保卫科花名册8"