diff --git a/asset/art/gif/c03_三楼/c03_三楼_frames.tres b/asset/art/gif/c03_三楼/c03_三楼_frames.tres index cf61f6c9..84b685e1 100644 --- a/asset/art/gif/c03_三楼/c03_三楼_frames.tres +++ b/asset/art/gif/c03_三楼/c03_三楼_frames.tres @@ -1,24 +1,19 @@ [gd_resource type="SpriteFrames" load_steps=12 format=3 uid="uid://cljrkkmy2pwdp"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/0.png" id="1_638l7"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/1.png" id="2_nl5dv"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/2.png" id="3_fneuh"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/3.png" id="4_fmw1k"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/4.png" id="5_2o31u"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/5.png" id="6_texvw"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/6.png" id="7_cr48g"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/7.png" id="8_v8byt"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/8.png" id="9_o63c7"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/9.png" id="10_jhtld"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c03_三楼/三楼窗户动画/10.png" id="11_6lgaf"] +[ext_resource type="Texture2D" uid="uid://wmi5qfusoc6r" path="res://asset/art/gif/c03_三楼/三楼窗户动画/0.png" id="1_638l7"] +[ext_resource type="Texture2D" uid="uid://bj3mpwu8ocpma" path="res://asset/art/gif/c03_三楼/三楼窗户动画/1.png" id="2_nl5dv"] +[ext_resource type="Texture2D" uid="uid://bf5ioldgjjl3o" path="res://asset/art/gif/c03_三楼/三楼窗户动画/2.png" id="3_fneuh"] +[ext_resource type="Texture2D" uid="uid://c38cl6nof6myf" path="res://asset/art/gif/c03_三楼/三楼窗户动画/3.png" id="4_fmw1k"] +[ext_resource type="Texture2D" uid="uid://buevhcobtv5ya" path="res://asset/art/gif/c03_三楼/三楼窗户动画/4.png" id="5_2o31u"] +[ext_resource type="Texture2D" uid="uid://bkrbcsbnxdy2r" path="res://asset/art/gif/c03_三楼/三楼窗户动画/5.png" id="6_texvw"] +[ext_resource type="Texture2D" uid="uid://bdp7rd8sn23jh" path="res://asset/art/gif/c03_三楼/三楼窗户动画/6.png" id="7_cr48g"] +[ext_resource type="Texture2D" uid="uid://dptgag6ns51lj" path="res://asset/art/gif/c03_三楼/三楼窗户动画/7.png" id="8_v8byt"] +[ext_resource type="Texture2D" uid="uid://cnvk3wsupxluq" path="res://asset/art/gif/c03_三楼/三楼窗户动画/8.png" id="9_o63c7"] +[ext_resource type="Texture2D" uid="uid://6cur72juq0ag" path="res://asset/art/gif/c03_三楼/三楼窗户动画/9.png" id="10_jhtld"] +[ext_resource type="Texture2D" uid="uid://bkujjii8fgdl4" path="res://asset/art/gif/c03_三楼/三楼窗户动画/10.png" id="11_6lgaf"] [resource] animations = [{ -"frames": [], -"loop": true, -"name": &"default", -"speed": 5.0 -}, { "frames": [{ "duration": 3.9, "texture": ExtResource("1_638l7") diff --git a/asset/art/prop/c03/1015钥匙.png b/asset/art/prop/c03/1015钥匙.png new file mode 100755 index 00000000..cf4ef226 Binary files /dev/null and b/asset/art/prop/c03/1015钥匙.png differ diff --git a/asset/art/prop/c03/1015钥匙.png.import b/asset/art/prop/c03/1015钥匙.png.import new file mode 100644 index 00000000..71191f71 --- /dev/null +++ b/asset/art/prop/c03/1015钥匙.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ct02nauw1f5v5" +path="res://.godot/imported/1015钥匙.png-21225860d858cbcd9ded43ea9178f670.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/1015钥匙.png" +dest_files=["res://.godot/imported/1015钥匙.png-21225860d858cbcd9ded43ea9178f670.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/c03.dialogue b/asset/dialogue/c03.dialogue index 20fc6908..786157d0 100644 --- a/asset/dialogue/c03.dialogue +++ b/asset/dialogue/c03.dialogue @@ -4,6 +4,14 @@ 陆仁: （父母让小蝶去送请柬，顺便带肉回家做饭） => END +~ c03_s02_邀请小蝉与瞎子对话1 +小蝶: （邀请小蝉去家里吃饭） +方瞎子: （坐在桌前抽烟（咳嗽）） +... +... +=> END + + ~ c03_s04_整理麻将游戏0 # 打牌准备，整理麻将盒游戏成功（演出至麻将搬到桌上）: 李氏: 记得当年这箱麻将还是我弟弟背回来的。 diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 7b98f0e9..0cd28dbe 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -92,18 +92,31 @@ prop_木头人偶_说明,略显粗糙的木头玩偶，能依稀辨认出是个 prop_粘鼠板,粘鼠板,,,[#texture=c02/粘鼠板特写.png],,Sticky Trap prop_粘鼠板_说明,自制的捕鼠工具，纸上面有黏黏的浆糊,,,,,Homemade mouse trap with sticky paste on paper prop_一把香,一把香,,,[#texture=c03/一把香.png][#inspect=c03/一把香.png],,Bundle of Incense +prop_一把香_说明,说明,,,,, prop_麻将2,麻将（二）,,,[#texture=c03/麻将2.png][#inspect=c03/ux_麻将2.png],, +prop_麻将2_说明,说明,,,,, prop_一碗浆糊,一碗浆糊,,,[#texture=c03/一碗浆糊.png][#inspect=c03/ux_一碗浆糊.png],, +prop_一碗浆糊_说明,说明,,,,, prop_纸舌头,纸舌头,,,[#texture=c03/下半部的舌头.png][#inspect=c03/ux_下半部的舌头.png],, +prop_纸舌头_说明,说明,,,,, prop_刀把,刀把,,,[#texture=c03/刀把.png][#inspect=c03/ux_刀把.png],, +prop_刀把_说明,说明,,,,, prop_剪下的辫子,剪下的辫子,,,[#texture=c03/剪下的辫子.png][#inspect=c03/ux_剪下的辫子.png],, +prop_剪下的辫子_说明,说明,,,,, prop_沾血的纸条,沾血的纸条,,,[#texture=c03/沾血的纸条.png][#inspect=c03/ux_沾血的纸条.png],, +prop_沾血的纸条_说明,说明,,,,, prop_纸铜钱1,纸铜钱,,,[#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png],, +prop_纸铜钱1_说明,说明,,,,, prop_2个纸铜钱,一对纸铜钱,,,[#texture=c03/2个纸铜钱.png],, +prop_2个纸铜钱_说明,说明,,,,, prop_3个纸铜钱,三个纸铜钱,,,[#texture=c03/3个纸铜钱.png],, +prop_3个纸铜钱_说明,说明,,,,, prop_剪刀,剪刀,,,[#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png],, +prop_剪刀_说明,说明,,,,, prop_药包,药包,,,[#texture=c03/药包.png][#inspect=c03/ux_药包.png],, +prop_药包_说明,说明,,,,, prop_菜刀,菜刀,,,[#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png],, +prop_菜刀_说明,说明,,,,, prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png],,Director's Letter prop_院长的信_说明,小萍：{br}你现下境况如何？{br}你虽离开浦育院已久，但我始终没有忘记为你祈祷。{br}愿上帝保佑你走向真正光明的道路。我相信这也是当年你父亲将你托付给我时的殷切愿景。{br}你既已成人，无论你的父母出于何种理由选择与你分离，你都应当拥有知晓真相的权利，所以我将公寓地址附在了信后，除此之外，我亦知之甚少。{br}若有闲暇，欢迎你回浦育院看看。{br}院长童玉君{br}民国二十一年十月十五日{br}公寓地址 芦昌路26弄3号,,,,,"Xiao Ping:{br}How are you faring now?{br}Though you left Puyu Orphanage long ago, I have never forgotten to pray for you.{br}May God bless you to walk the path of true enlightenment. I believe this was also your father's earnest wish when he entrusted you to my care.{br}Now that you are grown, regardless of whatever reasons your parents had for separating from you, you deserve the right to know the truth. I have attached the apartment address to this letter, though I know little beyond this.{br}If you have time, you are welcome to visit Puyu Orphanage.{br}Director Tong Yujun{br}October 15th, Year 21 of the Republic{br}Apartment Address: No. 3, Lane 26, Luchang Road" prop_船票,船票,,,[#texture=c02/船票.png],,Boat Ticket @@ -114,6 +127,8 @@ prop_小蝉人偶,小蝉人偶,,,[#texture=c02/小蝉人偶.png],,Little Chan Do prop_小蝉人偶_说明,小小的人儿，小小的鞋子，小小的友情啊——像蝶依偎着花。,,,,,"Little person, little shoes, little friendship—like a butterfly nestled against a flower." prop_单只小鞋子,一只小鞋子,,,[#texture=c02/小鞋子1.png],,A Single Small Shoe prop_单只小鞋子_说明,这只小鞋子曾经属于一个裹了小脚的女孩。{br}鞋不成双，祸事难防。,,,,,"This small shoe once belonged to a girl with bound feet.{br}When shoes don't come in pairs, misfortune is hard to prevent." +prop_邀请信,邀请信,,,[#texture=c03/邀请信.png][#inspect=c03/ux_邀请信.png],, +prop_邀请信_说明,邀请信说明,,,,, c01_s05_检查院长房间,好像忘记了什么事情，再回去检查一遍吧。,,ID格式： prop_xx_说明,,,I feel like I've forgotten something. Let me go back and check again. c01_s07_需要报纸,书店还没开门。,,,,,The bookstore isn't open yet. c01_s08_书店工作,老板交代的工作还没做完，不能偷懒。,,,,,I haven't finished the work the boss assigned. I can't slack off. diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 9ed8a536..475eccba 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -115,18 +115,34 @@ #c03 一把香 [#texture=c03/一把香.png] [#inspect=c03/一把香.png] [ID:prop_一把香] +说明 [ID:prop_一把香_说明] 麻将（二） [#texture=c03/麻将2.png] [#inspect=c03/ux_麻将2.png] [ID:prop_麻将2] +说明 [ID:prop_麻将2_说明] 一碗浆糊 [#texture=c03/一碗浆糊.png] [#inspect=c03/ux_一碗浆糊.png] [ID:prop_一碗浆糊] +说明 [ID:prop_一碗浆糊_说明] 纸舌头 [#texture=c03/下半部的舌头.png][#inspect=c03/ux_下半部的舌头.png] [ID:prop_纸舌头] +说明 [ID:prop_纸舌头_说明] 刀把 [#texture=c03/刀把.png][#inspect=c03/ux_刀把.png] [ID:prop_刀把] +说明 [ID:prop_刀把_说明] 剪下的辫子 [#texture=c03/剪下的辫子.png][#inspect=c03/ux_剪下的辫子.png] [ID:prop_剪下的辫子] +说明 [ID:prop_剪下的辫子_说明] 沾血的纸条 [#texture=c03/沾血的纸条.png] [#inspect=c03/ux_沾血的纸条.png] [ID:prop_沾血的纸条] +说明 [ID:prop_沾血的纸条_说明] 纸铜钱 [#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png] [ID:prop_纸铜钱1] +说明 [ID:prop_纸铜钱1_说明] 一对纸铜钱 [#texture=c03/2个纸铜钱.png] [ID:prop_2个纸铜钱] +说明 [ID:prop_2个纸铜钱_说明] 三个纸铜钱 [#texture=c03/3个纸铜钱.png] [ID:prop_3个纸铜钱] +说明 [ID:prop_3个纸铜钱_说明] 剪刀 [#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png] [ID:prop_剪刀] +说明 [ID:prop_剪刀_说明] 药包 [#texture=c03/药包.png][#inspect=c03/ux_药包.png] [ID:prop_药包] +说明 [ID:prop_药包_说明] 菜刀 [#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png] [ID:prop_菜刀] +说明 [ID:prop_菜刀_说明] +1015钥匙 [#texture=c03/1015钥匙.png] [ID:prop_1015钥匙] +说明 [ID:prop_1015钥匙_说明] + # 旧版 #令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png] [ID:prop_令牌] @@ -150,6 +166,9 @@ 小小的人儿，小小的鞋子，小小的友情啊——像蝶依偎着花。 [ID:prop_小蝉人偶_说明] 一只小鞋子 [#texture=c02/小鞋子1.png] [ID:prop_单只小鞋子] 这只小鞋子曾经属于一个裹了小脚的女孩。{br}鞋不成双，祸事难防。[ID:prop_单只小鞋子_说明] +# c03 +邀请信 [#texture=c03/邀请信.png][#inspect=c03/ux_邀请信.png] [ID:prop_邀请信] +邀请信说明 [ID:prop_邀请信_说明] => END #~ prop说明 diff --git a/scene/entity/ux/content_inspector.gd b/scene/entity/ux/content_inspector.gd index 6042c775..f4c3f5cb 100644 --- a/scene/entity/ux/content_inspector.gd +++ b/scene/entity/ux/content_inspector.gd @@ -1,8 +1,7 @@ extends Control class_name ContentInspector -@warning_ignore("unused_signal") -signal exit +signal toggle_display(displaying: bool) @onready var label = $TipContainer/Label as Label @@ -41,6 +40,7 @@ func _unhandled_input(event: InputEvent) -> void: if not visible: return if event.is_action_pressed("interact"): + get_viewport().set_input_as_handled() if not visible: $"Sfx显示".play() visible = true @@ -50,8 +50,4 @@ func _unhandled_input(event: InputEvent) -> void: $"Sfx收起".play() displaying = not displaying _setup_content() - get_viewport().set_input_as_handled() - # elif event.is_action_pressed("cancel"): - # exit.emit() - # visible = false - # get_viewport().set_input_as_handled() + toggle_display.emit(displaying) \ No newline at end of file diff --git a/scene/ground/scene/c03/s02_瞎子新卧室.gd b/scene/ground/scene/c03/s02_瞎子新卧室.gd index 1d56244e..4c0c4792 100644 --- a/scene/ground/scene/c03/s02_瞎子新卧室.gd +++ b/scene/ground/scene/c03/s02_瞎子新卧室.gd @@ -14,6 +14,10 @@ func _ready() -> void: #region node_reference +var pickable李癞钥匙: Pickable2D +var ambush小猫挠墙: Ambush2D +var note带血的手帕: Note2D +var note小蝉的寻人启事: Note2D var closeup洋糕点: Closeup2D var 煤油灯: Gaslight var note小蝉的床: Note2D @@ -23,6 +27,10 @@ var note通风管道: Note2D # 读取设置变量名 func _setup_node_reference() -> void: + pickable李癞钥匙 = $"../Pickable李癞钥匙" + ambush小猫挠墙 = $"../DeployLayer/Ambush小猫挠墙" + note带血的手帕 = $"../DeployLayer/Note带血的手帕" + note小蝉的寻人启事 = $"../DeployLayer/Note小蝉的寻人启事" closeup洋糕点 = $"../DeployLayer/Closeup洋糕点" 煤油灯 = $"../DeployLayer/煤油灯" note小蝉的床 = $"../DeployLayer/Note小蝉的床" @@ -35,6 +43,9 @@ func _on_ground_ready() -> void: 煤油灯.lighted.connect(_gaslight_up, CONNECT_ONE_SHOT) else: closeup洋糕点.enabled = true + if ambush小猫挠墙.played: + ambush小猫挠墙.visible = false + pickable李癞钥匙.visible = true func _gaslight_up() -> void: @@ -45,3 +56,15 @@ func _gaslight_up() -> void: func _set_notes_coverer(coverer: String) -> void: note小蝉的床.note_key_coverer = coverer note通风管道.note_key_coverer = coverer + + +func scratching_cat_interacted() -> void: + # TODO + SceneManager.pop_debug_dialog_info("美术", "蹲下摸小猫，小猫离开") + # 蹲下 ～ 起立 + await SceneManager.lock_player(0, 12) + await Util.wait(0.5) + await SceneManager.player_action(14) + ambush小猫挠墙.visible = false + pickable李癞钥匙.visible = true + SceneManager.unlock_player() diff --git a/scene/ground/scene/c03/s02_瞎子新卧室.tscn b/scene/ground/scene/c03/s02_瞎子新卧室.tscn index 3fa1605b..690ba9d8 100644 --- a/scene/ground/scene/c03/s02_瞎子新卧室.tscn +++ b/scene/ground/scene/c03/s02_瞎子新卧室.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://ctwy1ubhm68la"] +[gd_scene load_steps=28 format=3 uid="uid://ctwy1ubhm68la"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_jad6f"] [ext_resource type="Script" uid="uid://tk4wg0i4payx" path="res://scene/ground/scene/c03/s02_瞎子新卧室.gd" id="2_y504i"] @@ -11,12 +11,21 @@ [ext_resource type="Texture2D" uid="uid://vqyhgyka3sfo" path="res://asset/art/scene/c02/s08_瞎子卧室/瞎子卧室前景.png" id="8_hehhg"] [ext_resource type="Script" uid="uid://n56a07gyjq1u" path="res://scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd" id="8_pixqd"] [ext_resource type="SpriteFrames" uid="uid://div8kcn7gu78r" path="res://asset/art/gif/c03_小蝶询问瞎子/c03_小蝶询问瞎子_frames.tres" id="10_2hv3f"] +[ext_resource type="Texture2D" uid="uid://ltlwibpxcvmv" path="res://asset/art/scene/c03/s02_瞎子新卧室/一沓寻人启事.png" id="10_fl7if"] [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="10_jad6f"] [ext_resource type="PackedScene" uid="uid://cxw5rovg5mu1a" path="res://scene/ground/script/c02/s00_煤油灯.tscn" id="10_kchgf"] [ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="10_v3seo"] [ext_resource type="Texture2D" uid="uid://bcqcvohj7jy40" path="res://asset/art/scene/c02/杂物/煤油灯 关灯.png" id="11_crt0l"] +[ext_resource type="Texture2D" uid="uid://cvjjktl6pkbo7" path="res://asset/art/scene/c03/s02_瞎子新卧室/带血的手帕.png" id="11_j2h7r"] +[ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="12_es0xo"] [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="12_kffel"] [ext_resource type="PackedScene" uid="uid://jp6ut4wayw7g" path="res://scene/ground/script/c03/s02_closeup洋糕点.tscn" id="13_fl7if"] +[ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="13_v3seo"] +[ext_resource type="Texture2D" uid="uid://c86bfer5qwp2g" path="res://asset/art/scene/c03/s02_瞎子新卧室/桌上放着邀请信.png" id="13_yl4ee"] +[ext_resource type="Texture2D" uid="uid://l7cuvw1k5xc1" path="res://asset/art/scene/c03/s02_瞎子新卧室/洋糕点和符纸.png" id="18_t8u8e"] +[ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="23_6show"] +[ext_resource type="Texture2D" uid="uid://ct02nauw1f5v5" path="res://asset/art/prop/c03/1015钥匙.png" id="24_ac6iq"] +[ext_resource type="SpriteFrames" uid="uid://c8dl7c68f1yb0" path="res://asset/art/gif/c02_二楼/c02_二楼_frames.tres" id="24_omt0s"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -77,23 +86,57 @@ position = Vector2(144, -16) scale = Vector2(0.5, 0.5) texture = ExtResource("7_u55tr") -[node name="Note通风管道" parent="Ground/DeployLayer" index="5" instance=ExtResource("10_v3seo")] +[node name="Note小蝉的寻人启事" parent="Ground/DeployLayer" index="5" instance=ExtResource("10_v3seo")] +unique_name_in_owner = true +position = Vector2(325, 39) +texture = ExtResource("10_fl7if") +sign_mark_offset = Vector2(1, -7) +title_filter = "c03" +note_key = "c03_s02_通风管道" + +[node name="Note带血的手帕" parent="Ground/DeployLayer" index="6" instance=ExtResource("10_v3seo")] +unique_name_in_owner = true +position = Vector2(139, 72) +texture = ExtResource("11_j2h7r") +sign_mark_offset = Vector2(1, -7) +title_filter = "c03" +note_key = "c03_s02_通风管道" + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Note带血的手帕"] +script = ExtResource("12_es0xo") +memo = "c03_invite_xchan_supper=[2:已完成邀请] 时,显示: [带血的手帕] +" +updater_event = &"c03_invite_xchan_supper" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([2]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="Pickable邀请信" parent="Ground/DeployLayer" index="7" instance=ExtResource("13_v3seo")] +position = Vector2(454, 42) +texture = ExtResource("13_yl4ee") +as_important_item = true +sign_mark_offset = Vector2(0, -4) +prop_key = "prop_邀请信" + +[node name="Note通风管道" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_v3seo")] unique_name_in_owner = true position = Vector2(510, 23) sign_mark_offset = Vector2(0, -80.86) title_filter = "c03" note_key = "c03_s02_通风管道" -[node name="Note小蝉的床" parent="Ground/DeployLayer" index="6" instance=ExtResource("10_v3seo")] +[node name="Note小蝉的床" parent="Ground/DeployLayer" index="9" instance=ExtResource("10_v3seo")] unique_name_in_owner = true position = Vector2(478, 49) title_filter = "c03" note_key = "c03_s02_小蝉的床" -[node name="煤油灯" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_kchgf")] +[node name="煤油灯" parent="Ground/DeployLayer" index="10" instance=ExtResource("10_kchgf")] unique_name_in_owner = true position = Vector2(167, 31) sprite_scale = 0.33 +animation_low_mode = true hide_texture = true gaslight_energy = 2.0 gaslight_ground_energy = 2.0 @@ -104,13 +147,15 @@ show_behind_parent = true position = Vector2(0, -15) texture = ExtResource("11_crt0l") -[node name="Closeup洋糕点" parent="Ground/DeployLayer" index="8" instance=ExtResource("12_kffel")] +[node name="Closeup洋糕点" parent="Ground/DeployLayer" index="11" instance=ExtResource("12_kffel")] unique_name_in_owner = true -position = Vector2(196, 19) +position = Vector2(193, 22) +texture = ExtResource("18_t8u8e") packed_scene = ExtResource("13_fl7if") +sign_mark_offset = Vector2(3, -5) enabled = false -[node name="Event2D偷听陆仁对话后" type="Node2D" parent="Ground/DeployLayer" index="9"] +[node name="Event2D偷听陆仁对话后" type="Node2D" parent="Ground/DeployLayer" index="12"] script = ExtResource("8_pixqd") event_name = &"c03_invite_xchan_supper" event_stages = Array[int]([1]) @@ -133,13 +178,47 @@ action_configs = Array[Dictionary]([{ "intro_loop": 1 }]) -[node name="MainPlayer" parent="Ground" index="5"] +[node name="Ambush小猫挠墙" parent="Ground/DeployLayer" index="13" instance=ExtResource("23_6show")] +unique_name_in_owner = true +position = Vector2(507, 49) +trigger_mode = "interact" +hook_method = "scratching_cat_interacted" + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Ambush小猫挠墙"] +script = ExtResource("12_es0xo") +memo = "c03_invite_xchan_supper!=[0:初始化|1:已偷听_需邀请] 时,显示: [小猫挠墙] +" +updater_event = &"c03_invite_xchan_supper" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stage_mode = "exclude" +updater_stages = Array[int]([0, 1]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="小猫挠墙" type="AnimatedSprite2D" parent="Ground/DeployLayer/Ambush小猫挠墙"] +position = Vector2(-2, 17) +sprite_frames = ExtResource("24_omt0s") +animation = &"叼纸小猫坐着呼吸" + +[node name="Pickable李癞钥匙" parent="Ground" instance=ExtResource("13_v3seo")] +unique_name_in_owner = true +visible = false +position = Vector2(511, 71) +prop_key = "prop_1015钥匙" + +[node name="Sprite2D" type="Sprite2D" parent="Ground/Pickable李癞钥匙"] +position = Vector2(-2, 6) +rotation = -0.875318 +scale = Vector2(0.1, 0.1) +texture = ExtResource("24_ac6iq") + +[node name="MainPlayer" parent="Ground" index="6"] position = Vector2(63, 95) catty_light_energy = 0.5 player_movement_rect = Rect2(17, -158, 492, 316) facing_direction = Vector2(1, 0) -[node name="CameraFocusMarker" parent="Ground" index="6"] +[node name="CameraFocusMarker" parent="Ground" index="7"] limit_left = 0 limit_top = -158 limit_right = 564 @@ -156,7 +235,7 @@ scale = Vector2(1.1, 1.1) [node name="PlayerLine2D" parent="Ground/ParallaxForeground" index="2"] points = PackedVector2Array(17, 150, 509, 150) -[node name="DirectionalLight2D" parent="Ground" index="8"] +[node name="DirectionalLight2D" parent="Ground" index="9"] visible = false energy = 0.8 blend_mode = 1 diff --git a/scene/ground/script/c03/s02_closeup洋糕点.gd b/scene/ground/script/c03/s02_closeup洋糕点.gd index 216e7d50..5e4521ff 100644 --- a/scene/ground/script/c03/s02_closeup洋糕点.gd +++ b/scene/ground/script/c03/s02_closeup洋糕点.gd @@ -5,5 +5,11 @@ signal exit(arg) @onready var bg = $BG as TextureRect + func _ready() -> void: layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME + $ContentInspector.toggle_display.connect(_on_toggle_display) + + +func _on_toggle_display(displaying: bool): + $"BG有符".visible = not displaying diff --git a/scene/ground/script/c03/s02_closeup洋糕点.tscn b/scene/ground/script/c03/s02_closeup洋糕点.tscn index e4b5cf35..497c2a29 100644 --- a/scene/ground/script/c03/s02_closeup洋糕点.tscn +++ b/scene/ground/script/c03/s02_closeup洋糕点.tscn @@ -1,21 +1,49 @@ -[gd_scene load_steps=6 format=3 uid="uid://jp6ut4wayw7g"] +[gd_scene load_steps=7 format=3 uid="uid://jp6ut4wayw7g"] [ext_resource type="Script" uid="uid://g8moj85vc4ad" path="res://scene/ground/script/c03/s02_closeup洋糕点.gd" id="1_i4mac"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_1bew5"] +[ext_resource type="Texture2D" uid="uid://cl16lnirm2r4b" path="res://asset/art/scene/c03/s02_瞎子新卧室/ux_桌上的碗特写无符.png" id="2_1ggwo"] +[ext_resource type="Texture2D" uid="uid://df1lnvef25eha" path="res://asset/art/scene/c03/s02_瞎子新卧室/ux_桌上的碗特写有符.png" id="2_i4mac"] [ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_1ggwo"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_td6vl"] -[ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="6_mdgwr"] +[ext_resource type="Texture2D" uid="uid://bysk5b7dpplq8" path="res://asset/art/scene/c03/s02_瞎子新卧室/ux_碗内符.png" id="4_1bew5"] [node name="Closeup洋糕点" type="CanvasLayer"] script = ExtResource("1_i4mac") -[node name="BG" type="TextureRect" parent="."] +[node name="BG无符" type="TextureRect" parent="."] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 0 +texture = ExtResource("2_1ggwo") + +[node name="BG有符" type="TextureRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 0 +texture = ExtResource("2_i4mac") + +[node name="ContentInspector" parent="." instance=ExtResource("3_1ggwo")] +mouse_filter = 2 + +[node name="符纸" type="TextureRect" parent="ContentInspector"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 38.0 +offset_bottom = -38.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("4_1bew5") +expand_mode = 1 +stretch_mode = 5 [node name="遮罩" type="TextureRect" parent="."] anchors_preset = 15 @@ -25,34 +53,3 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 texture = ExtResource("2_1bew5") - -[node name="ContentInspector" parent="." instance=ExtResource("3_1ggwo")] -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_td6vl") - -[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_mdgwr") diff --git a/scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd b/scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd index 02c5fd98..de4718bc 100644 --- a/scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd +++ b/scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd @@ -14,6 +14,7 @@ func _ready() -> void: func _on_global_stage_updated(e: StringName, s: int): super._on_global_stage_updated(e, s) +var c03_dialogue = preload("uid://b66v5hsf3tdox") as DialogueResource func _on_ground_ready(_ground: Ground2D): # 邀请小蝉晚饭 @@ -21,10 +22,16 @@ func _on_ground_ready(_ground: Ground2D): SceneManager.lock_player() SceneManager.get_player().set_facing_direction(Vector2.RIGHT) var the_blind = $"瞎子抽烟" as AnimatedSprite2D + DialogueManager.show_dialogue_balloon(c03_dialogue, "c03_s02_邀请小蝉与瞎子对话1") the_blind.play("瞎子_抽烟") await the_blind.animation_finished + # TODO + SceneManager.pop_debug_dialog_info("音效", "灰姑的老鼠叫和影子出现，猫咪害怕的声音响起") the_blind.play("瞎子_咳嗽吐血") await the_blind.animation_finished + var tween = create_tween() + tween.tween_property(self, "modulate:a", 0.0, 1.0) + await tween.finished # 邀请成功 EventManager.set_stage(event_name, 2) SceneManager.unlock_player()