diff --git a/asset/art/prop/c03/2013钥匙.png b/asset/art/prop/c03/2013钥匙.png new file mode 100755 index 00000000..6b1b1388 Binary files /dev/null and b/asset/art/prop/c03/2013钥匙.png differ diff --git a/asset/art/prop/c03/2013钥匙.png.import b/asset/art/prop/c03/2013钥匙.png.import new file mode 100644 index 00000000..7d725112 --- /dev/null +++ b/asset/art/prop/c03/2013钥匙.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cordm4372n87a" +path="res://.godot/imported/2013钥匙.png-aee8396ef6c3a3c163265bf29afc7843.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/2013钥匙.png" +dest_files=["res://.godot/imported/2013钥匙.png-aee8396ef6c3a3c163265bf29afc7843.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/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png new file mode 100644 index 00000000..5247bbc8 Binary files /dev/null and b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png differ diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png.import b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png.import new file mode 100644 index 00000000..e682bd29 --- /dev/null +++ b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clxdv18v8rr0r" +path="res://.godot/imported/l_刀柄.png-38f53bfd0259b7868d1c9a5b4fc639cb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png" +dest_files=["res://.godot/imported/l_刀柄.png-38f53bfd0259b7868d1c9a5b4fc639cb.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/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png new file mode 100644 index 00000000..1244c39b Binary files /dev/null and b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png differ diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png.import b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png.import new file mode 100644 index 00000000..274c8e0f --- /dev/null +++ b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cudou52tmnc0u" +path="res://.godot/imported/l_钥匙.png-8da62b1ec5ec8c3a064b400fd7fde99f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png" +dest_files=["res://.godot/imported/l_钥匙.png-8da62b1ec5ec8c3a064b400fd7fde99f.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/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png deleted file mode 100644 index e0549b27..00000000 Binary files a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png and /dev/null differ diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png new file mode 100644 index 00000000..5e873b17 Binary files /dev/null and b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png differ diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png.import b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png.import similarity index 67% rename from asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png.import rename to asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png.import index d79bc184..2c38fd6a 100644 --- a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png.import +++ b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dbntx57uox7e0" -path="res://.godot/imported/报纸折起来 对着背景的边缘即可.png-824e80d4fe58f4362dd5fb8212fd90c9.ctex" +path="res://.godot/imported/报纸折起来.png-b6a33dc731b73b32b31e0f76748457a0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来 对着背景的边缘即可.png" -dest_files=["res://.godot/imported/报纸折起来 对着背景的边缘即可.png-824e80d4fe58f4362dd5fb8212fd90c9.ctex"] +source_file="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png" +dest_files=["res://.godot/imported/报纸折起来.png-b6a33dc731b73b32b31e0f76748457a0.ctex"] [params] diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来背景.png b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来背景.png index 3ef8d46d..d13542e9 100644 Binary files a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来背景.png and b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来背景.png differ diff --git a/asset/dialogue/c03.dialogue b/asset/dialogue/c03.dialogue index 786157d0..66846799 100644 --- a/asset/dialogue/c03.dialogue +++ b/asset/dialogue/c03.dialogue @@ -5,10 +5,12 @@ => END ~ c03_s02_邀请小蝉与瞎子对话1 -小蝶: （邀请小蝉去家里吃饭） -方瞎子: （坐在桌前抽烟（咳嗽）） -... -... +小小蝶: 那个...方叔叔，小蝉在吗？ +瞎子: 咳咳，她，咳咳，不在。 +小小蝶: 她是生病了吗，好几天没见她了。 +瞎子: 她... +瞎子: 我挨家挨户地问啊，都说没看见她。 +瞎子: 一个活生生的小孩子，就这么找不见了... => END diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 475eccba..06445740 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -142,6 +142,10 @@ 说明 [ID:prop_菜刀_说明] 1015钥匙 [#texture=c03/1015钥匙.png] [ID:prop_1015钥匙] 说明 [ID:prop_1015钥匙_说明] +2013钥匙 [#texture=c03/2013钥匙.png] [ID:prop_2013钥匙] +说明 [ID:prop_2013钥匙_说明] +胖子的钥匙 [#texture=c03/胖子的钥匙.png] [ID:prop_胖子的钥匙] +说明 [ID:prop_胖子的钥匙_说明] # 旧版 diff --git a/scene/character/main_player.gd b/scene/character/main_player.gd index 38cfa8f9..11522262 100644 --- a/scene/character/main_player.gd +++ b/scene/character/main_player.gd @@ -23,7 +23,7 @@ signal animation_finished @export var lock_move_right := false @export var reenter_lock: PlayerReenterLock @export var camera_marker: CameraFocusMarker -@export_enum("吕萍", "吕萍爬行", "吕萍带小猫", "吕萍推柜子", "小小蝶", "盒子猫", "小小小蝶") var character := "吕萍": +@export_enum("吕萍", "吕萍爬行", "吕萍带小猫", "吕萍推柜子", "吕萍拉大柜子", "小小蝶", "盒子猫", "小小小蝶") var character := "吕萍": set(val): character = val if is_node_ready(): diff --git a/scene/character/player_animation_config.gd b/scene/character/player_animation_config.gd index 9cb619a0..43555fba 100644 --- a/scene/character/player_animation_config.gd +++ b/scene/character/player_animation_config.gd @@ -100,6 +100,21 @@ var ANIMATION_CONFIG = { MOVEMENT_IDLE: [&"c00_吕萍_拉箱子呼吸_镜像", &"c00_吕萍_拉箱子呼吸_镜像"], MOVEMENT_WALKING: [&"c00_吕萍_拉箱子_镜像", &"c00_吕萍_拉箱子_镜像"], }, + "吕萍拉大柜子": + { + "scale": Vector2(1.0, 1.0), + "speed_walking": 40.0, + "can_run": false, + "speed_runnig": 40.0, + "walk_footstep": 0.5, + "run_footstep": 0.5, + "os_height": 120.0, + "light_height": 65.0, + # 人物脚底 offset，吕萍为 0，高 200px，足底在 100px 处 + "foot_offset": Vector2(22.5, -101), + MOVEMENT_IDLE: [&"c00_吕萍_拉箱子呼吸_镜像", &"c00_吕萍_拉箱子呼吸_镜像"], + MOVEMENT_WALKING: [&"c00_吕萍_拉箱子_镜像", &"c00_吕萍_拉箱子_镜像"], + }, # "小蝶": # { # "scale": Vector2.ONE, diff --git a/scene/entity/closeup_template.gd b/scene/entity/closeup_template.gd index 216e7d50..00b04ceb 100644 --- a/scene/entity/closeup_template.gd +++ b/scene/entity/closeup_template.gd @@ -3,7 +3,5 @@ extends CanvasLayer @warning_ignore("unused_signal") signal exit(arg) -@onready var bg = $BG as TextureRect - func _ready() -> void: layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME diff --git a/scene/entity/ux/hover_light_click_area.gd b/scene/entity/ux/hover_light_click_area.gd index e9dc49c1..c9872369 100644 --- a/scene/entity/ux/hover_light_click_area.gd +++ b/scene/entity/ux/hover_light_click_area.gd @@ -86,3 +86,8 @@ func _input(event: InputEvent) -> void: # get_viewport().set_input_as_handled() if is_focused(): interacted.emit() + + +func _exit_tree() -> void: + if touching: + _on_mouse_exited() \ No newline at end of file diff --git a/scene/entity/ux/hover_light_click_area.tscn b/scene/entity/ux/hover_light_click_area.tscn index 6835e499..fa4be6fc 100644 --- a/scene/entity/ux/hover_light_click_area.tscn +++ b/scene/entity/ux/hover_light_click_area.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://ubn3pgywffro" path="res://scene/entity/ux/hover_light_click_area.gd" id="1_qoyst"] [node name="HoverLightClickArea" type="Area2D"] -collision_layer = 0 +collision_layer = 4 collision_mask = 4 monitorable = false script = ExtResource("1_qoyst") diff --git a/scene/ground/scene/c02/s10_空房间.gd b/scene/ground/scene/c02/s10_空房间.gd index 1145ee9d..95366b55 100644 --- a/scene/ground/scene/c02/s10_空房间.gd +++ b/scene/ground/scene/c02/s10_空房间.gd @@ -143,8 +143,7 @@ var pushing_counter = false: set(value): if pushing_counter != value: pushing_counter = value - if GlobalConfig.DEBUG: - print("pushing_counter:", pushing_counter) + print("空房间 pushing_counter:", pushing_counter) var counter_pushed_out = false var walking = false diff --git a/scene/ground/scene/c03/s04_李癞房间.tscn b/scene/ground/scene/c03/s04_李癞房间.tscn index 2d5d6427..cd2a756e 100644 --- a/scene/ground/scene/c03/s04_李癞房间.tscn +++ b/scene/ground/scene/c03/s04_李癞房间.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://c7c88hg2cl1j7"] +[gd_scene load_steps=12 format=3 uid="uid://c7c88hg2cl1j7"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_byh4s"] [ext_resource type="Script" uid="uid://byw2swgt783oa" path="res://scene/ground/scene/c03/s04_李癞房间.gd" id="2_vjibx"] @@ -9,6 +9,7 @@ [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="6_dbkw8"] [ext_resource type="PackedScene" uid="uid://n75766ui6udi" path="res://scene/ground/script/c03/s04_closeup整理麻将游戏.tscn" id="7_jmyby"] [ext_resource type="PackedScene" uid="uid://cua3uqy4btxqn" path="res://scene/ground/script/c03/s04_closeup麻将出千游戏.tscn" id="8_jmyby"] +[ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="9_m8bf2"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -61,6 +62,10 @@ packed_scene = ExtResource("8_jmyby") quit_closeup_on_cancel = false enabled = false +[node name="Pickable胖子钥匙" parent="Ground/DeployLayer" index="5" instance=ExtResource("9_m8bf2")] +position = Vector2(537, 55) +prop_key = "prop_胖子的钥匙" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(63, 100) catty_light_energy = 0.5 diff --git a/scene/ground/scene/c03/s06_胖子卧室.gd b/scene/ground/scene/c03/s06_胖子卧室.gd index 21463fc3..5b262e75 100644 --- a/scene/ground/scene/c03/s06_胖子卧室.gd +++ b/scene/ground/scene/c03/s06_胖子卧室.gd @@ -14,13 +14,97 @@ func _ready() -> void: #region node_reference +var counter: Interactable2D +var closeup_hole: Closeup2D +var counter_range: Line2D #endregion # 读取设置变量名 func _setup_node_reference() -> void: - pass + counter = $"../DeployLayer/counter" + counter_range = $"../DeployLayer/柜子范围" + closeup_hole = $"../DeployLayer/Closeup柜子后的洞" + +var default_player_movement_rect: Rect2 +var pushing_counter_player_movement_rect: Rect2 + func _on_ground_ready() -> void: - pass + default_player_movement_rect = SceneManager.get_player().player_movement_rect + pushing_counter_player_movement_rect = default_player_movement_rect + pushing_counter_player_movement_rect.position.x = counter_range.get_point_position(0).x + pushing_counter_player_movement_rect.end.x = counter_range.get_point_position(1).x + + # 空柜子 x 坐标 + var counter_x = float(ArchiveManager.get_global_value(&"c03_big_counter_x", default_counter_x)) + if counter_x <= 0: + counter_x = default_counter_x + counter.interacted.connect(_on_counter_interacted) + counter.global_position.x = counter_x + after_counter_moved() + + +var pushing_counter = false: + set(value): + if pushing_counter != value: + pushing_counter = value + print("胖子房间 pushing_counter:", pushing_counter) +var counter_pushed_out = false +var walking = false + +const default_counter_x := 470.0 +# 玩家推柜子时，距 counter 中间的相对 x +# player x=315.0 counter x=364.0 +const player_pull_offset_x := 49.0 + + +func _on_counter_interacted(): + var player = SceneManager.get_player() as MainPlayer + if pushing_counter: + # unconnect signal + player.position_updated.disconnect(on_player_moved_counter) + player.character = "吕萍" + player.lock_move_right = false + SceneManager.get_player().player_movement_rect = default_player_movement_rect + else: + SceneManager.get_player().player_movement_rect = pushing_counter_player_movement_rect + var x = counter.global_position.x - player_pull_offset_x + # 走到左侧，自动 freeze/release + player.walk_to_x(x).tween_callback(func(): + walking = false + #TODO + SceneManager.pop_debug_dialog_info("美术", "吕萍拉大柜子") + player.character = "吕萍拉大柜子" + player.lock_move_right = true + SceneManager.pop_center_notification("ui_center_notify_press_q_to_exit") + ) + walking = true + player.position_updated.connect(on_player_moved_counter) + pushing_counter = !pushing_counter + + +func on_player_moved_counter(global_pos: Vector2): + var x = global_pos.x + player_pull_offset_x + ArchiveManager.set_global_entry(&"c03_big_counter_x", x) + counter.global_position.x = x + after_counter_moved() + + +# 柜子移动后，检查是否展示后面的洞 +func after_counter_moved(): + if not counter_pushed_out: + var current_x = counter.global_position.x + # default_counter_x +- 40 + var x_diff = current_x - default_counter_x + if x_diff > -40 and x_diff < 40: + closeup_hole.enabled = false + return + closeup_hole.enabled = true + + +func _input(event: InputEvent) -> void: + if event.is_action_pressed("cancel") and not walking and pushing_counter: + get_viewport().set_input_as_handled() + _on_counter_interacted() diff --git a/scene/ground/scene/c03/s06_胖子卧室.tscn b/scene/ground/scene/c03/s06_胖子卧室.tscn index de16a63b..2d450274 100644 --- a/scene/ground/scene/c03/s06_胖子卧室.tscn +++ b/scene/ground/scene/c03/s06_胖子卧室.tscn @@ -1,10 +1,14 @@ -[gd_scene load_steps=7 format=3 uid="uid://cxacrp8mrrbry"] +[gd_scene load_steps=11 format=3 uid="uid://cxacrp8mrrbry"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_h8p4n"] -[ext_resource type="Script" path="res://scene/ground/scene/c03/s06_胖子卧室.gd" id="2_f527l"] +[ext_resource type="Script" uid="uid://cxgeon4qs1klv" path="res://scene/ground/scene/c03/s06_胖子卧室.gd" id="2_f527l"] [ext_resource type="Script" uid="uid://cpejxlfni6n52" path="res://manager/audio_manager/vibe_sfx.gd" id="3_6747o"] [ext_resource type="Texture2D" uid="uid://c2qdnw8b0rcah" path="res://asset/art/scene/c03/s06_胖子卧室/bg_胖子卧室背景.png" id="4_h8p4n"] +[ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="5_6747o"] [ext_resource type="Texture2D" uid="uid://q20myccplwm7" path="res://asset/art/scene/c03/s06_胖子卧室/fg_胖子卧室前景.png" id="5_f527l"] +[ext_resource type="Texture2D" uid="uid://coaugvwesap35" path="res://asset/art/scene/c03/s06_胖子卧室/胖子卧室柜子.png" id="6_wsqdn"] +[ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="7_wsqdn"] +[ext_resource type="PackedScene" uid="uid://5uqi3c3f4va1" path="res://scene/ground/script/c03/s06_closeup柜子后的洞.tscn" id="8_1qtud"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -40,6 +44,20 @@ target_portal = "1" [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(873, 15) +[node name="柜子范围" type="Line2D" parent="Ground/DeployLayer" index="2"] +points = PackedVector2Array(357, 200, 500, 200) + +[node name="counter" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_6747o")] +position = Vector2(470, 36) +texture = ExtResource("6_wsqdn") +one_shot = false + +[node name="Closeup柜子后的洞" parent="Ground/DeployLayer" index="4" instance=ExtResource("7_wsqdn")] +position = Vector2(466, 48) +packed_scene = ExtResource("8_1qtud") +quit_closeup_on_cancel = false +enabled = false + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(63, 95) catty_light_energy = 0.5 diff --git a/scene/ground/script/c03/s03_刮海报_理发店.tscn b/scene/ground/script/c03/s03_刮海报_理发店.tscn index a7086805..39b8e386 100644 --- a/scene/ground/script/c03/s03_刮海报_理发店.tscn +++ b/scene/ground/script/c03/s03_刮海报_理发店.tscn @@ -134,7 +134,6 @@ visible = false [node name="剪刀" parent="鬼母子游戏/倒塌/Props" instance=ExtResource("15_3uuyc")] position = Vector2(364, 248) -collision_layer = 4 [node name="Sprite2D" type="Sprite2D" parent="鬼母子游戏/倒塌/Props/剪刀"] position = Vector2(-55, -19) @@ -152,19 +151,18 @@ polygon = PackedVector2Array(4, -25, -10, -25, -14, -13.4, -14, -8.4, -37.5, 1, [node name="EventBinder" type="Node" parent="鬼母子游戏/倒塌/Props/剪刀"] script = ExtResource("17_dhl8m") -memo = "c03_鬼母子_剪刀=[0] 时,显示: [剪刀] -[剪刀] interacted 时: c03_鬼母子_剪刀=1(greater)" -updater_event = &"c03_鬼母子_剪刀" +memo = "c03_hariti_scissor=[0] 时,显示: [剪刀] +[剪刀] interacted 时: c03_hariti_scissor=1(greater)" +updater_event = &"c03_hariti_scissor" updater_mode = "shower" updater_ease_duration = 0.0 updater_stages = Array[int]([0]) -trigger_event = &"c03_鬼母子_剪刀" +trigger_event = &"c03_hariti_scissor" trigger_mode = "interacted" metadata/_custom_type_script = "uid://0wjaho6qkg6s" [node name="纸舌头" parent="鬼母子游戏/倒塌/Props" instance=ExtResource("15_3uuyc")] position = Vector2(255, 248) -collision_layer = 4 [node name="Sprite2D" type="Sprite2D" parent="鬼母子游戏/倒塌/Props/纸舌头"] position = Vector2(-40, 0) @@ -183,13 +181,13 @@ polygon = PackedVector2Array(-49, -10, -49, -2.8, -38, 3.2, -38, 5.1, 5.1, 3, 13 [node name="EventBinder" type="Node" parent="鬼母子游戏/倒塌/Props/纸舌头"] script = ExtResource("17_dhl8m") -memo = "c03_鬼母子_纸舌头=[0] 时,显示: [纸舌头] -[纸舌头] interacted 时: c03_鬼母子_纸舌头=1(greater)" -updater_event = &"c03_鬼母子_纸舌头" +memo = "c03_hariti_tongue=[0] 时,显示: [纸舌头] +[纸舌头] interacted 时: c03_hariti_tongue=1(greater)" +updater_event = &"c03_hariti_tongue" updater_mode = "shower" updater_ease_duration = 0.0 updater_stages = Array[int]([0]) -trigger_event = &"c03_鬼母子_纸舌头" +trigger_event = &"c03_hariti_tongue" trigger_mode = "interacted" metadata/_custom_type_script = "uid://0wjaho6qkg6s" diff --git a/scene/ground/script/c03/s06_closeup柜子后的洞.gd b/scene/ground/script/c03/s06_closeup柜子后的洞.gd new file mode 100644 index 00000000..d6d3afcc --- /dev/null +++ b/scene/ground/script/c03/s06_closeup柜子后的洞.gd @@ -0,0 +1,30 @@ +extends CanvasLayer + +@warning_ignore("unused_signal") +signal exit(arg) + + +func _ready() -> void: + $"BG折起来/HoverLight钥匙".interacted.connect(_on_prop_picked.bind("prop_2013钥匙")) + $"BG折起来/HoverLight刀柄".interacted.connect(_on_prop_picked.bind("prop_刀把")) + layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME + $"BG展开/报纸展开".picked.connect(_on_newspaper_picked) + + +func _on_newspaper_picked(_node) -> void: + $"BG展开".hide() + $"BG折起来".show() + + +func _on_prop_picked(prop_key: String) -> void: + SceneManager.enable_prop_item(prop_key) + if ( + (prop_key == "prop_2013钥匙" and EventManager.get_stage(&"c03_s06_hole_knife_handle") > 0) + or (prop_key == "prop_刀把" and EventManager.get_stage(&"c03_s06_hole_key") > 0) + ): + await SceneManager.get_inspector().quit_and_hidden + # TODO + SceneManager.pop_debug_dialog_info("美术&音效", "背后响起画外音（偷东西？）") + # 画面抖动变红，玩家被打晕，画面变黑 + await Util.wait(2.0) + exit.emit() diff --git a/scene/ground/script/c03/s06_closeup柜子后的洞.gd.uid b/scene/ground/script/c03/s06_closeup柜子后的洞.gd.uid new file mode 100644 index 00000000..c89be43c --- /dev/null +++ b/scene/ground/script/c03/s06_closeup柜子后的洞.gd.uid @@ -0,0 +1 @@ +uid://vkpp7mrdnh0s diff --git a/scene/ground/script/c03/s06_closeup柜子后的洞.tscn b/scene/ground/script/c03/s06_closeup柜子后的洞.tscn new file mode 100644 index 00000000..d3c12e74 --- /dev/null +++ b/scene/ground/script/c03/s06_closeup柜子后的洞.tscn @@ -0,0 +1,152 @@ +[gd_scene load_steps=17 format=3 uid="uid://5uqi3c3f4va1"] + +[ext_resource type="Script" uid="uid://vkpp7mrdnh0s" path="res://scene/ground/script/c03/s06_closeup柜子后的洞.gd" id="1_84xhv"] +[ext_resource type="Texture2D" uid="uid://by4ybfs7oi63f" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸正常背景.png" id="2_84xhv"] +[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_wpl64"] +[ext_resource type="PackedScene" uid="uid://bg7oictr1wgex" path="res://scene/little_game/general/draggable.tscn" id="3_65bkn"] +[ext_resource type="PackedScene" uid="uid://bkk1rxx36ghrl" path="res://scene/entity/ux/hover_light_click_area.tscn" id="3_ko8md"] +[ext_resource type="Texture2D" uid="uid://bv4wg362asw3f" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸.png" id="3_mcv7n"] +[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_mkmvg"] +[ext_resource type="Texture2D" uid="uid://b0nndec3m6b73" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来背景.png" id="4_65bkn"] +[ext_resource type="Texture2D" uid="uid://b8f54mbw7ftnm" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/钥匙.png" id="5_6ncw3"] +[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_65bkn"] +[ext_resource type="Texture2D" uid="uid://dbntx57uox7e0" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png" id="5_mbut7"] +[ext_resource type="Texture2D" uid="uid://clxdv18v8rr0r" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png" id="5_ur3qk"] +[ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="6_aen5b"] +[ext_resource type="Texture2D" uid="uid://dnntuxrmsmv86" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/刀柄.png" id="6_ko8md"] +[ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="6_mbut7"] +[ext_resource type="Texture2D" uid="uid://cudou52tmnc0u" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png" id="7_aen5b"] + +[node name="Closeup柜子后的洞" type="CanvasLayer"] +script = ExtResource("1_84xhv") + +[node name="BG折起来" type="TextureRect" parent="."] +visible = false +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("4_65bkn") + +[node name="HoverLight钥匙" parent="BG折起来" instance=ExtResource("3_ko8md")] +position = Vector2(294, 155.5) +rotation = -2.67388 + +[node name="Sprite2D" type="Sprite2D" parent="BG折起来/HoverLight钥匙"] +light_mask = 5 +texture = ExtResource("5_6ncw3") + +[node name="PointLight2D" type="PointLight2D" parent="BG折起来/HoverLight钥匙"] +range_layer_max = 10 +range_item_cull_mask = 4 +texture = ExtResource("7_aen5b") + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BG折起来/HoverLight钥匙"] +polygon = PackedVector2Array(13.5, -10, 4, -10, -1.5, -7.8, -4, -9, -11.6, -9, -13.5, -6.2, -13.5, 10, -1.1, 10, 3.5, 3.6, 3.5, 2.2, 13.1, -3) + +[node name="EventBinder" type="Node" parent="BG折起来/HoverLight钥匙"] +script = ExtResource("6_aen5b") +memo = "c03_s06_hole_key=[0] 时,显示: [钥匙] +[钥匙] interacted 时: c03_s06_hole_key=1(greater)" +updater_event = &"c03_s06_hole_key" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +trigger_event = &"c03_s06_hole_key" +trigger_mode = "interacted" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="HoverLight刀柄" parent="BG折起来" instance=ExtResource("3_ko8md")] +position = Vector2(270, 177.5) +rotation = -0.487515 + +[node name="Sprite2D" type="Sprite2D" parent="BG折起来/HoverLight刀柄"] +light_mask = 5 +position = Vector2(-6, -1) +texture = ExtResource("6_ko8md") + +[node name="PointLight2D" type="PointLight2D" parent="BG折起来/HoverLight刀柄"] +position = Vector2(0.038147, -1.73529) +range_layer_max = 10 +range_item_cull_mask = 4 +texture = ExtResource("5_ur3qk") + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BG折起来/HoverLight刀柄"] +position = Vector2(-6, -1) +polygon = PackedVector2Array(-17.6, -11.5, -30.9, -6.5, -31.5, -6.5, -31.5, 9.9, -30.5, 10.6, -30.5, 11.5, 23.7, 11.5, 31.1, 7.5, 31.5, -10.3, 30.5, -11.3) + +[node name="EventBinder" type="Node" parent="BG折起来/HoverLight刀柄"] +script = ExtResource("6_aen5b") +memo = "c03_s06_hole_knife_handle=[0] 时,显示: [刀柄] +[刀柄] interacted 时: c03_s06_hole_knife_handle=1(greater)" +updater_event = &"c03_s06_hole_knife_handle" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +trigger_event = &"c03_s06_hole_knife_handle" +trigger_mode = "interacted" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="报纸折起来" type="Sprite2D" parent="BG折起来"] +light_mask = 0 +position = Vector2(240, 152.5) +texture = ExtResource("5_mbut7") + +[node name="BG展开" type="TextureRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("2_84xhv") + +[node name="报纸展开" parent="BG展开" instance=ExtResource("3_65bkn")] +position = Vector2(244, 171.5) +act_as_button = true +texture = ExtResource("3_mcv7n") + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BG展开/报纸展开"] +polygon = PackedVector2Array(21.2, -38, 1.2, -43, -5.4, -43, -9.4, -39, -11.4, -39, -21, -30.4, -21, -29.7, -24, -28.7, -24, -26.6, -25.2, -26, -28.4, -26, -31, -23.4, -31, -22.6, -32.2, -22, -34.3, -22, -43, -15.5, -43, -14.6, -50.2, -11, -53.3, -11, -57.3, -8, -59.4, -8, -63.4, -4, -66.5, -4, -68, -1.8, -68, 3, -63.1, 4, -57.2, 4, -56, 4.6, -56, 5.8, -51.1, 7, -47.2, 7, -41.2, 10, -37.4, 10, -37, 10.4, -37, 11.6, -24.2, 18, -22.3, 18, -19, 20.5, -19, 21.6, -16.2, 23, -14.4, 23, -14, 23.4, -14, 24.6, -3, 30.6, -3, 31.6, -0.199997, 33, 2.6, 33, 3, 33.4, 3, 34.7, 8, 36.6, 8, 37.6, 19, 42.6, 23.1, 43, 26, 37.2, 26, 34.4, 26.4, 34, 27.7, 34, 29, 30.2, 29, 29, 30.5, 29, 36.5, 22, 38, 22, 38, 19.4, 43.4, 14, 45, 14, 45, 11.4, 46.4, 10, 48, 10, 48, 8, 50, 8, 50, 6, 52, 6, 52, 4, 53.6, 4, 55, 1.2, 55, -0.599998, 58.4, -4, 59.6, -4, 67.6, -20, 68, -43, 67.1, -43, 25.9, -38) + +[node name="遮罩" type="TextureRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("2_wpl64") + +[node name="ContentInspector" parent="." instance=ExtResource("3_mkmvg")] +visible = false +mouse_filter = 2 + +[node name="遮罩" type="TextureRect" parent="ContentInspector"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("5_65bkn") + +[node name="Label" type="Label" parent="ContentInspector/遮罩"] +custom_minimum_size = Vector2(180, 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 = -60.0 +offset_top = -15.5 +offset_right = 60.0 +offset_bottom = 15.5 +grow_horizontal = 2 +grow_vertical = 2 +vertical_alignment = 1 +autowrap_mode = 3 +script = ExtResource("6_mbut7")