hud 显示 prop 图片尺寸优化

asset/art/ui/note/笔记线索_第一章.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b5krp8f4yqmx6"
+path="res://.godot/imported/笔记线索_第一章.png-5a92d0c0d981e032650977ec75646448.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/ui/note/笔记线索_第一章.png"
+dest_files=["res://.godot/imported/笔记线索_第一章.png-5a92d0c0d981e032650977ec75646448.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/item_description.csv

@@ -29,8 +29,8 @@ bag_tab_记忆,记忆,,,,,
 ui_saved_all,已保存所有数据,,,,,All the data have been saved
 ui_new_archive,已创建新存档,,,,,A new archive has been created
 ui_auto_saved,自动保存成功,,,,,Auto save successful
-ui_notify_important_item_update,重要物品已更新（按 B 打开背包）,,,,,
+ui_notify_important_item_update,重要物品已更新,,,,,
-ui_notify_note_update,线索已更新（按 N 查看线索笔记）,,,,,
+ui_notify_note_update,线索笔记已更新,,,,,
 ui_center_notify_press_e_to_interact,按 E 可与场景互动,,,,,
 ui_center_notify_press_q_to_exit,按 Q 可退出,,,,,
 ui_center_notify_use_prop,按 E 使用道具,,,,,Press E to use prop

asset/dialogue/item_description.dialogue

@@ -32,8 +32,8 @@
 已创建新存档 [ID:ui_new_archive]
 自动保存成功 [ID:ui_auto_saved]
 
-重要物品已更新（按 B 打开背包） [ID:ui_notify_important_item_update]
+重要物品已更新 [ID:ui_notify_important_item_update]
-线索已更新（按 N 查看线索笔记） [ID:ui_notify_note_update]
+线索笔记已更新 [ID:ui_notify_note_update]
 
 按 E 可与场景互动 [ID:ui_center_notify_press_e_to_interact]
 按 Q 可退出 [ID:ui_center_notify_press_q_to_exit]

manager/event_manager/event_manager.gd

@@ -26,18 +26,21 @@ func set_stage(event_name: StringName, stage := 1) -> void:
 		and SceneManager.get_player().character.begins_with("吕萍")
 	):
 		# 0 初始化隐藏，1 开始显示，2 划掉，3 结束隐藏
-		if stage == 1 or stage == 2:
+		if stage == 1:
 			SceneManager.lock_player(3.0, 16, true)
+			SceneManager.pop_notification("ui_notify_note_update")
 		# 第一次记笔记，提示查看笔记
 		if event_name == &"handnote_c02_road_address":
-			SceneManager.pop_center_notification("ui_center_notify_check_note")
+			SceneManager.pop_center_notification("ui_check_note")
 
 
 # 仅在设置的 stage > 当前 stage 时更新，相等或小于时不更新
-func set_stage_if_greater(event_name: StringName, stage := 1) -> void:
+func set_stage_if_greater(event_name: StringName, stage := 1) -> bool:
 	var current_stage = get_stage(event_name)
 	if stage > current_stage:
 		set_stage(event_name, stage)
+		return true
+	return false
 
 
 # stage 最大 99999

scene/effect/dizzy_shader.gd

@@ -20,3 +20,4 @@ func dizzy(duration := 3.5, intensity := 1.5):
 	tween.tween_property(rect.material, "shader_parameter/intensity", intensity, 0.3)
 	tween.tween_interval(duration - 0.6)
 	tween.tween_property(rect.material, "shader_parameter/intensity", 0.0, 0.3)
+	tween.finished.connect(hide)

scene/ground/scene/animation_root.gd

@@ -16,7 +16,7 @@ var dialogue_c06 := preload("res://asset/dialogue/c06.dialogue") as DialogueReso
 @export_tool_button("reset 存档") var reset_archive = _reset_archive
 # event 也混合其中
 @export var debug_global_data: Dictionary[String, Variant] = {
-	"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"],
+	"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"] as PackedStringArray,
 	"player_x": 30.0,
 }
 @export var debug_ground_data: Dictionary[String, Variant] = {}

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

@@ -67,10 +67,8 @@ func _on_ground_ready() -> void:
 	madman_npc = $"../DeployLayer/Npc井边疯子"
 	madman_npc.visible = false
 	# c02_madman_hitwall 之后， c02_ball_game_stage==3（游戏结束） 之前；同时 eavesdrop_finished
