Merge remote-tracking branch 'origin/demo'

This commit is contained in:
cakipaul 2025-07-11 01:30:37 +08:00
commit 488849bae9
3 changed files with 7 additions and 7 deletions

View File

@ -96,7 +96,7 @@ func apply_dialogue_line() -> void:
balloon.grab_focus()
character_label.visible = not dialogue_line.character.is_empty()
character_label.text = tr(dialogue_line.character, "dialogue")
character_label.text = tr(dialogue_line.character)
dialogue_label.hide()
dialogue_label.dialogue_line = dialogue_line

View File

@ -83,7 +83,7 @@ var current_line_ban_skip = false
# 自定义获得文本,从 tags 中获取备注参数
func _apply_tags() -> void:
character_label.visible = not dialogue_line.character.is_empty()
character_label.text = tr(dialogue_line.character, "dialogue")
character_label.text = tr(dialogue_line.character)
#主要角色颜色
var color = dialogue_line.get_tag_value("color")
if color:
@ -95,12 +95,12 @@ func _apply_tags() -> void:
character_label.modulate = GlobalConfig.CHARACTER_COLOR_MAP["default"]
# 配色结束后匿名化处理
if dialogue_line.tags.has("anonymous"):
character_label.text = tr("", "dialogue")
character_label.text = tr("")
var translation_key = dialogue_line.translation_key
var text
if not translation_key.is_empty():
text = tr(translation_key, "dialogue")
if translation_key:
text = tr(translation_key)
if text == translation_key:
text = dialogue_line.text
else:

View File

@ -65,7 +65,7 @@ func _setup_content_text() -> void:
var translation_key = dialogue_line.translation_key
var text
if translation_key:
text = tr(translation_key, "dialogue")
text = tr(translation_key)
if text == translation_key:
text = dialogue_line.text
else:
@ -121,7 +121,7 @@ func apply_dialogue_line() -> void:
balloon.grab_focus()
character_label.visible = not dialogue_line.character.is_empty()
character_label.text = tr(dialogue_line.character, "dialogue")
character_label.text = tr(dialogue_line.character)
#主要角色颜色
if CHARACTER_COLOR_MAP.has(dialogue_line.character):
character_label.modulate = CHARACTER_COLOR_MAP[dialogue_line.character]