demo 0.7.0; hotfix

asset/dialogue/item_description.csv

@@ -1,7 +1,5 @@
 keys,zh_CN,_character,_notes,_tags,zh_SH,en
-prop_下半部的舌头,下半部的舌头,,,[#texture=c03/ux_下半部的舌头.png],,
-input_麻将游戏_操作规则,依次点击两块麻将可进行交换,,,,,
-ui_center_notify_c03纸人求药,给我药,,,,,
+给我药 [ID:],给我药 [ID:],,,,,
 index_新游戏,新游戏,,,,,New Game
 index_继续游戏,继续游戏,,,,,Continue
 index_退出游戏,退出游戏,,,,,Exit Game
@@ -54,7 +52,7 @@ input_麻将整理游戏_开始方式,取出「三筒」开启整理,,,,,
 input_麻将游戏_交换规则,依次点击两块麻将可进行交换,,,,,
 input_麻将游戏_回合开始,回合开始，正确换牌后将自动打出,,,,,
 ui_center_notify_c03纸人浆糊舌头,帮我粘舌头,,,,,
-给我药 [ID:],给我药 [ID:],,,,,
+ui_center_notify_c03纸人求药,给我药,,,,,
 ui_center_notify_c03药车缺少物品,缺少药引,,,,,
 ui_center_notify_c03药车不能再取药材,同种药材只能取出一份,,,,,
 ui_center_notify_c03放到碗中或原处,药材只能放到碗中或原处,,,,,
@@ -316,4 +314,4 @@ c03_s12_label5,[wave]已经...回不了头了。[/wave],,,,,
 c03_s12_label6,[wave]将她交给我，方能保你平安[/wave],,,,,
 c03_s12_label7,[wave]反正...都一样吧[/wave],,,,,
 c03_s12_label8,[wave]又嫩又甜[/wave],,,,,
-怎么突然出现这么多人？{br}要不跟过去看看？[c03_李癞胖演出结束],怎么突然出现这么多人？{br}要不跟过去看看？[c03_李癞胖演出结束],,,,,
+c03_李癞胖演出结束,怎么突然出现这么多人？{br}要不跟过去看看？,,,,,

asset/dialogue/item_description.dialogue

@@ -61,7 +61,7 @@
 依次点击两块麻将可进行交换 [ID:input_麻将游戏_交换规则]
 回合开始，正确换牌后将自动打出 [ID:input_麻将游戏_回合开始]
 帮我粘舌头 [ID:ui_center_notify_c03纸人浆糊舌头]
-给我药 [ID:]
+给我药 [ID:ui_center_notify_c03纸人求药]
 缺少药引 [ID:ui_center_notify_c03药车缺少物品]
 同种药材只能取出一份 [ID:ui_center_notify_c03药车不能再取药材]
 药材只能放到碗中或原处 [ID:ui_center_notify_c03放到碗中或原处]
@@ -400,7 +400,7 @@
 [wave]反正...都一样吧[/wave] [ID:c03_s12_label7]
 [wave]又嫩又甜[/wave] [ID:c03_s12_label8]
 # 李癞胖演出结束
-怎么突然出现这么多人？{br}要不跟过去看看？[c03_李癞胖演出结束]
+怎么突然出现这么多人？{br}要不跟过去看看？[ID:c03_李癞胖演出结束]
 => END
 
 ~ Notes_c04

export_presets.cfg

@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../demo0.6.0/xiandie.exe"
+export_path="../demo0.7.0/xiandie.exe"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -37,8 +37,8 @@ application/modify_resources=true
 application/icon="uid://cxgwspjv16j7m"
 application/console_wrapper_icon="uid://cxgwspjv16j7m"
 application/icon_interpolation=4
-application/file_version="0.6.0.0"
-application/product_version="0.6.0.0"
+application/file_version="0.7.0.0"
+application/product_version="0.7.0.0"
 application/company_name="包包丁"
 application/product_name="衔蝶"
 application/file_description="衔蝶"

manager/audio_manager/audio_manager.gd

@@ -135,7 +135,3 @@ func stop_group(group_name: StringName, ease_out := 1.0) -> void:
 	var tween = create_tween()
 	tween.tween_method(vibe_player.set_volume_linear, 1.0, 0.0, ease_out)
 	tween.tween_callback(vibe_player.stop_and_free)
-
-
-
-

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

@@ -27,11 +27,10 @@ func _ready() -> void:
 
 func _on_ground_ready() -> void:
 	var camera = SceneManager.get_camera_marker()
-	camera.limit_top = -1000
-	camera.limit_bottom = 158
-	await SceneManager.ground_start
+	camera.default_camera_rect.position.y = -camera.default_camera_rect.size.y + 158
 	# 相机抖动
-	camera.shake_camera(6.0, 2.5)
+	camera.shake_camera(7.0, 2.5)
+	await SceneManager.ground_start
 	# 不显示玩家，锁定玩家移动
 	SceneManager.lock_player()
 	main_character = $"../DeployLayer/车夫与吕萍"

scene/ground/scene/c02/s03_院子.tscn

@@ -1427,8 +1427,7 @@ pre_event_stages = Array[int]([3])
 metadata/_custom_type_script = "uid://bkkiyk5jkdw4d"
 
 [node name="排队常人" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人"]
-light_mask = 5
-z_index = 22
+light_mask = 0
 position = Vector2(1227.5, -119)
 texture = ExtResource("18_crgo6")
 centered = false
@@ -1442,8 +1441,7 @@ updater_stages = Array[int]([0])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="排队纸人" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人"]
-light_mask = 5
-z_index = 23
+light_mask = 0
 position = Vector2(1227.5, -119)
 texture = ExtResource("19_vddfx")
 centered = false
@@ -1620,7 +1618,7 @@ blend_mode = 1
 position = Vector2(7051, 6)
 
 [node name="楼梯" type="Sprite2D" parent="Ground"]
-light_mask = 5
+light_mask = 0
 z_index = 20
 position = Vector2(1393.5, 0)
 texture = ExtResource("10_ud2jg")

scene/ground/scene/c02/s06_二楼.tscn

@@ -1236,20 +1236,17 @@ frame_progress = 0.121203
 position = Vector2(322, -269)
 packed_scene = ExtResource("12_intre")
 quit_closeup_on_cancel = false
-transition_effect = true
 
 [node name="Closeup水盆" parent="Ground/DeployLayer" index="19" instance=ExtResource("11_owxx3")]
 position = Vector2(289, 16)
 packed_scene = ExtResource("16_p6da7")
 on_display_hide_hud = true
-transition_effect = true
 first_interact_os_key = "c02_二楼水盆"
 
 [node name="Closeup谢幕演出" parent="Ground/DeployLayer" index="20" instance=ExtResource("11_owxx3")]
 position = Vector2(518, -272)
 packed_scene = ExtResource("25_m28ab")
 quit_closeup_on_cancel = false
-transition_effect = true
 action_key = 3
 
 [node name="c02_final" type="Node2D" parent="Ground/DeployLayer" index="21"]

scene/ground/scene/c03/s10_胖子游戏1.tscn

@@ -610,10 +610,10 @@ anchor_left = 0.525
 anchor_top = 9.475
 anchor_right = 0.525
 anchor_bottom = 9.475
-offset_left = -249.587
-offset_top = -276.792
-offset_right = -49.5868
-offset_bottom = -194.792
+offset_left = -227.0
+offset_top = -397.0
+offset_right = -26.9998
+offset_bottom = -315.0
 mouse_filter = 2
 theme_override_colors/default_color = Color(1, 0, 0, 1)
 theme_override_fonts/normal_font = ExtResource("19_usr2w")
@@ -627,10 +627,10 @@ horizontal_alignment = 2
 [node name="被砍断的文字2" type="RichTextLabel" parent="Ground/DeployLayer/砍断Pivot"]
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 0
-offset_left = 42.5211
-offset_top = 10.9728
-offset_right = 242.521
-offset_bottom = 92.9728
+offset_left = 4.0
+offset_top = -17.0
+offset_right = 204.0
+offset_bottom = 65.0
 mouse_filter = 2
 theme_override_colors/default_color = Color(1, 0, 0, 1)
 theme_override_fonts/normal_font = ExtResource("19_usr2w")

scene/ground/script/c03/s03_closeup癞子纸人.tscn

@@ -437,5 +437,6 @@ mouse_filter = 2
 texture = ExtResource("2_uenj0")
 
 [node name="瞎子眼罩" type="Sprite2D" parent="."]
+modulate = Color(1, 1, 1, 0)
 position = Vector2(282, 158)
 texture = ExtResource("20_6rgy3")

scene/ground/script/c03/s03_event_2d癞子剪辫子.gd

@@ -46,7 +46,8 @@ func start_show() -> void:
 	await Util.wait(2.0)
 	$"Closeup瞎子糕点".display()
 	# 重置镜头
-	SceneManager.focus_player_and_reset_zoom()
+	SceneManager.focus_player_and_reset_zoom(3.0)
+	await $"Closeup瞎子糕点".exit
 	SceneManager.get_player().visible = true
 	SceneManager.unlock_player()
 	SceneManager.toggle_hud_display(true)