-	if (
+	if EventManager.get_stage(&"c02_ball_game_stage") < 3:
-		EventManager.get_stage(&"c02_ball_game_stage") < 3
 		# and ArchiveManager.get_global_value(&"c02_eavesdrop_finished")
-	):
 		if not ArchiveManager.get_global_value("c02_watched_the_well"):
 			$"../DeployLayer/Closeup井".exit.connect(func(_arg): madman_npc.visible = true)
 		else:
@@ -99,6 +97,7 @@ func _on_ground_ready() -> void:
 		# 落地音效
 		$"Sfx小鞋落地".play()
 		SceneManager.pop_os_with_str("c02_s03_掉鞋子")
+		SceneManager.get_player().set_facing_direction(Vector2.LEFT)
 		tween = create_tween()
 		tween.tween_property(fg, "modulate:a", 0.0, 1.5)
 		await tween.finished
@@ -174,7 +173,6 @@ func shocking_lighting() -> void:
 	ArchiveManager.set_global_entry("c02_show_grounded_coins", true)
 
 
-
 func eavesdrop() -> void:
 	$"../DeployLayer/Ambush偷听对话".enabled = false
 	# 12 c00_吕萍_蹲下 13 c00_吕萍_蹲下呼吸 14 c00_吕萍_起立

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

@@ -48,7 +48,6 @@ func _on_ground_ready() -> void:
 			mice_hole.enabled = true
 			await Util.wait(1.5)
 			await SceneManager.pop_os_with_str("c02_二楼血脚印")
-			EventManager.set_stage_if_greater(&"handnote_c02_shoe_giveToMouce", 1)
 		)
 		
 	closeup_ball = $"../DeployLayer/Closeup弹珠游戏" as Closeup2D
@@ -99,8 +98,7 @@ func _on_mice_hole_interacted():
 		sprite.play("疯子跑动")
 		play("疯子撞墙")
 		await Util.wait(3.5)
-		SceneManager.pop_os_with_str("c02_老鼠叼鞋引开疯子")
+		await SceneManager.pop_os_with_str("c02_老鼠叼鞋引开疯子")
-		SceneManager.pop_debug_dialog_info("音效", "待补充撞墙音效")
 
 
 
@@ -182,3 +180,4 @@ func _on_exit_final_show(_arg):
 
 func unlock_2floor_map():
 	EventManager.set_stage_if_greater(&"handnote_c02_map_2", 1)
+	EventManager.set_stage_if_greater(&"handnote_c02_shoe_giveToMouce", 1)

scene/ground/scene/c02/s07_二楼内侧楼道.tscn

