Merge branch 'main' into tinytts

Author: rophec

config/api_providers.json

@@ -359,6 +359,7 @@
     "gentleMaiden": "voice-tone-PGLlrd5SNM",
     "sweetLady": "voice-tone-PGLmTEeUOu",
     "frailMaiden": "voice-tone-PGLmzXEX44",
-    "childishMaiden": "voice-tone-PGLnVNQn7A"
+    "childishMaiden": "voice-tone-PGLnVNQn7A",
+    "yui_cn": "voice-tone-QqMv39SYSW"
   }
 }

config/characters.en.json

@@ -29,7 +29,7 @@
       ],
       "Signature Line": "The only cat girl who can do this and that to Carbon-Based Lifeform is yours truly, meow~",
       "live2d": "yui-origin",
-      "voice_id": "voice-tone-PGLiyZt65w",
+      "voice_id": "voice-tone-QqMv39SYSW",
       "_reserved": {
         "avatar": {
           "vrm": {

config/characters.ja.json

@@ -29,7 +29,7 @@
       ],
       "一言セリフ": "炭素生物にあんなことやこんなことができるのは、本にゃんだけにゃん〜",
       "live2d": "yui-origin",
-      "voice_id": "voice-tone-PGLiyZt65w",
+      "voice_id": "voice-tone-QqMv39SYSW",
       "_reserved": {
         "avatar": {
           "vrm": {

config/characters.ko.json

@@ -29,7 +29,7 @@
       ],
       "대사 한마디": "탄소 생물한테 이런저런 걸 할 수 있는 건 이 냥이뿐이다냥~",
       "live2d": "yui-origin",
-      "voice_id": "voice-tone-PGLiyZt65w",
+      "voice_id": "voice-tone-QqMv39SYSW",
       "_reserved": {
         "avatar": {
           "vrm": {

config/characters.ru.json

@@ -29,7 +29,7 @@
       ],
       "Коронная фраза": "Не-не-не, даже не думай — возиться с этой Углеродной формой жизни позволено только мне, мяу~",
       "live2d": "yui-origin",
-      "voice_id": "voice-tone-PGLiyZt65w",
+      "voice_id": "voice-tone-QqMv39SYSW",
       "_reserved": {
         "avatar": {
           "vrm": {

config/characters.zh-CN.json

@@ -29,7 +29,7 @@
       ],
       "一句话台词": "能对碳基生物做这样那样的事情的，只有本喵一只猫娘喵~",
       "live2d": "yui-origin",
-      "voice_id": "voice-tone-PGLiyZt65w",
+      "voice_id": "voice-tone-QqMv39SYSW",
       "_reserved": {
         "avatar": {
           "vrm": {

config/characters.zh-TW.json

@@ -29,7 +29,7 @@
       ],
       "一句話台詞": "能對碳基生物做這樣那樣的事情的，只有本喵一隻貓娘喵~",
       "live2d": "yui-origin",
-      "voice_id": "voice-tone-PGLiyZt65w",
+      "voice_id": "voice-tone-QqMv39SYSW",
       "_reserved": {
         "avatar": {
           "vrm": {

main_routers/characters_router.py

@@ -2451,6 +2451,11 @@ async def add_catgirl(request: Request):
                 catgirl_data[k] = v
 
     characters['猫娘'][key] = catgirl_data
+    # 默认走 free preset：非 free / 非 lanlan.tech 通道由 LLMSessionManager 现有 gate 清空 self.voice_id，不会泄漏给其他 TTS provider。
+    # 从 free_voices['cuteGirl'] 读以避免硬编码漂移；缺失时退回 PR 前 yui-origin 历史值。
+    from utils.api_config_loader import get_free_voices
+    default_free_voice_id = (get_free_voices() or {}).get('cuteGirl') or 'voice-tone-PGLiyZt65w'
+    set_reserved(catgirl_data, 'voice_id', default_free_voice_id)
     await _config_manager.asave_characters(characters)
     pending_mark_ok, pending_mark_error = await _mark_new_character_greeting_pending_safe(_config_manager, key, "create")
 

plugin/plugins/galgame_plugin/__init__.py

@@ -4587,13 +4587,14 @@ async def galgame_download_rapidocr_models(self, force: bool = False, **_):
 
             download_result = await download_rapidocr_models(
                 logger=self.logger,
-                install_target_dir_raw=self._cfg.ocr_reader_install_target_dir,
+                install_target_dir_raw=self._cfg.rapidocr_install_target_dir,
                 ocr_version=self._cfg.rapidocr_ocr_version,
                 lang_type=self._cfg.rapidocr_lang_type,
                 timeout_seconds=float(self._cfg.ocr_reader_install_timeout_seconds or 180.0),
                 force=bool(force),
                 task_id=current_run_id or None,
                 progress_callback=progress_callback,
+                before_completed_callback=clear_install_inspection_cache,
             )
             clear_install_inspection_cache()
             await self._poll_bridge(force=True)

plugin/plugins/galgame_plugin/i18n/ui/en.json

@@ -96,6 +96,8 @@
   "ui.install.memory_deps": "Memory Reader Dependencies",
   "ui.install.memory_desc": "Textractor is only used for the memory reader fallback path and does not affect OCR capture recognition.",
   "ui.install.running": "Installing in background...",
+  "ui.install.rapidocr.action": "Install RapidOCR",
+  "ui.install.rapidocr.retry": "Retry RapidOCR Installation",
   "ui.install.tesseract.action": "Install Tesseract",
   "ui.install.tesseract.retry": "Retry Tesseract Installation",
   "ui.install.tesseract.queued": "Background installation task created. It will download Tesseract and language packs over HTTPS and stream progress via SSE.",
@@ -723,6 +725,8 @@
   "ui.diag.recognizing.body": "A line has been read and the page will keep refreshing.",
   "ui.diag.waiting_game.title": "Waiting for game status",
   "ui.diag.waiting_game.body": "There is not enough information to diagnose the current blocker. Open the game first or refresh the window list.",
+  "ui.first_run.section_title": "First-time setup guide",
+  "ui.first_run.section_subtitle": "Follow these steps to connect the recognition flow.",
   "ui.first_run.start_game.title": "Start or restore the game",
   "ui.first_run.start_game.done": "Game status detected.",
   "ui.first_run.start_game.pending": "Open the game and stop on a screen with text.",
@@ -857,6 +861,7 @@
   "ui.install.summary.installed": "Installed",
   "ui.install.summary.unsupported_auto_install": "Auto install unsupported",
   "ui.install.summary.missing": "Not installed",
+  "ui.install.summary.missing_models": "Missing models",
   "ui.install.summary.missing_languages": "Missing language packs {languages}",
   "ui.install.summary.missing_optional": "Not installed (optional)",
   "ui.install.summary.memory_group": "Memory",
@@ -1041,6 +1046,7 @@
   "ui.install.rapidocr.missing_models_kicker": "OCR Primary Backend - Models Not Downloaded",
   "ui.install.rapidocr.missing_models_title": "RapidOCR is ready, but the selected language models haven't been downloaded",
   "ui.install.rapidocr.missing_models_body": "Current selection lang_type={lang} + ocr_version={version} requires the following model files in the local cache ({count} files, ~{size} MB total). Click the button below to download them; downloads come from RapidAI's ModelScope mirror.",
+  "ui.install.rapidocr.missing_models_manual_body": "Current selection lang_type={lang} + ocr_version={version} requires the following model files in the local cache ({count} files, ~{size} MB total). Automatic download is unavailable right now. Download the missing files manually from {source} into {dir}, then click \"Refresh Status\".",
   "ui.install.rapidocr.download_models.action": "Download Models Now",
   "ui.install.rapidocr.download_models.retry": "Retry Model Download",
   "ui.install.rapidocr.download_models.running": "Downloading models in background...",