diff --git a/asset/audio/peiyin/c01/c01_书架游戏.ogg b/asset/audio/peiyin/c01/c01_书架游戏.ogg new file mode 100644 index 00000000..ec654892 Binary files /dev/null and b/asset/audio/peiyin/c01/c01_书架游戏.ogg differ diff --git a/asset/audio/peiyin/c01/c01_书架游戏.ogg.import b/asset/audio/peiyin/c01/c01_书架游戏.ogg.import new file mode 100644 index 00000000..34caf745 --- /dev/null +++ b/asset/audio/peiyin/c01/c01_书架游戏.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d30dh2pv67qvk" +path="res://.godot/imported/c01_书架游戏.ogg-bd25d8a6dba15aea7fc3c377f57d07ca.oggvorbisstr" + +[deps] + +source_file="res://asset/audio/peiyin/c01/c01_书架游戏.ogg" +dest_files=["res://.godot/imported/c01_书架游戏.ogg-bd25d8a6dba15aea7fc3c377f57d07ca.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/asset/dialogue/c01.csv b/asset/dialogue/c01.csv index 6620c316..a4b315fb 100644 --- a/asset/dialogue/c01.csv +++ b/asset/dialogue/c01.csv @@ -40,6 +40,7 @@ c01_7老板_5,新到的那批书堆着有碍观瞻,你赶紧去摆好。,书 c01_7小小蝶_1,...是在喊我吗?,吕萍,,,……是在和我讲话吗?,...Are you calling me? c01_7老板_6,店员就你一个,不是你还能是谁?,书店老板,,,店里厢就侬一个人,不叫侬还能叫啥人呢?,You're the only clerk here. Who else would it be? c01_7老板_7,手脚麻利点,不要耽误店里的生意。,书店老板,,,侬动作快点,不要影响做生意。,"Be quick about it, don't delay the shop's business." +c01_书架游戏,这些书...好像是按照图案、颜色、高低顺序来整理的。,吕萍,,,,"These books... seem to be arranged in order of pattern, color and height." c01_8监督小孩_1,发赏钱喽!发赏钱喽!,监督小孩,,,,Handing out tips! Handing out tips! c01_8监督小孩_2,哟,吕萍?你咋表演结束了才回来...,监督小孩,,,,"Oh, Lu Ping? Why are you only coming back after the performance ended..." c01_8监督小孩_3,你手里攥的什么东西?给我看看,不然我就找班主告状!,监督小孩,,,,"What's that in your hand? Show me, or I'll tell the troupe master!" @@ -47,8 +48,8 @@ c01_8监督小孩_4,这上头咋还刻着个人哩,脑袋圆圆的,一根毛 c01_8监督小孩_5,吕萍,你从哪弄来的?,监督小孩,,,,"Lu Ping, where did you get this?" c01_8小小蝶_1,你们...都看见了吗?,吕萍,,,,You... you all saw it? c01_8幼年陆仁_1,它要来了,快跑!,陆仁,,,,"It's coming, run!" -c01_9车夫_1,哎哟,当心——,车夫,,,,"Whoa, watch out----" -c01_9车夫_2,小姐,您没吓到吧?,车夫,,,,"Miss, I hope you weren't frightened?" +c01_9车夫_1,哎哟,当心——,车夫,,[#ban_skip],,"Whoa, watch out----" +c01_9车夫_2,小姐,您没吓到吧?,车夫,,[#ban_skip],,"Miss, I hope you weren't frightened?" c01_9小蝶_1,我刚刚...,吕萍,,,,I just... c01_9小蝶_2,师傅,刚才怎么了?,吕萍,,,师傅,刚刚哪能了?,"Master, what just happened?" c01_9车夫_3,斜拐弯冲出来个不长眼的「波波车」,差点就撞了!,车夫,,,,"Some blind fool in a motorcar came careening around the corner, nearly hit us!" diff --git a/asset/dialogue/c01.dialogue b/asset/dialogue/c01.dialogue index 655027ca..3c4f4158 100644 --- a/asset/dialogue/c01.dialogue +++ b/asset/dialogue/c01.dialogue @@ -59,6 +59,12 @@ 书店老板: 手脚麻利点,不要耽误店里的生意。 [ID:c01_7老板_7] => END + +~ c01_s08_书店书架游戏 +吕萍: 这些书...好像是按照图案、颜色、高低顺序来整理的。 [ID:c01_书架游戏] +=> END + + ~ c01_s12_诡异的书店外发钱 监督小孩: 发赏钱喽!发赏钱喽! [ID:c01_8监督小孩_1] => END diff --git a/asset/dialogue/npc.dialogue b/asset/dialogue/npc.dialogue index 8071e012..ea6cd2d8 100644 --- a/asset/dialogue/npc.dialogue +++ b/asset/dialogue/npc.dialogue @@ -32,6 +32,11 @@ 陆仁: 这帮孩子们太苦了,前些天又摔坏了一个,您行行好... [ID:c01_6幼年陆仁_1] => END +~ c01_s08_书店老板 +书店老板: 新到的那批书堆着有碍观瞻,你赶紧去摆好。 [ID:c01_7老板_5] +书店老板: 手脚麻利点,不要耽误店里的生意。 [ID:c01_7老板_7] +=> END + ~ c02_疯子_01 吕萍: 不好意思师傅,你知道这里有姓吕的人家吗? [ID:c02_2疯子_小蝶开场白] ???: 出去...出去...! [#anonymous] [ID:c02_2疯子_1] diff --git a/scene/ground/scene/c01/s08_书店.gd b/scene/ground/scene/c01/s08_书店.gd index ab9c6399..82815676 100644 --- a/scene/ground/scene/c01/s08_书店.gd +++ b/scene/ground/scene/c01/s08_书店.gd @@ -31,7 +31,7 @@ var mask: ColorRect var left_protal: Portal2D var shelf_game_success = false var envelope_game_success = false -var manager +var manager: Npc2D var mice var fall_off @@ -44,7 +44,7 @@ func _on_ground_ready() -> void: counter = $"../DeployLayer/Interactable报纸柜台" coin = $"../DeployLayer/Ambush银元" mice = $"../DeployLayer/自动跟随的老鼠" - manager = $"../DeployLayer/老板" + manager = $"../DeployLayer/Npc书店老板" fall_off = $"../DeployLayer/小小蝶坠落" # 首先放报纸,触发动画,领取任务 if counter.interacted_times > 0: @@ -70,8 +70,13 @@ func _on_ground_ready() -> void: else: mice.visible = false _check_portal() + _refresh_npc_enable_status() +func _refresh_npc_enable_status() -> void: + # 书店老板 Npc 状态 + manager.enabled = (counter.interacted_times > 0) and not shelf_game_success + func _check_portal(): if not shelf_game_success or not envelope_game_success: left_protal.holding = true @@ -109,16 +114,21 @@ func assign_tasks() -> void: SceneManager.unlock_player() ladder.enabled = true envolope_table.enabled = true + _refresh_npc_enable_status() func _exit_tree() -> void: if is_instance_valid(shelf_game_node): shelf_game_node.queue_free() +var first_enter_shelf_game := true func play_shelf_game() -> void: if shelf_game_node.get_parent() != get_parent(): get_parent().add_child(shelf_game_node) + if first_enter_shelf_game: + first_enter_shelf_game = false + DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s08_书店书架游戏") SceneManager.lock_player() _toggle_amb_sfx_volumn(true) @@ -151,6 +161,7 @@ func _on_shelf_game_success() -> void: # 从 sfx_生死簿演出 中退出时播放不出来,需要在此处播放 (global_play) # Util.timer(0.5, $"摔倒音效".play) _check_portal() + _refresh_npc_enable_status() func _on_fall_off_finished() -> void: diff --git a/scene/ground/scene/c01/s08_书店.tscn b/scene/ground/scene/c01/s08_书店.tscn index c71f13fb..b56e779e 100644 --- a/scene/ground/scene/c01/s08_书店.tscn +++ b/scene/ground/scene/c01/s08_书店.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=3 uid="uid://cwu4dhayra8pg"] +[gd_scene load_steps=24 format=3 uid="uid://cwu4dhayra8pg"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_b3cca"] [ext_resource type="Script" uid="uid://6q2pfbqsw10t" path="res://scene/ground/scene/c01/s08_书店.gd" id="2_0lque"] @@ -18,6 +18,7 @@ [ext_resource type="AudioStream" uid="uid://cniawn37n8888" path="res://asset/audio/sfx/交互/序章/04_书店内_递交报纸.ogg" id="9_lfr41"] [ext_resource type="AudioStream" uid="uid://b8sbtn3l37uh" path="res://asset/audio/sfx/旧版/c02/红屏.ogg" id="9_srknn"] [ext_resource type="Texture2D" uid="uid://bp4y3vujvsl7r" path="res://asset/art/scene/c01/s08_书店/fg_前景.png" id="10_4e3a1"] +[ext_resource type="PackedScene" uid="uid://0sofmhrl358m" path="res://scene/entity/npc.tscn" id="16_wg16e"] [ext_resource type="PackedScene" uid="uid://decfqoe5v0y6n" path="res://scene/effect/dizzy_shader.tscn" id="18_wg16e"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_xqgjo"] @@ -163,13 +164,15 @@ trigger_mode = "interact" cooldown_time = 1.0 hook_method = "pay_off_wage" -[node name="老板" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="9"] -position = Vector2(151, -2) +[node name="Npc书店老板" parent="Ground/DeployLayer" index="9" instance=ExtResource("16_wg16e")] +position = Vector2(151, 0) sprite_frames = ExtResource("8_hunwx") animation = &"老板写字" -autoplay = "老板写字" -frame = 3 -frame_progress = 0.119486 +offset = Vector2(1.07, 0) +enabled = false +sign_mark_height = -18.42 +speaking_sign_height = 13.75 +dialogue_title = "c01_s08_书店老板" [node name="小小蝶坠落" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="10"] visible = false