Merge remote-tracking branch 'origin/demo'

asset/dialogue/item_description.csv

@@ -24,16 +24,17 @@ ui_秒,秒,,,,,seconds
 setting_主播模式,主播模式,,,,,Streamer Mode
 setting_返回,返回,,,,,Back
 setting_确认,确认,,,,,Confirm
-bag_tab_笔记,线索,,,,,Clues
-bag_tab_物品,物件,,,,,Items
-bag_tab_记忆,记忆,,,,,Memories
+bag_tab_笔记,线索(N),,,,,Clues(N)
+bag_tab_物品,物件(B),,,,,Items(B)
+bag_tab_记忆,记忆(M),,,,,Memories(M)
 ui_saved_all,已保存所有数据,,,,,All data saved
 ui_new_archive,已创建新存档,,,,,New save file created
 ui_auto_saved,自动保存成功,,,,,Auto save successful
 ui_notify_important_item_update,重要物品已更新,,,,,Important items updated
 ui_notify_note_update,线索笔记已更新,,,,,Clue notes updated
 ui_notify_mem_update,回忆已更新,,,,,Memories updated
-ui_center_notify_press_e_to_interact,按 E 可与场景互动,,,,,Press E to interact
+ui_center_notify_a_d_to_move,按 E 可与场景互动,,,,,Press E to interact
+ui_center_notify_press_e_to_interact,按 A/D 可左右移动,,,,,Press A/D to Move
 ui_center_notify_press_q_to_exit,按 Q 可退出,,,,,Press Q to exit
 ui_center_notify_use_prop,按 E 使用道具,,,,,Press E to use item
 ui_center_notify_lack_of_scissor,需要剪刀,,,,,
@@ -171,7 +172,7 @@ c01_倾斜的洋相片,哇啊，这张洋相片要掉下来了！{br}我得做
 c01_摆正的洋相片,这是院长的儿子吗？,,,,,Is this the director's son?
 c01_s06_院长房间,这是院长的房间,,,,,This is the director's room
 c01_s06_小朋友房间,这是其他小朋友的房间,,,,,This is the other children's room
-c01_s06_熟悉的墙画,墙上的画看起来好熟悉。{br}过去问问看吧，没准他们几个知道些什么。,,,,,"It's them again. How come the things they drew look somewhat familiar? {br} Although last time... {br} Well, forget about that. The dean told me that there's still a long way ahead and we need to get along well with the kids here."
+c01_s06_熟悉的墙画,又是他们几个，这次画的东西怎么有些眼熟{br} 虽然上次...{br}算了，院长和我说过，以后日子还长着呢，要和这里的小孩好好相处。,,,,,"It's them again. How come the things they drew look somewhat familiar? {br} Although last time... {br} Well, forget about that. The dean told me that there's still a long way ahead and we need to get along well with the kids here."
 c01_s06_四小孩对话结束,怪人、花...{br}有时候真搞不懂他们在说些什么。,,,,,"Strange people, flowers...{br}Sometimes I really don't understand what they're talking about."
 c01_s07_钱碗,碗里只有一枚铜钱。,,,,,There's only one copper coin in the bowl.
 c01_s07_获得报纸,这是什么？,,,,,What is this?

asset/dialogue/item_description.dialogue

@@ -27,9 +27,9 @@
 返回[ID:setting_返回]
 确认[ID:setting_确认]
 
-线索[ID:bag_tab_笔记]
-物件[ID:bag_tab_物品]
-记忆[ID:bag_tab_记忆]
+线索(N)[ID:bag_tab_笔记]
+物件(B)[ID:bag_tab_物品]
+记忆(M)[ID:bag_tab_记忆]
 
 已保存所有数据 [ID:ui_saved_all]
 已创建新存档 [ID:ui_new_archive]
@@ -40,6 +40,7 @@
 回忆已更新 [ID:ui_notify_mem_update]
 
 
+按 A/D 可左右移动 [ID:ui_center_notify_a_d_to_move]
 按 E 可与场景互动 [ID:ui_center_notify_press_e_to_interact]
 按 Q 可退出 [ID:ui_center_notify_press_q_to_exit]
 按 E 使用道具 [ID:ui_center_notify_use_prop]

manager/scene/scene_manager.gd

@@ -290,10 +290,10 @@ func pop_notification(translation_key: String, number := 1) -> void:
 		printerr("pop_notification: Notification node not found")
 
 
-func pop_center_notification(translation_key: String) -> void:
+func pop_center_notification(translation_key: String, duration := 4.0) -> void:
 	var notification_node = get_node_or_null("/root/Main/UILayer/Notification")
 	if notification_node:
-		notification_node.show_center_notification(tr(translation_key).replace("{br}", "\n"))
+		notification_node.show_center_notification(tr(translation_key).replace("{br}", "\n"), duration)
 	else:
 		printerr("pop_center_notification: Notification node not found")
 

scene/ground/scene/c01/s05_院长房间.gd

@@ -54,7 +54,7 @@ func _on_ground_ready() -> void:
 	piano = $"../DeployLayer/钢琴"
 	if data["intro_played"]:
 		$"../DeployLayer/床".enabled = true
-		Util.timer(1.0, show_interact_help)
+		Util.timer(2.0, show_interact_help)
 	# 画框是否已经正位
 	data.frame_relocated = ambush.played and ambush.one_shot
 	# 禁用鸡毛掸子
@@ -179,4 +179,7 @@ func _on_piano_interacted():
 
 
 func show_interact_help():
+	SceneManager.pop_center_notification("ui_center_notify_a_d_to_move")
+	await Util.wait(5.0)
 	SceneManager.pop_center_notification("ui_center_notify_press_e_to_interact")
+	

scene/notification/notification.gd

@@ -35,7 +35,7 @@ func show_center_texture(texture, duration := 3.0):
 	center_texture.texture = texture
 	var tween = create_tween()
 	tween.tween_property(center_texture, "modulate:a", 1, 0.4)
-	tween.tween_interval(max(0.1, duration - .8))
+	tween.tween_interval(max(0.1, duration - 0.8))
 	tween.tween_property(center_texture, "modulate:a", 0, 0.4)
 
 
@@ -45,7 +45,7 @@ func show_center_notification(msg, duration := 3.0):
 	top_center_label.text = msg
 	var tween = create_tween()
 	tween.tween_property(top_center_label, "modulate:a", 1, 0.4)
-	tween.tween_interval(max(0.1, duration - .8))
+	tween.tween_interval(max(0.1, duration - 0.8))
 	tween.tween_property(top_center_label, "modulate:a", 0, 0.4)