diff --git a/asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png b/asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png new file mode 100644 index 00000000..f3f175b9 Binary files /dev/null and b/asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png differ diff --git a/asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png.import b/asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png.import new file mode 100644 index 00000000..521b5e7d --- /dev/null +++ b/asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bwoi5yfgfb7km" +path="res://.godot/imported/加辫子的头发粉末.png-e15b3fd4d4ae56eefe9a00f9e0f40d5c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png" +dest_files=["res://.godot/imported/加辫子的头发粉末.png-e15b3fd4d4ae56eefe9a00f9e0f40d5c.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/item_description.csv b/asset/dialogue/item_description.csv index 539b1513..45d5f9a3 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -354,6 +354,7 @@ c03_s08_囚室符纸,妖物者,本自造化而生,具灵识,知求生, c03_s08_囚室偷听后,他们说的药方...是我父母写的那张...{br}当年到底...算了,先想办法出去吧,,,,, c03_s09_棺材上刻的文字,棺材上刻有长命百岁,好怪...,,,,, c03_s09_胖子干尸,不知道是谁的干尸...,,,,, +c03_s09_刀使用提示,有了这刀…应该就可以把囚室里的绳子砍断了,,,,, c03_s10_label1,[wave]当兵去,当兵饿不死[/wave],,,,, c03_s10_label2,[wave]活[/wave],,,,, c03_s10_label3,[wave]着[/wave],,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 646d5ddd..c9beaa75 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -445,7 +445,7 @@ skip[ID:prop_沾血的老虎钳_详情] # s09 棺材房 棺材上刻有长命百岁,好怪...[ID:c03_s09_棺材上刻的文字] 不知道是谁的干尸...[ID:c03_s09_胖子干尸] -刀把 [ID:c03_s09_刀使用提示] +有了这刀…应该就可以把囚室里的绳子砍断了 [ID:c03_s09_刀使用提示] # s10-12 胖子游戏1-3 [wave]当兵去,当兵饿不死[/wave][ID:c03_s10_label1] [wave]活[/wave][ID:c03_s10_label2] diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn index ec8a6d87..2151c468 100644 --- a/scene/ground/scene/c02/s02_过道.tscn +++ b/scene/ground/scene/c02/s02_过道.tscn @@ -133,7 +133,6 @@ position = Vector2(253, -31) texture = ExtResource("10_jg8g0") packed_scene = ExtResource("11_jg8g0") on_display_hide_hud = true -transition_effect = true first_interact_os_key = "c02_海报_剪辫子侦探" [node name="青岛啤酒" parent="Ground/DeployLayer" index="7" instance=ExtResource("12_0fckv")] @@ -230,7 +229,6 @@ gaslight_ground_energy = 0.0 [node name="Closeup八音盒" parent="Ground/DeployLayer" index="18" instance=ExtResource("19_6wwyd")] position = Vector2(533, 65) packed_scene = ExtResource("10_ifae7") -transition_effect = true first_interact_os_key = "c02_s02_八音盒" [node name="Sprite2D" type="Sprite2D" parent="Ground/DeployLayer/Closeup八音盒"] diff --git a/scene/ground/script/c02/s03_closeup抓药游戏.tscn b/scene/ground/script/c02/s03_closeup抓药游戏.tscn index 05c975ef..d378f1b9 100644 --- a/scene/ground/script/c02/s03_closeup抓药游戏.tscn +++ b/scene/ground/script/c02/s03_closeup抓药游戏.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=67 format=3 uid="uid://cpxt082my5yac"] +[gd_scene load_steps=68 format=3 uid="uid://cpxt082my5yac"] [ext_resource type="Script" uid="uid://dj2b4f3soxki5" path="res://scene/ground/script/c02/s03_closeup抓药游戏.gd" id="1_0wbm3"] [ext_resource type="Texture2D" uid="uid://bs4npq7fnwjhw" path="res://asset/art/little_game/c03_药车游戏/背景底图.png" id="2_5ts1i"] @@ -45,6 +45,7 @@ [ext_resource type="AudioStream" uid="uid://bb6xofiqjvid8" path="res://asset/audio/sfx/UI/关闭报纸.ogg" id="27_yndwj"] [ext_resource type="Texture2D" uid="uid://e4q2o6x1gtvo" path="res://asset/art/little_game/c03_药车游戏/完成药粉.png" id="29_26hqw"] [ext_resource type="Texture2D" uid="uid://due28st4b4e01" path="res://asset/art/little_game/c03_药车游戏/洞中药纸.png" id="30_8leof"] +[ext_resource type="Texture2D" uid="uid://bwoi5yfgfb7km" path="res://asset/art/little_game/c03_药车游戏/加辫子的头发粉末.png" id="32_6kw6k"] [ext_resource type="Texture2D" uid="uid://b5ibixjn6oikx" path="res://asset/art/little_game/c03_药车游戏/黑色粉末单独.png" id="32_gf0xj"] [ext_resource type="Texture2D" uid="uid://bq1ilitkvodnr" path="res://asset/art/little_game/c03_药车游戏/蟋蟀单独.png" id="33_26hqw"] [ext_resource type="Texture2D" uid="uid://dyeeyfdr7gbh2" path="res://asset/art/little_game/c03_药车游戏/蟋蟀一对.png" id="36_stbjq"] @@ -571,7 +572,7 @@ texture = ExtResource("8_kbm4v") [node name="头发粉末" type="Sprite2D" parent="Hover粉末"] light_mask = 5 position = Vector2(-79, -49) -texture = ExtResource("8_kbm4v") +texture = ExtResource("32_6kw6k") centered = false [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hover粉末"] diff --git a/scene/ground/script/c03/s09_closeup棺材特写.gd b/scene/ground/script/c03/s09_closeup棺材特写.gd index c2c19776..560ce51d 100644 --- a/scene/ground/script/c03/s09_closeup棺材特写.gd +++ b/scene/ground/script/c03/s09_closeup棺材特写.gd @@ -50,6 +50,7 @@ func _on_note_interacted() -> void: await SceneManager.get_inspector().quit_and_hidden SceneManager.black_transition(0.7, 0.5) await Util.wait(0.8) + Util.timer(0.5, SceneManager.pop_os_with_str.bind("c03_s09_刀使用提示")) exit.emit(true) diff --git a/scene/little_game/八音盒/八音盒.tscn b/scene/little_game/八音盒/八音盒.tscn index e9f9cddd..193304b5 100644 --- a/scene/little_game/八音盒/八音盒.tscn +++ b/scene/little_game/八音盒/八音盒.tscn @@ -201,12 +201,12 @@ range_layer_max = 10 texture = ExtResource("22_rdaqv") [node name="OpenedBox" type="Sprite2D" parent="All"] -visible = false position = Vector2(-48, 38) texture = ExtResource("16_dtoml") centered = false [node name="Panel" type="Node2D" parent="All/OpenedBox"] +z_index = 1 y_sort_enabled = true position = Vector2(68.5, -38)