@@ -31,6 +31,10 @@ data = {
 "flyer_shaven": false,
 "oneshot_animation_played": false
 }
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": PackedStringArray("prop_火柴", "prop_院长的信", "prop_银元"),
+"player_x": 30.0
+})
 debug_ground_data = Dictionary[String, Variant]({
 "AnimationPlayer": {
 "flyer_shaven": false,

scene/ground/scene/c02/s10_空房间.gd

@@ -211,19 +211,18 @@ func _on_pick_catty_head() -> void:
 		# 将小猫头与身子合并
 		SceneManager.disable_prop_item("prop_小猫玩具的脑袋")
 		SceneManager.disable_prop_item("prop_无头小猫玩具")
-		SceneManager.enable_prop_item("prop_小猫玩具完整")
 		var sprite = $"../DeployLayer/拼接小猫玩具"
 		sprite.visible = true
 		sprite.play()
 		await sprite.animation_finished
 		sprite.visible = false
-		SceneManager.enable_important_item("prop_小猫玩具完整")
+		SceneManager.enable_prop_item("prop_小猫玩具完整")
 		await SceneManager.get_inspector().quit_and_hidden
-		SceneManager.pop_os_with_str("c02_获得小猫玩具")
 		$"Sfx头痛耳鸣".play()
 		$"../DizzyShader".dizzy()
 		SceneManager.player_action(17, true)
 		await SceneManager.get_player().animation_finished
+		SceneManager.pop_os_with_str("c02_获得小猫玩具")
 		SceneManager.unlock_player()
 	# 进过瞎子卧室后，通道关闭
 	if not ArchiveManager.get_global_value(&"c02_the_blind_room_unlocked"):

scene/ground/scene/c02/s10_空房间.tscn

@@ -92,9 +92,10 @@ debug_global_data = Dictionary[String, Variant]({
 "c02_counter_pushed_out": false,
 "c02_counter_x": -1.0,
 "c02_the_blind_room_unlocked": false,
-"enabled_items": ["prop_火柴", "prop_无头小猫玩具", "prop_木头人偶"],
+"enabled_items": ["prop_火柴", "prop_无头小猫玩具", "prop_木头人偶", "prop_麻将", "prop_锡箔元宝", "prop_奇怪的肉"],
 "handnote_c02_xchan_giveHerPuppet": 0,
 "handnote_c02_xchan_sheKnowsMe": 0,
+"handnote_chapter_stage": 2,
 "player_x": 30.0
 })
 debug_ground_data = Dictionary[String, Variant]({
@@ -247,6 +248,7 @@ position = Vector2(423, 97.6081)
 as_important_item = true
 sign_mark_offset = Vector2(0, -7.09)
 enabled = false
+action_key = 3
 prop_key = "prop_木头人偶"
 
 [node name="Sprite2D" type="Sprite2D" parent="Ground/DeployLayer/Pickable木头人偶"]

scene/ground/script/c02/s00_煤油灯.tscn

@@ -62,14 +62,17 @@ shape = SubResource("RectangleShape2D_h0ajm")
 
 [node name="PointLight2D" type="PointLight2D" parent="."]
 color = Color(1, 0.882353, 0.705882, 1)
+blend_mode = 2
 texture = ExtResource("2_uusov")
 
 [node name="PointLight2D范围" type="PointLight2D" parent="PointLight2D"]
 visible = false
 energy = 0.7
+blend_mode = 2
 texture = SubResource("GradientTexture2D_ivr1s")
 
 [node name="PointLightGround2D" type="PointLight2D" parent="."]
+blend_mode = 2
 range_item_cull_mask = 4
 texture = ExtResource("3_y2gsk")
 

scene/ground/script/c02/刮海报.gd

@@ -18,9 +18,9 @@ var exiting = false
 func _on_shaven(progress: float):
 	if exiting:
 		return
-	if progress >= 0.7:
+	if progress >= 0.6:
 		exiting = true
-		print("刮开 70% 以上！")
+		print("刮开 60% 以上！")
 		sfx.global_play()
 		var tween = create_tween()
 		tween.tween_property(flyer, "modulate:a", 0.0, 1.0)

scene/ux/bag/prop_bag.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="Texture2D" uid="uid://bi7l47cit2xs" path="res://asset/art/ui/ux_panel/完整背景.png" id="6_grmx4"]
 [ext_resource type="Texture2D" uid="uid://bhjynxasn03jv" path="res://asset/art/ui/bag/重要物品ui-28.png" id="7_j146j"]
 [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="7_tgqj6"]
-[ext_resource type="Texture2D" uid="uid://bg77dh6ua3kfo" path="res://asset/art/prop/c01/院长的信物品.png" id="10_tgqj6"]
+[ext_resource type="Texture2D" uid="uid://bqlof12vwrui6" path="res://asset/art/prop/c02/父亲玩偶.png" id="8_j146j"]
 [ext_resource type="FontFile" uid="uid://dr8bp6p7byb37" path="res://asset/font/字体/方正楷体简体.TTF" id="11_4jvvd"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_wojfr"]
@@ -113,18 +113,25 @@ layout_mode = 2
 texture = ExtResource("7_j146j")
 expand_mode = 1
 
-[node name="TextureRect" type="TextureRect" parent="Bag/Book/DisplayVBox/TextureBG"]
+[node name="MarginContainer" type="MarginContainer" parent="Bag/Book/DisplayVBox/TextureBG"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(100, 100)
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme_override_constants/margin_left = 3
+theme_override_constants/margin_top = 3
+theme_override_constants/margin_right = 3
+theme_override_constants/margin_bottom = 3
+
+[node name="TextureRect" type="TextureRect" parent="Bag/Book/DisplayVBox/TextureBG/MarginContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(80, 80)
+layout_mode = 2
 size_flags_horizontal = 4
-size_flags_vertical = 0
+size_flags_vertical = 4
-texture = ExtResource("10_tgqj6")
+texture = ExtResource("8_j146j")
 expand_mode = 1
 stretch_mode = 5