Merge remote-tracking branch 'origin/demo'

asset/art/scene/c00/皮影戏台/e_小小蝶.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dhrl5mlivx108"
+uid="uid://bsdwv58y020wo"
-path="res://.godot/imported/ux_戏台特写(无道具）.png-67b9a4ba44b33dfe402edeedd742db17.ctex"
+path="res://.godot/imported/e_小小蝶.png-4ecf8c850adde9f37c6052f9b9e7389f.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具）.png"
+source_file="res://asset/art/scene/c00/皮影戏台/e_小小蝶.png"
-dest_files=["res://.godot/imported/ux_戏台特写(无道具）.png-67b9a4ba44b33dfe402edeedd742db17.ctex"]
+dest_files=["res://.godot/imported/e_小小蝶.png-4ecf8c850adde9f37c6052f9b9e7389f.ctex"]
 
 [params]
 

asset/art/scene/c00/皮影戏台/e_树.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b6e8hnqmb7p85"
+path="res://.godot/imported/e_树.png-7d5916e586149628a743c76c232d7c97.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/e_树.png"
+dest_files=["res://.godot/imported/e_树.png-7d5916e586149628a743c76c232d7c97.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

asset/art/scene/c00/皮影戏台/e_父母.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b5m5ooyeyrw6v"
+path="res://.godot/imported/e_父母.png-9d691fd9be6603309d741f02f9b3c449.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/e_父母.png"
+dest_files=["res://.godot/imported/e_父母.png-9d691fd9be6603309d741f02f9b3c449.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

asset/art/scene/c00/皮影戏台/e_老鼠.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cb8asvu3xe45e"
+path="res://.godot/imported/e_老鼠.png-50606c07ae8bf219224e479e9bc05bb7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/e_老鼠.png"
+dest_files=["res://.godot/imported/e_老鼠.png-50606c07ae8bf219224e479e9bc05bb7.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

asset/art/scene/c00/皮影戏台/小小蝶.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ibapja61d10t"
+path="res://.godot/imported/小小蝶.png-943a87ffc31aeac53c7704a768dce041.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/小小蝶.png"
+dest_files=["res://.godot/imported/小小蝶.png-943a87ffc31aeac53c7704a768dce041.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

asset/art/scene/c00/皮影戏台/戏台特写_无道具.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ddc5w557us5go"
+path="res://.godot/imported/戏台特写_无道具.png-da495d01d3b2ca4b397c0ae93680ec43.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/戏台特写_无道具.png"
+dest_files=["res://.godot/imported/戏台特写_无道具.png-da495d01d3b2ca4b397c0ae93680ec43.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

asset/art/scene/c00/皮影戏台/树.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d2mt157jjltcl"
+path="res://.godot/imported/树.png-2264fc671d9f2f09a532a0dda5c4a59c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/树.png"
+dest_files=["res://.godot/imported/树.png-2264fc671d9f2f09a532a0dda5c4a59c.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

asset/art/scene/c00/皮影戏台/父母.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bya484vjsy17t"
+path="res://.godot/imported/父母.png-cc9183e14784b196f09f940075733e8c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/父母.png"
+dest_files=["res://.godot/imported/父母.png-cc9183e14784b196f09f940075733e8c.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

asset/art/scene/c00/皮影戏台/老鼠.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bj2mbrk3xcrg3"
+path="res://.godot/imported/老鼠.png-67cde79bae4b74afeaaf14b85dedf974.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/老鼠.png"
+dest_files=["res://.godot/imported/老鼠.png-67cde79bae4b74afeaaf14b85dedf974.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

asset/art/scene/c00/皮影戏台/草药.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://drde0wrtkea4h"
+path="res://.godot/imported/草药.png-104a1300cb8e035f2fadf0af723e364c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c00/皮影戏台/草药.png"
+dest_files=["res://.godot/imported/草药.png-104a1300cb8e035f2fadf0af723e364c.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

asset/dialogue/event_stage.dialogue

@@ -1,6 +1,8 @@
 ~ EventStage_c00
 release_stage: 0:demo 1:release
 current_chapter_stage: 1:序章 2:第一章 3:第二章 4:第三章 5:第四章 6:尾声
+# 戏台
+opera_stage: 0:null 1:树_小蝶 2:父母 3:老鼠
 => END
 
 ~ EventStage_c02

scene/ground/scene/c02/s05_一楼内侧楼道.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=43 format=3 uid="uid://cp8d3ag5nbjq0"]
+[gd_scene load_steps=48 format=3 uid="uid://cp8d3ag5nbjq0"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_6w6et"]
 [ext_resource type="Script" uid="uid://dydpmjpcvt3v1" path="res://scene/ground/scene/c02/s05_一楼内侧楼道.gd" id="2_70lf6"]
@@ -18,11 +18,16 @@
 [ext_resource type="PackedScene" uid="uid://c1vrp1o8ci512" path="res://scene/ground/script/c02/戏台特写.tscn" id="11_2yvhw"]
 [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="13_uj0pt"]
 [ext_resource type="Texture2D" uid="uid://c3wytxnirtx27" path="res://asset/art/scene/c02/s05_一楼内侧楼道/e_地上血迹.png" id="14_s2g5k"]
+[ext_resource type="Texture2D" uid="uid://b6e8hnqmb7p85" path="res://asset/art/scene/c00/皮影戏台/e_树.png" id="15_avr26"]
 [ext_resource type="Texture2D" uid="uid://bpqcq0a0ffhlr" path="res://asset/art/scene/c02/s05_一楼内侧楼道/e_打开的通道.png" id="15_s2g5k"]
 [ext_resource type="Texture2D" uid="uid://ctvw1qr1mpogb" path="res://asset/art/scene/c02/s05_一楼内侧楼道/e_放置粘鼠板.png" id="16_jknyg"]
+[ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="16_udxre"]
 [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="17_aofps"]
 [ext_resource type="SpriteFrames" uid="uid://cvwdqa8gyqj4g" path="res://asset/art/gif/c02_一楼内侧/c02_一楼内侧_frames.tres" id="17_bk7rf"]
+[ext_resource type="Texture2D" uid="uid://bsdwv58y020wo" path="res://asset/art/scene/c00/皮影戏台/e_小小蝶.png" id="17_o2dhc"]
 [ext_resource type="Texture2D" uid="uid://d1etd7hr23rir" path="res://asset/art/scene/c02/s05_一楼内侧楼道/e_掉落的肉.png" id="18_bk7rf"]
+[ext_resource type="Texture2D" uid="uid://b5m5ooyeyrw6v" path="res://asset/art/scene/c00/皮影戏台/e_父母.png" id="18_mh0dq"]
+[ext_resource type="Texture2D" uid="uid://cb8asvu3xe45e" path="res://asset/art/scene/c00/皮影戏台/e_老鼠.png" id="19_dqkpy"]
 [ext_resource type="Texture2D" uid="uid://bp84w8keuelyj" path="res://asset/art/scene/c02/s10_空房间/e_蜡烛-sheet.png" id="21_heq1x"]
 [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="22_heq1x"]
 [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="22_laquj"]
@@ -196,6 +201,49 @@ packed_scene = ExtResource("11_2yvhw")
 on_display_hide_hud = true
 first_interact_os_key = "c02_一楼戏台"
 
+[node name="树" type="Sprite2D" parent="Ground/DeployLayer/Closeup戏台"]
+position = Vector2(-11, -19)
+texture = ExtResource("15_avr26")
+
+[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Closeup戏台/树"]
+script = ExtResource("16_udxre")
+updater_event = &"opera_stage"
+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/Closeup戏台/树"]
+position = Vector2(31, 13)
+texture = ExtResource("17_o2dhc")
+
+[node name="父母" type="Sprite2D" parent="Ground/DeployLayer/Closeup戏台"]
+position = Vector2(-8, -11)
+texture = ExtResource("18_mh0dq")
+
+[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Closeup戏台/父母"]
+script = ExtResource("16_udxre")
+updater_event = &"opera_stage"
+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="Sprite2D" parent="Ground/DeployLayer/Closeup戏台"]
+position = Vector2(35, -5)
+texture = ExtResource("19_dqkpy")
+
+[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Closeup戏台/老鼠"]
+script = ExtResource("16_udxre")
+updater_event = &"opera_stage"
+updater_mode = "shower"
+updater_ease_duration = 0.0
+updater_stage_mode = "exclude"
+updater_stages = Array[int]([0, 1, 2])
+metadata/_custom_type_script = "uid://0wjaho6qkg6s"
+
 [node name="火苗" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="8"]
 light_mask = 5
 position = Vector2(239, 52)

scene/ground/script/c02/戏台特写.tscn

@@ -1,8 +1,14 @@
-[gd_scene load_steps=4 format=3 uid="uid://c1vrp1o8ci512"]
+[gd_scene load_steps=10 format=3 uid="uid://c1vrp1o8ci512"]
 
 [ext_resource type="Script" uid="uid://baocsio2v7pme" path="res://scene/ground/script/c02/戏台特写.gd" id="1_eu5r2"]
-[ext_resource type="Texture2D" uid="uid://dhrl5mlivx108" path="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具）.png" id="3_timwg"]
+[ext_resource type="Texture2D" uid="uid://ddc5w557us5go" path="res://asset/art/scene/c00/皮影戏台/戏台特写_无道具.png" id="2_eu5r2"]
+[ext_resource type="Texture2D" uid="uid://d2mt157jjltcl" path="res://asset/art/scene/c00/皮影戏台/树.png" id="3_s5khb"]
+[ext_resource type="Texture2D" uid="uid://bya484vjsy17t" path="res://asset/art/scene/c00/皮影戏台/父母.png" id="4_1vjpt"]
 [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="4_ujm2t"]
+[ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="4_v5kju"]
+[ext_resource type="Texture2D" uid="uid://ibapja61d10t" path="res://asset/art/scene/c00/皮影戏台/小小蝶.png" id="5_v5kju"]
+[ext_resource type="Texture2D" uid="uid://bj2mbrk3xcrg3" path="res://asset/art/scene/c00/皮影戏台/老鼠.png" id="6_aki6r"]
+[ext_resource type="Texture2D" uid="uid://drde0wrtkea4h" path="res://asset/art/scene/c00/皮影戏台/草药.png" id="7_vsbl1"]
 
 [node name="戏台特写" type="CanvasLayer"]
 script = ExtResource("1_eu5r2")
@@ -13,10 +19,58 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-texture = ExtResource("3_timwg")
+texture = ExtResource("2_eu5r2")
 expand_mode = 5
 stretch_mode = 5
 
+[node name="树" type="Sprite2D" parent="."]
+position = Vector2(162, 121)
+texture = ExtResource("3_s5khb")
+
+[node name="EventBinder" type="Node" parent="树"]
+script = ExtResource("4_v5kju")
+updater_event = &"opera_stage"
+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="树"]
+position = Vector2(178, 54)
+texture = ExtResource("5_v5kju")
+
+[node name="父母" type="Sprite2D" parent="."]
+position = Vector2(180, 170)
+texture = ExtResource("4_1vjpt")
+
+[node name="EventBinder" type="Node" parent="父母"]
+script = ExtResource("4_v5kju")
+updater_event = &"opera_stage"
+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="Sprite2D" parent="."]
+position = Vector2(449, 183)
+texture = ExtResource("6_aki6r")
+
+[node name="草药" type="Sprite2D" parent="老鼠"]
+show_behind_parent = true
+position = Vector2(-50, 1)
+texture = ExtResource("7_vsbl1")
+
+[node name="EventBinder" type="Node" parent="老鼠"]
+script = ExtResource("4_v5kju")
+updater_event = &"opera_stage"
+updater_mode = "shower"
+updater_ease_duration = 0.0
+updater_stage_mode = "exclude"
+updater_stages = Array[int]([0, 1, 2])
+metadata/_custom_type_script = "uid://0wjaho6qkg6s"
+
 [node name="TextureRect2" type="TextureRect" parent="."]
 anchors_preset = 15
 anchor_right = 1.0