Merge remote-tracking branch 'origin/demo'

asset/art/scene/c01/s09_黄包车长场景/动画字幕/字幕_心动发行.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://com4n0ue4o4h6"
+path="res://.godot/imported/字幕_心动发行.png-3444aa14b40f527fcec103fddd09dd65.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c01/s09_黄包车长场景/动画字幕/字幕_心动发行.png"
+dest_files=["res://.godot/imported/字幕_心动发行.png-3444aa14b40f527fcec103fddd09dd65.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

scene/ground/scene/c01/s11_黄包车演出.gd

@@ -9,10 +9,10 @@ var target_x := 10750.0
 var building_duration := 10.0
 var building_y := 350.0
 
-var title_1 = preload("uid://snm3q333tqhl")
+var title_1 = preload("uid://snm3q333tqhl") #工作室
-var title_2 = preload("uid://d4laekws15ap6")
+var title_2 = preload("uid://com4n0ue4o4h6") #心动发行
-var title_3 = preload("uid://5oln8axxcfep")
+var title_3 = preload("uid://d4laekws15ap6") #主演
-
+var title_4 = preload("uid://5oln8axxcfep") #鸣谢
 
 # 覆盖该方法
 func _default_data() -> Dictionary:
@@ -59,15 +59,19 @@ func dialog1() -> void:
 
 
 func pop_title_1():
-	SceneManager.pop_center_texture(title_1, 6.0)
+	SceneManager.pop_center_texture(title_1, 5.5)
 
 
 func pop_title_2():
-	SceneManager.pop_center_texture(title_2, 10.5)
+	SceneManager.pop_center_texture(title_2, 5.5)
 
 
 func pop_title_3():
-	SceneManager.pop_center_texture(title_3, 10.0)
+	SceneManager.pop_center_texture(title_3, 8.0)
+
+
+func pop_title_4():
+	SceneManager.pop_center_texture(title_4, 9.0)
 
 
 func _start_running(_res = null):

scene/ground/scene/c01/s11_黄包车演出.tscn

@@ -198,37 +198,43 @@ sprite_frames = ExtResource("3_hnnuc")
 animation = &"c01_捡球男孩_关键帧"
 
 [node name="ambush_title1" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_3k8jj")]
-position = Vector2(1424, -1)
+position = Vector2(1200, -3)
 trigger_mode = "area_enter"
 one_shot = false
 cooldown_time = 1.0
 hook_method = "pop_title_1"
 
 [node name="ambush_title2" parent="Ground/DeployLayer" index="5" instance=ExtResource("6_3k8jj")]
-position = Vector2(2348, 1)
+position = Vector2(1950, -2)
 trigger_mode = "area_enter"
 one_shot = false
 hook_method = "pop_title_2"
 
 [node name="ambush_title3" parent="Ground/DeployLayer" index="6" instance=ExtResource("6_3k8jj")]
-position = Vector2(5613, -1)
+position = Vector2(2700, -5)
 trigger_mode = "area_enter"
 one_shot = false
 hook_method = "pop_title_3"
 
-[node name="ambush_dialog2" parent="Ground/DeployLayer" index="7" instance=ExtResource("6_3k8jj")]
+[node name="ambush_title4" parent="Ground/DeployLayer" index="7" instance=ExtResource("6_3k8jj")]
+position = Vector2(5624, 3)
+trigger_mode = "area_enter"
+one_shot = false
+hook_method = "pop_title_4"
+
+[node name="ambush_dialog2" parent="Ground/DeployLayer" index="8" instance=ExtResource("6_3k8jj")]
 position = Vector2(866, 5)
 trigger_mode = "area_enter"
 one_shot = false
 hook_method = "dialog2"
 
-[node name="ambush_dialog3" parent="Ground/DeployLayer" index="8" instance=ExtResource("6_3k8jj")]
+[node name="ambush_dialog3" parent="Ground/DeployLayer" index="9" instance=ExtResource("6_3k8jj")]
 position = Vector2(3448, -8)
 trigger_mode = "area_enter"
 one_shot = false
 hook_method = "dialog3"
 
-[node name="ambush_dialog4" parent="Ground/DeployLayer" index="9" instance=ExtResource("6_3k8jj")]
+[node name="ambush_dialog4" parent="Ground/DeployLayer" index="10" instance=ExtResource("6_3k8jj")]
 position = Vector2(5305, -2)
 trigger_mode = "area_enter"
 one_shot = false