diff --git a/asset/art/scene/c03/s03_瞎子理发店/bg_瞎子理发店.png b/asset/art/scene/c03/s03_瞎子理发店/bg_瞎子理发店.png index 90fc01ef..663d3532 100644 Binary files a/asset/art/scene/c03/s03_瞎子理发店/bg_瞎子理发店.png and b/asset/art/scene/c03/s03_瞎子理发店/bg_瞎子理发店.png differ diff --git a/asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png b/asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png new file mode 100644 index 00000000..f08737de Binary files /dev/null and b/asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png differ diff --git a/asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png.import b/asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png.import new file mode 100644 index 00000000..9809cc30 --- /dev/null +++ b/asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccegq6vy705pn" +path="res://.godot/imported/e_笑脸.png-32e42ba30fb287e8a1440cc2f34075bc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png" +dest_files=["res://.godot/imported/e_笑脸.png-32e42ba30fb287e8a1440cc2f34075bc.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/art/scene/c03/s03_瞎子理发店/e_麻将.png b/asset/art/scene/c03/s03_瞎子理发店/e_麻将.png new file mode 100644 index 00000000..ad7b7679 Binary files /dev/null and b/asset/art/scene/c03/s03_瞎子理发店/e_麻将.png differ diff --git a/asset/art/scene/c03/s03_瞎子理发店/e_麻将.png.import b/asset/art/scene/c03/s03_瞎子理发店/e_麻将.png.import new file mode 100644 index 00000000..cdd4f9f9 --- /dev/null +++ b/asset/art/scene/c03/s03_瞎子理发店/e_麻将.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8kw48ppgb7cx" +path="res://.godot/imported/e_麻将.png-898bb3f1f94e6afcfd84fc7de108334a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s03_瞎子理发店/e_麻将.png" +dest_files=["res://.godot/imported/e_麻将.png-898bb3f1f94e6afcfd84fc7de108334a.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/art/scene/c03/s03_瞎子理发店/鬼母子神/1背.png b/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/1背.png index 4ab21bab..23b7f2ea 100644 Binary files a/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/1背.png and b/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/1背.png differ diff --git a/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/2正.png b/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/2正.png index 08a20d82..1dd3fdd4 100644 Binary files a/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/2正.png and b/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/2正.png differ diff --git a/asset/dialogue/event_stage.dialogue b/asset/dialogue/event_stage.dialogue index 8cb74418..8fed1baf 100644 --- a/asset/dialogue/event_stage.dialogue +++ b/asset/dialogue/event_stage.dialogue @@ -44,6 +44,8 @@ c03_intro_c04: 0:初始化 1:演出完成 => END ~ EventStage_c04 +# 三楼 + => END ~ EventStage_c05 diff --git a/scene/ground/scene/c03/s03_瞎子理发店.tscn b/scene/ground/scene/c03/s03_瞎子理发店.tscn index d1d212df..0ecaf366 100644 --- a/scene/ground/scene/c03/s03_瞎子理发店.tscn +++ b/scene/ground/scene/c03/s03_瞎子理发店.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://bsqt2c061fmin"] +[gd_scene load_steps=30 format=3 uid="uid://bsqt2c061fmin"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_40yjl"] [ext_resource type="Script" uid="uid://cim5bqm2nayls" path="res://scene/ground/scene/c03/s03_瞎子理发店.gd" id="2_irgvj"] @@ -15,6 +15,7 @@ [ext_resource type="PackedScene" uid="uid://dohvkxfdmcrw4" path="res://scene/ground/script/c03/s03_刮海报_理发店.tscn" id="8_xtr6o"] [ext_resource type="PackedScene" uid="uid://d320nw5yrmvjo" path="res://scene/ground/script/c03/s03_closeup癞子纸人.tscn" id="9_4imwu"] [ext_resource type="Texture2D" uid="uid://bv5vcrdqwtlm3" path="res://asset/art/scene/c03/s03_瞎子理发店/癞子纸人.png" id="9_bdtls"] +[ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="9_yw0mj"] [ext_resource type="Texture2D" uid="uid://ckboywu6sjcpc" path="res://asset/art/scene/c03/s03_瞎子理发店/癞子纸人头套.png" id="10_1pu6f"] [ext_resource type="Script" uid="uid://cp8osi230xaqa" path="res://scene/ground/script/c03/s03_event_2d癞子剪辫子.gd" id="10_6m0be"] [ext_resource type="PackedScene" uid="uid://bylmdf4duq6pw" path="res://scene/ground/script/c03/s03_closeup瞎子糕点.tscn" id="10_pkhgt"] @@ -24,8 +25,9 @@ [ext_resource type="SpriteFrames" uid="uid://cmvr3lbwe3h7p" path="res://asset/art/gif/c03_特写与游戏动画/c03_特写与游戏动画_frames.tres" id="14_pkhgt"] [ext_resource type="PackedScene" uid="uid://0sofmhrl358m" path="res://scene/entity/npc.tscn" id="15_pkhgt"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="17_fq03x"] -[ext_resource type="Texture2D" uid="uid://23m7ga6tsgja" path="res://asset/art/scene/c03/s03_瞎子理发店/纸人-抬手.png" id="24_2l5gj"] [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="25_yw0mj"] +[ext_resource type="Texture2D" uid="uid://ccegq6vy705pn" path="res://asset/art/scene/c03/s03_瞎子理发店/e_笑脸.png" id="26_f2ayh"] +[ext_resource type="Texture2D" uid="uid://b8kw48ppgb7cx" path="res://asset/art/scene/c03/s03_瞎子理发店/e_麻将.png" id="27_dilrn"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -74,43 +76,49 @@ texture = ExtResource("4_40yjl") offset = Vector2(0, -158) [node name="portal_left" parent="Ground/DeployLayer" index="0"] -position = Vector2(80, 23) -target_scene = "c02_s06" -target_portal = "2" -status = "opened" +position = Vector2(7, 25) +enabled = false [node name="portal_right" parent="Ground/DeployLayer" index="1"] -position = Vector2(538, 33) +position = Vector2(542, 32) target_scene = "c03_s02" target_portal = "left" status = "opened" -[node name="Closeup镜子特写" parent="Ground/DeployLayer" index="2" instance=ExtResource("5_d40x1")] +[node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("9_yw0mj")] +position = Vector2(481, 26) +portal_name = "1" +target_scene = "c02_s06" +target_portal = "2" +status = "opened" + +[node name="Closeup镜子特写" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_d40x1")] unique_name_in_owner = true -position = Vector2(236, 11) +position = Vector2(344, 5) packed_scene = ExtResource("6_j7tjd") first_interact_os_key = "c03_s03_镜子" -[node name="Closeup刮海报_鬼母子" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_d40x1")] +[node name="Closeup刮海报_鬼母子" parent="Ground/DeployLayer" index="4" instance=ExtResource("5_d40x1")] unique_name_in_owner = true -position = Vector2(462, 5) +position = Vector2(89, 6) texture = ExtResource("7_dcuy3") packed_scene = ExtResource("8_xtr6o") -[node name="Closeup癞子纸人" parent="Ground/DeployLayer" index="4" instance=ExtResource("5_d40x1")] +[node name="Closeup癞子纸人" parent="Ground/DeployLayer" index="5" instance=ExtResource("5_d40x1")] unique_name_in_owner = true -position = Vector2(343, 29) +position = Vector2(237, 41) packed_scene = ExtResource("9_4imwu") -[node name="癞子纸人" type="Sprite2D" parent="Ground/DeployLayer" index="5"] -position = Vector2(343, 49) +[node name="癞子纸人" type="Sprite2D" parent="Ground/DeployLayer" index="6"] +position = Vector2(237, 48) texture = ExtResource("9_bdtls") [node name="癞子纸人头套" type="Sprite2D" parent="Ground/DeployLayer/癞子纸人"] position = Vector2(1, -23) texture = ExtResource("10_1pu6f") -[node name="Event2D癞子剪辫子" type="Node2D" parent="Ground/DeployLayer" index="6"] +[node name="Event2D癞子剪辫子" type="Node2D" parent="Ground/DeployLayer" index="7"] +position = Vector2(-106, -2) script = ExtResource("10_6m0be") event_name = &"c03_s03_laizi_braid" event_stages = Array[int]([1]) @@ -185,33 +193,55 @@ position = Vector2(337, 29) texture = ExtResource("17_fq03x") texture_scale = 0.6 -[node name="Note桌子" parent="Ground/DeployLayer" index="7" instance=ExtResource("11_1pu6f")] -position = Vector2(393, 33) +[node name="Note桌子" parent="Ground/DeployLayer" index="8" instance=ExtResource("11_1pu6f")] +position = Vector2(391, 38) title_filter = "c03" note_key = "c03_s03_桌子" -[node name="Note洗头盆" parent="Ground/DeployLayer" index="8" instance=ExtResource("11_1pu6f")] -position = Vector2(501, 46) +[node name="Note洗头盆" parent="Ground/DeployLayer" index="9" instance=ExtResource("11_1pu6f")] +position = Vector2(54, 47) title_filter = "c03" note_key = "c03_s03_洗头盆" -[node name="Note纸娃娃" parent="Ground/DeployLayer" index="9" instance=ExtResource("11_1pu6f")] -position = Vector2(146, 28) -texture = ExtResource("24_2l5gj") +[node name="Note纸娃娃" parent="Ground/DeployLayer" index="10" instance=ExtResource("11_1pu6f")] +position = Vector2(133, 20) offset = Vector2(12.89, 10.5) title_filter = "c03" note_key = "c03_s03_纸娃娃" -[node name="Note假头套" parent="Ground/DeployLayer" index="10" instance=ExtResource("11_1pu6f")] -position = Vector2(184, 4) +[node name="Note假头套" parent="Ground/DeployLayer" index="11" instance=ExtResource("11_1pu6f")] +position = Vector2(179, -2) offset = Vector2(12.89, 10.5) title_filter = "c03" note_key = "c03_s03_假头套" -[node name="Ambush癞子呼吸" parent="Ground/DeployLayer" index="11" instance=ExtResource("25_yw0mj")] -position = Vector2(279, 58) +[node name="Ambush癞子呼吸" parent="Ground/DeployLayer" index="12" instance=ExtResource("25_yw0mj")] +position = Vector2(425, 43) hook_method = "laizi_start_breath" +[node name="笑脸" type="Sprite2D" parent="Ground/DeployLayer" index="13"] +position = Vector2(344, 12) +texture = ExtResource("26_f2ayh") + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/笑脸"] +script = ExtResource("7_xevnq") +updater_event = &"c03_s03_mirror_mahjong" +updater_mode = "shower" +updater_ease_duration = 0.0 +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="麻将" type="Sprite2D" parent="Ground/DeployLayer" index="14"] +position = Vector2(330, 1.5) +texture = ExtResource("27_dilrn") + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/麻将"] +script = ExtResource("7_xevnq") +updater_event = &"c03_s03_mirror_mahjong" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(34, 98) catty_light_energy = 0.5 diff --git a/scene/ground/scene/c03/s13_院子II.tscn b/scene/ground/scene/c03/s13_院子II.tscn index 4653269e..a7da1ab5 100644 --- a/scene/ground/scene/c03/s13_院子II.tscn +++ b/scene/ground/scene/c03/s13_院子II.tscn @@ -601,8 +601,56 @@ sign_x_offset = -2.0 collision_width_and_x = Vector2(37.08, 0) dialogue_title = "c02_井边疯子对话" -[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="20"] -visible = false +[node name="Event2D第二章_纸人" type="Node2D" parent="Ground/DeployLayer" index="20"] +script = ExtResource("78_5dvv8") +event_name = &"c03_well_show" +event_stages = Array[int]([0]) +pre_event_name = &"current_chapter_stage" +pre_event_stages = Array[int]([3]) +metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" + +[node name="排队常人" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人"] +light_mask = 0 +position = Vector2(1233, -120) +texture = ExtResource("24_icg2g") +centered = false + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Event2D第二章_纸人/排队常人"] +script = ExtResource("15_pasx5") +updater_event = &"c03_drug_game" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="前景" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人/排队常人"] +light_mask = 0 +z_index = 21 +texture = ExtResource("79_8jl58") +centered = false + +[node name="排队纸人" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人"] +light_mask = 0 +position = Vector2(1233, -120) +texture = ExtResource("25_xr8be") +centered = false + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Event2D第二章_纸人/排队纸人"] +script = ExtResource("15_pasx5") +updater_event = &"c03_drug_game" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stage_mode = "exclude" +updater_stages = Array[int]([0]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="前景" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人/排队纸人"] +light_mask = 0 +z_index = 21 +texture = ExtResource("80_mn1r6") +centered = false + +[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="21"] [node name="地上纸钱" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] z_index = -4 @@ -638,7 +686,7 @@ position = Vector2(898, -162) z_index = 10 position = Vector2(1964, -209) -[node name="Pickable浆糊" parent="Ground/DeployLayer" index="21" instance=ExtResource("26_kq5mn")] +[node name="Pickable浆糊" parent="Ground/DeployLayer" index="22" instance=ExtResource("26_kq5mn")] position = Vector2(774, 64) texture = ExtResource("73_0mdmm") prop_key = "prop_浆糊" @@ -650,7 +698,7 @@ updater_ease_duration = 0.0 updater_stages = Array[int]([3]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" -[node name="Event2D浆糊" type="Node2D" parent="Ground/DeployLayer" index="22"] +[node name="Event2D浆糊" type="Node2D" parent="Ground/DeployLayer" index="23"] position = Vector2(284, -5) script = ExtResource("74_ys1c0") event_name = &"c03_f1_paste_show" @@ -742,7 +790,7 @@ position = Vector2(-5.26316, 6.31579) enabled = false hook_character_name = "王守义" -[node name="Event2D第二章结束井边演出" type="Node2D" parent="Ground/DeployLayer" index="23"] +[node name="Event2D第二章结束井边演出" type="Node2D" parent="Ground/DeployLayer" index="24"] position = Vector2(2100, 0) script = ExtResource("76_cfx4a") event_name = &"c03_well_show" @@ -769,55 +817,6 @@ bus = &"game_sfx" script = ExtResource("4_6pite") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" -[node name="Event2D第二章_纸人" type="Node2D" parent="Ground/DeployLayer" index="24"] -script = ExtResource("78_5dvv8") -event_name = &"c03_well_show" -event_stages = Array[int]([0]) -pre_event_name = &"current_chapter_stage" -pre_event_stages = Array[int]([3]) -metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" - -[node name="排队常人" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人"] -light_mask = 0 -position = Vector2(1233, -120) -texture = ExtResource("24_icg2g") -centered = false - -[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Event2D第二章_纸人/排队常人"] -script = ExtResource("15_pasx5") -updater_event = &"c03_drug_game" -updater_mode = "shower" -updater_ease_duration = 0.0 -updater_stages = Array[int]([0]) -metadata/_custom_type_script = "uid://0wjaho6qkg6s" - -[node name="前景" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人/排队常人"] -light_mask = 0 -z_index = 21 -texture = ExtResource("79_8jl58") -centered = false - -[node name="排队纸人" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人"] -light_mask = 0 -position = Vector2(1233, -120) -texture = ExtResource("25_xr8be") -centered = false - -[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Event2D第二章_纸人/排队纸人"] -script = ExtResource("15_pasx5") -updater_event = &"c03_drug_game" -updater_mode = "shower" -updater_ease_duration = 0.0 -updater_stage_mode = "exclude" -updater_stages = Array[int]([0]) -metadata/_custom_type_script = "uid://0wjaho6qkg6s" - -[node name="前景" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人/排队纸人"] -light_mask = 0 -z_index = 21 -texture = ExtResource("80_mn1r6") -centered = false - [node name="Event2D李氏给药完成" type="Node2D" parent="Ground/DeployLayer" index="25"] position = Vector2(1858, 24) script = ExtResource("81_b80nw") @@ -892,7 +891,7 @@ metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="背景" type="Sprite2D" parent="Ground/DeployLayer/Event第三章开幕"] light_mask = 5 -z_index = -1 +z_index = -10 position = Vector2(169, -227.5) texture = ExtResource("85_jpguy") diff --git a/scene/ground/scene/c04/s08_三楼III.tscn b/scene/ground/scene/c04/s08_三楼III.tscn index b4a58e64..f83bd5f4 100644 --- a/scene/ground/scene/c04/s08_三楼III.tscn +++ b/scene/ground/scene/c04/s08_三楼III.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://dcg8ekvhqxjjs"] +[gd_scene load_steps=27 format=3 uid="uid://dcg8ekvhqxjjs"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_rv7yf"] [ext_resource type="Script" uid="uid://c0rh2n36ait6i" path="res://scene/ground/scene/c03/s01_三楼.gd" id="2_5wdtb"] @@ -18,6 +18,7 @@ [ext_resource type="PackedScene" uid="uid://bb6rbriqc27pl" path="res://scene/ground/script/c04/s08_closeup煮肉游戏.tscn" id="16_wdxyg"] [ext_resource type="SpriteFrames" uid="uid://bbey3pnvbxqmr" path="res://asset/art/gif/c04_煮肉游戏/c04_煮肉游戏_frames.tres" id="17_mavq2"] [ext_resource type="Script" uid="uid://cphfob11f7atx" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.gd" id="18_ryonc"] +[ext_resource type="Script" uid="uid://bkkiyk5jkdw4d" path="res://manager/event_manager/event2d.gd" id="19_ryonc"] [ext_resource type="Texture2D" uid="uid://djoft6600kly6" path="res://asset/art/scene/c03/s01_三楼/fg_前景.png" id="20_3eqs5"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -235,6 +236,12 @@ animation = &"三楼走廊互动动画_灶台冒烟烧火" script = ExtResource("18_ryonc") metadata/_custom_type_script = "uid://cphfob11f7atx" +[node name="Event陆蝶演出" type="Node2D" parent="Ground/DeployLayer" index="12"] +script = ExtResource("19_ryonc") +pre_event_name = &"current_chapter_stage" +pre_event_stages = Array[int]([4]) +metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(34, 98) catty_light_energy = 0.5 diff --git a/scene/ground/script/c02/小手讨东西.tscn b/scene/ground/script/c02/小手讨东西.tscn index 95ecf556..915ecd8e 100644 --- a/scene/ground/script/c02/小手讨东西.tscn +++ b/scene/ground/script/c02/小手讨东西.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://xovlfee503a4"] +[gd_scene load_steps=23 format=3 uid="uid://xovlfee503a4"] [ext_resource type="Texture2D" uid="uid://cawpq7rnho5px" path="res://asset/art/gif/c02_小手/洞.png" id="1_47cqy"] [ext_resource type="Script" uid="uid://my5xqi3bkka6" path="res://scene/ground/script/c02/小手讨东西.gd" id="1_n7thl"] @@ -15,9 +15,17 @@ [ext_resource type="AudioStream" uid="uid://c26x8f18w6is0" path="res://asset/audio/sfx/旧版/c02/撞到柜子.ogg" id="10_0tuif"] [ext_resource type="Texture2D" uid="uid://2mjipesnigcr" path="res://asset/art/prop/c02/锡箔元宝.png" id="10_47cqy"] [ext_resource type="AudioStream" uid="uid://wt7jlambh6y" path="res://asset/audio/peiyin/c03/c03_棺材怪_3.ogg" id="10_n2hq3"] +[ext_resource type="AudioStream" uid="uid://ce8rpo6mmrysf" path="res://asset/audio/peiyin/c03/c03_棺材怪_2.ogg" id="11_11vvg"] [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="12_6lwlv"] +[ext_resource type="AudioStream" uid="uid://cthyxxqhb0g65" path="res://asset/audio/peiyin/c03/c03_棺材怪_1.ogg" id="12_62j3u"] [ext_resource type="Script" uid="uid://cnt01hiw52bmn" path="res://scene/entity/ux/sign_snapper.gd" id="15_lr23o"] +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_d4dw5"] +streams_count = 3 +stream_0/stream = ExtResource("10_n2hq3") +stream_1/stream = ExtResource("11_11vvg") +stream_2/stream = ExtResource("12_62j3u") + [sub_resource type="AudioStreamInteractive" id="AudioStreamInteractive_0tuif"] clip_count = 1 clip_0/name = &"撞到柜子" @@ -55,7 +63,7 @@ script = ExtResource("7_7dftu") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="SfxBgmC03" type="AudioStreamPlayer" parent="."] -stream = ExtResource("10_n2hq3") +stream = SubResource("AudioStreamRandomizer_d4dw5") volume_db = -10.0 bus = &"game_sfx" script = ExtResource("7_7dftu") diff --git a/scene/ground/script/c03/s03_closeup镜子特写.gd b/scene/ground/script/c03/s03_closeup镜子特写.gd index dddd32e2..0c4636ef 100644 --- a/scene/ground/script/c03/s03_closeup镜子特写.gd +++ b/scene/ground/script/c03/s03_closeup镜子特写.gd @@ -9,21 +9,18 @@ signal exit() func _ready() -> void: layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME - var mahjong_picked = ArchiveManager.get_global_value("c03_s03_mahjong_picked") + var mahjong_picked = EventManager.get_stage("c03_s03_mirror_mahjong") if mahjong_picked: - rope_with_mahjong.queue_free() dusted_face.hide() else: - rope_with_mahjong.picked.connect(_on_btn_pressed, CONNECT_ONE_SHOT) + rope_with_mahjong.picked.connect(_on_picked, CONNECT_ONE_SHOT) -func _on_btn_pressed(_arg): +func _on_picked(_arg): var parent = get_parent() as Closeup2D if parent: parent.hold_cancel_before_exit() - ArchiveManager.set_global_entry("c03_s03_mahjong_picked", true) SceneManager.enable_prop_item("prop_麻将2") - rope_with_mahjong.queue_free() await SceneManager.get_inspector().quit_and_hidden # TODO 诡异小孩声 SceneManager.pop_debug_dialog_info("音效", "诡异的小孩笑声") diff --git a/scene/ground/script/c03/s03_closeup镜子特写.tscn b/scene/ground/script/c03/s03_closeup镜子特写.tscn index ee230a7f..f506f09f 100644 --- a/scene/ground/script/c03/s03_closeup镜子特写.tscn +++ b/scene/ground/script/c03/s03_closeup镜子特写.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://bnoqhovb0wjem"] +[gd_scene load_steps=12 format=3 uid="uid://bnoqhovb0wjem"] [ext_resource type="Script" uid="uid://xyswrst2qvnv" path="res://scene/ground/script/c03/s03_closeup镜子特写.gd" id="1_l7eke"] [ext_resource type="Texture2D" uid="uid://cv43fc0yphoyh" path="res://asset/art/scene/c03/s03_瞎子理发店/ux_镜子特写_脸.png" id="2_h11vl"] @@ -8,6 +8,7 @@ [ext_resource type="PackedScene" uid="uid://bg7oictr1wgex" path="res://scene/little_game/general/draggable.tscn" id="4_pmhbo"] [ext_resource type="Texture2D" uid="uid://dri7gy7janvim" path="res://asset/art/scene/c03/s03_瞎子理发店/ux_镜子特写_红绳麻将.png" id="5_l7eke"] [ext_resource type="Texture2D" uid="uid://gan7qq0i7uiw" path="res://asset/art/scene/c03/s03_瞎子理发店/ux_镜子遮罩.png" id="5_pmhbo"] +[ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="8_ea6av"] [sub_resource type="Gradient" id="Gradient_60jo7"] offsets = PackedFloat32Array(0, 0.571181, 1) @@ -58,6 +59,16 @@ range_layer_max = 10 range_item_cull_mask = 128 texture = SubResource("GradientTexture2D_x88e4") +[node name="EventBinder" type="Node" parent="Draggable2D麻绳"] +script = ExtResource("8_ea6av") +updater_event = &"c03_s03_mirror_mahjong" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +trigger_event = &"c03_s03_mirror_mahjong" +trigger_mode = "picked" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + [node name="遮罩" type="TextureRect" parent="."] anchors_preset = 15 anchor_right = 1.0