dsh-pet-live2d-viola 1.1.3 → 1.2.0

package/README.md

@@ -102,6 +102,18 @@ DeepSeek Harness Web GUI 的 **Live2D 桌宠插件**，一台桌宠里可以切
 
 ## 余额警告
 
+**右键 → 设置 → 余额警告**，二级界面：
+
+```
+← 返回                余额警告
+余额　¥4.50
+──────────────────
+✓ 余额警告语音
+```
+
+- 第一行是**当前余额**（只读），读不到时显示「读不到（未登录或账户不可用）」，不会显示成 ¥0.00
+- 第二行是**语音开关**：关掉后她不再播提醒，但余额照样读取、照样显示
+
 账户余额降到 **5、4、3、2、1 元**时，她会提醒你一次 —— **每跨过一档提醒一次**，同一档位不会重复。
 
 提醒内容是**一段完整反应**：气泡 + 动作 + 表情，播完恢复原来的表情。每个角色有三种，**随机播放一种**：
@@ -117,8 +129,8 @@ DeepSeek Harness Web GUI 的 **Live2D 桌宠插件**，一台桌宠里可以切
 - **每 60 秒**读一次账户余额
 - 桌宠启动时余额已经很低 → **不提醒**，因为那不是「刚刚发生的变化」
 - 余额回到 5 元以上再降下来 → 会**重新提醒**
-- 在 **设置 → 余额警告** 里可以关闭
-- 关闭、未登录、或读不到余额时**完全静默**：不会把「读不到」当成 0 元
+- 关闭语音后，余额**仍会读取并显示**，只是不再提醒
+- 未登录、或读不到余额时**完全静默**：不会把「读不到」当成 0 元
 
 ## 功能简介
 
@@ -133,7 +145,7 @@ DeepSeek Harness Web GUI 的 **Live2D 桌宠插件**，一台桌宠里可以切
 | 待机动作数 | 本角色的待机池 |
 | 语音条数 | 点击 + 阶段反应 + 待机 + 下线 |
 | 随机模式 | 说明 + **当前是否开启及所选范围** |
-| 余额警告 | 说明 + **当前是否开启**，能读到余额时附带「余额 ¥x.xx」 |
+| 余额警告 | 一句话说明 + **指向「设置 → 余额警告」**（余额和开关都在那里） |
 
 ## 取景
 

package/lib/client.js

@@ -1117,7 +1117,9 @@ window.__ModuleLoader__.load({
 			/* The three settings toggles: the framing boundary, eye blink, and gaze tracking. */
 			boundary: "boundary.png",
 			blink: "blink.png",
-			gaze: "gaze.png"
+			gaze: "gaze.png",
+			// A coin, for the 余额警告 row.
+			balance: "balance.png"
 		};
 
 		/**
@@ -1914,6 +1916,11 @@ window.__ModuleLoader__.load({
 			"pet.menu.gaze": "视线追随",
 			"pet.menu.randomMode": "随机模式",
 			"pet.menu.title.random": "随机模式",
+			"pet.menu.balance": "余额警告",
+			"pet.menu.title.balance": "余额警告",
+			"pet.menu.balanceAmount": "余额",
+			"pet.menu.balanceVoice": "余额警告语音",
+			"pet.menu.balanceUnavailable": "读不到（未登录或账户不可用）",
 			"pet.menu.randomModeOn": "开启随机模式",
 			"pet.menu.randomScope": "随机内容",
 			"pet.menu.randomMotion": "随机动作",
@@ -1937,11 +1944,7 @@ window.__ModuleLoader__.load({
 			"pet.about.random.text": "在「设置 → 随机模式」里开启。开启后待机时每 12 秒按所选范围重新随机，并且不出声；可选只为动作、只为表情，或两者都随机。",
 			"pet.about.random.now": "当前：已开启（{scope}）",
 			"pet.about.balance": "余额警告",
-			"pet.about.balance.text": "余额降到 5、4、3、2、1 元时提醒你，每一档提醒一次；她会随机播放 {count} 种反应之一。可在「设置」里关闭。",
-			"pet.about.balance.on": "当前：已开启",
-			"pet.about.balance.off": "当前：已关闭",
-			"pet.about.balance.value": "，余额 ¥{value}",
-			"pet.about.balance.unknown": "（读不到账户余额时不会提醒）",
+			"pet.about.balance.text": "余额降到 5 元以下时提醒你，每跨过一元一次。开关和余额都在「设置 → 余额警告」里。",
 			"pet.about.how": "操作",
 			"pet.about.how.text": "左键拖动移动、滚轮缩放、点击说话、右键打开菜单。",
 			"pet.menu.submenuHint": "点击进入",
@@ -2072,6 +2075,11 @@ window.__ModuleLoader__.load({
 			"pet.menu.gaze": "Eyes follow",
 			"pet.menu.randomMode": "Random mode",
 			"pet.menu.title.random": "Random mode",
+			"pet.menu.balance": "Balance warning",
+			"pet.menu.title.balance": "Balance warning",
+			"pet.menu.balanceAmount": "Balance",
+			"pet.menu.balanceVoice": "Balance warning voice",
+			"pet.menu.balanceUnavailable": "Unavailable (signed out or no account service)",
 			"pet.menu.randomModeOn": "Enable random mode",
 			"pet.menu.randomScope": "What to randomise",
 			"pet.menu.randomMotion": "Random motions",
@@ -2095,11 +2103,7 @@ window.__ModuleLoader__.load({
 			"pet.about.random.text": "Turn it on under Settings → Random mode. While it is on, the idle pose is redrawn every 12 seconds according to the scope you pick, and she stays silent; the scope can be motions only, expressions only, or both.",
 			"pet.about.random.now": "Currently on ({scope})",
 			"pet.about.balance": "Balance warning",
-			"pet.about.balance.text": "Warns you as the balance drops past 5, 4, 3, 2 and 1 yuan — once per threshold — playing one of {count} reactions at random. Switch it off in Settings.",
-			"pet.about.balance.on": "Currently on",
-			"pet.about.balance.off": "Currently off",
-			"pet.about.balance.value": ", balance ¥{value}",
-			"pet.about.balance.unknown": " (no warning while the balance cannot be read)",
+			"pet.about.balance.text": "Warns you as the balance drops below 5 yuan, once per yuan crossed. The balance and the switch are in Settings → Balance warning.",
 			"pet.about.how": "Controls",
 			"pet.about.how.text": "Drag to move, scroll to zoom, click to talk, right-click for the menu.",
 			"pet.menu.submenuHint": "open",
@@ -5247,26 +5251,14 @@ window.__ModuleLoader__.load({
 				});
 
 				/*
-				 * Balance warnings, described separately for the same reason as random mode: it changes behaviour rather than
-				 * reporting what the character has, and it is the one feature tied to something OUTSIDE the pet.
+				 * Balance warnings — ONE line, because the numbers and the switch live in 设置 → 余额警告.
 				 *
-				 * Three facts belong here: where the thresholds are, that each fires once, and that it can be switched off. The
-				 * scene count comes from the table rather than being written as "three", so a character with a different number
-				 * is described correctly. The live balance is appended only when it could be read — printing "¥0.00" for an
-				 * unreadable account would look like an empty wallet.
+				 * This panel describes what the character IS; a balance readout and a toggle belong where the rest of the pet's
+				 * switches are. Mentioning the location is the whole job here, so the row says the behaviour and points at the
+				 * panel rather than repeating its contents.
 				 */
-				const balanceInfo = snapshot?.balance;
 				const scenes = (BALANCE_WARNING_REACTIONS[CHARACTER_GROUPS[id] ?? id] ?? []).length;
-				if (scenes > 0) {
-					const on = balanceInfo?.enabled !== false;
-					const value = typeof balanceInfo?.value === "number" ? balanceInfo.value : undefined;
-					const state = on ? t("pet.about.balance.on") : t("pet.about.balance.off");
-					const shown = value === undefined ? t("pet.about.balance.unknown") : t("pet.about.balance.value", { value: value.toFixed(2) });
-					rows.push({
-						head: t("pet.about.balance"),
-						text: `${t("pet.about.balance.text", { count: scenes })}${state}${shown}`
-					});
-				}
+				if (scenes > 0) rows.push({ head: t("pet.about.balance"), text: t("pet.about.balance.text") });
 
 				// Interactions worth knowing about, which are the same for every character.
 				rows.push({ head: t("pet.about.how"), text: t("pet.about.how.text") });
@@ -7599,6 +7591,42 @@ window.__ModuleLoader__.load({
 							// as well as mapping the identifier to readable copy.
 							item(expressionLabel(expression), () => this.stage?.playExpression(expression, { user: true }));
 						}
+					} else if (view === "balance") {
+						header(t("pet.menu.title.balance"));
+						/*
+						 * The balance itself: a read-only line, not a control.
+						 *
+						 * `value` is null whenever the account is not readable — signed out, no account service, or a failed query.
+						 * That is shown as a sentence rather than as ¥0.00, because a zero would read as an empty wallet.
+						 */
+						const balanceValue = this.snapshot?.balance?.value;
+						const readout = document.createElement("div");
+						readout.className = "dsh-l2d-menu-text";
+						readout.textContent = `${t("pet.menu.balanceAmount")}　${
+							typeof balanceValue === "number" ? `\u00a5${balanceValue.toFixed(2)}` : t("pet.menu.balanceUnavailable")
+						}`;
+						menu.appendChild(readout);
+						/*
+						 * The voice switch. `balanceWarnings` in the layout record is the single source, so the host's poller stops
+						 * reading once it is off; the balance above stays visible either way.
+						 */
+						const voiceOn = this.snapshot?.balance?.enabled !== false;
+						item(`${voiceOn ? "\u2713 " : "\u3000"}${t("pet.menu.balanceVoice")}`, () => {
+							API.layout({ balanceWarnings: !voiceOn }).then((result) => {
+								if (this.destroyed || !result.ok) return;
+								/*
+								 * Both copies are updated: `layout` is what the host persisted, and `balance.enabled` is what the
+								 * tick and the warning path read. The next poll would carry it too, but the tick would then lag a
+								 * poll behind the click — which reads as the switch not working.
+								 */
+								this.snapshot = {
+									...this.snapshot,
+									layout: result.layout,
+									balance: { ...(this.snapshot?.balance ?? {}), enabled: !voiceOn }
+								};
+								this.refreshMenu("balance");
+							}, () => {});
+						});
 					} else if (view === "random") {
 						header(t("pet.menu.title.random"));
 						/** Write one layout key and re-render, so the ticks track the state. */
@@ -7830,6 +7858,13 @@ window.__ModuleLoader__.load({
 						 * what it randomises. A single checkbox could only express the first.
 						 */
 						submenu(`${this.snapshot.layout?.randomModeEnabled === true ? "\u2713 " : "\u3000"}${t("pet.menu.randomMode")}`, "random", menuIcon("random"));
+						/*
+						 * The balance panel: the current balance and the voice's on/off.
+						 *
+						 * Its own level rather than a plain toggle, because a toggle alone cannot answer the question someone opens
+						 * this for — 「我还剩多少」. The balance is read-only there; only the voice switches.
+						 */
+						submenu(t("pet.menu.balance"), "balance", menuIcon("balance"));
 						// A read-only description of whoever is on screen. @see characterIntro
 						submenu(t("pet.menu.about"), "about", menuIcon("about"));
 						/*

package/lib/index.js

@@ -284,10 +284,12 @@ export class PetLive2DService extends Service {
 		 * signed-out account, must leave the pet working exactly as before rather than failing to mount. `undefined` from
 		 * `ctx.get` is the ordinary case for both, so it is not treated as an error anywhere.
 		 *
-		 * The warning TEXT is configurable and empty by default — the feature reports the threshold it crossed and says nothing
-		 * until copy is filled in. @see BALANCE_WARNING_LINES
+		 * ON/OFF lives in the LAYOUT RECORD, not here, because the switch is a row in the pet's own 设置 menu — that menu writes
+		 * through `POST /layout`, which normalises into the record. The getter below is the only reader, so the menu's toggle and
+		 * the poller cannot disagree.
+		 *
+		 * The warning copy is per threshold and stays in the config, since it is prose edited by hand rather than a switch.
 		 */
-		this.balanceWarningsEnabled = config.balanceWarnings !== false;
 		this.balanceWarningLines = config.balanceWarningLines ?? {};
 		this.balance = new BalanceWatcher();
 		this.balanceTimer = null;
@@ -451,7 +453,8 @@ export class PetLive2DService extends Service {
 			 * `lines` is the copy per threshold, empty by default; the client renders nothing when the text is empty.
 			 */
 			balance: {
-				enabled: this.balanceWarningsEnabled,
+				// Read through the getter so the menu's toggle and this snapshot can never disagree.
+				enabled: this.balanceWarningsOn(),
 				value: this.balance.current ?? null,
 				band: this.balance.lastBand ?? null,
 				lines: this.balanceWarningLines ?? {}
@@ -459,6 +462,19 @@ export class PetLive2DService extends Service {
 		};
 	}
 
+	/**
+	 * Whether balance warnings are switched on, from the persisted layout.
+	 *
+	 * The single reader: the poller and the state snapshot both go through here, so a toggle in the 设置 menu takes effect on the
+	 * next poll rather than needing a restart. `DEFAULT_LAYOUT.balanceWarnings` is the default; `config.balanceWarnings` is only an
+	 * initial seed (see `applyConfig`), which is why this cannot read the config directly.
+	 *
+	 * @returns true when warnings should be read and shown.
+	 */
+	balanceWarningsOn() {
+		return this.record?.layout?.balanceWarnings !== false;
+	}
+
 	/**
 	 * The whole phase -> animation table, for diagnostics and for the harness that verifies
 	 * every phase's clips actually play. `view()` only exposes the current phase, which is all
@@ -494,6 +510,10 @@ export class PetLive2DService extends Service {
 			? this.setCharacter(patch.character)
 			: false;
 		this.record = { ...this.record, layout: normalizeLayout(patch, this.record.layout) };
+		/*
+		 * No timer to restart when the warning switch changes: the balance poll runs regardless, because the 设置 panel shows the
+		 * balance even while the warnings are silenced. Only `enabled` in the next snapshot changes.
+		 */
 		if (!changed) this.flush();
 		return {
 			ok: true,
@@ -581,13 +601,16 @@ export class PetLive2DService extends Service {
 	 * Start or stop the balance poll.
 	 *
 	 * Idempotent, like the two `sync*` methods above, so a config change can call it without stacking timers.
+	 *
+	 * The poll runs whether or not the warning voice is switched on, because the 设置 panel DISPLAYS the balance — silencing the
+	 * warnings must not also blank the readout. Only `this.disabled` stops it.
 	 */
 	syncBalance() {
 		if (this.balanceTimer !== null) {
 			clearInterval(this.balanceTimer);
 			this.balanceTimer = null;
 		}
-		if (this.disabled || !this.balanceWarningsEnabled) return;
+		if (this.disabled) return;
 		// Read once immediately: waiting a full interval would leave a freshly started pet with no balance at all, and the
 		// first reading is also what establishes the band the balance is ALREADY in.
 		void this.readBalance();
@@ -718,10 +741,17 @@ export const Config = z.object({
 	]).description("随机模式随机的内容。"),
 	voiceVolume: z.number().step(0.1).min(LAYOUT_LIMITS.voiceVolume.min).max(LAYOUT_LIMITS.voiceVolume.max)
 		.description("语音音量，0 为静音（也可在桌宠菜单的「设置 → 语音音量」里调整）。"),
-	balanceWarnings: z.boolean().default(true)
-		.description("余额警告：账户余额降到 5、4、3、2、1 元时让桌宠提醒一次（每跨过一档提醒一次）。"),
+	/*
+	 * NO `.default(...)` on this one, deliberately.
+	 *
+	 * A default makes the schema always produce a value, which `normalizeLayout` then applies over the stored layout — so the
+	 * 设置 menu's toggle would be silently reset on every reload. Left unset the field is `undefined`, the stored value survives,
+	 * and `DEFAULT_LAYOUT.balanceWarnings` supplies the initial true.
+	 */
+	balanceWarnings: z.boolean()
+		.description("余额警告：账户余额降到 5、4、3、2、1 元时让桌宠提醒一次（每跨过一档提醒一次）。也可在桌宠菜单的「设置」里开关。"),
 	balanceWarningLines: z.dict(z.string())
-		.description("各档位的提醒文案，键为余额档位（\"5\" 到 \"1\"）。留空则该档只记日志、不显示气泡。"),
+		.description("各档位的提醒文案，键为余额档位（\"5\" 到 \"1\"）。留空时使用桌宠自带的三段反应。"),
 	name: z.string().min(1).max(24).description("桌宠显示名。")
 });
 

package/lib/persist.js

@@ -83,6 +83,14 @@ export const DEFAULT_LAYOUT = {
 	 * and later on again should restore the scope that was chosen before, not reset it to a default.
 	 */
 	randomModeScope: "both",
+	/**
+	 * Warn when the account balance drops past 5, 4, 3, 2 and 1 yuan.
+	 *
+	 * A LAYOUT field rather than a plugin-config field, because the switch lives in the pet's own 设置 menu: the menu writes
+	 * through `POST /api/pet-live2d-viola/layout`, which normalises against this record. Keeping it in `Config` alone would have
+	 * made the menu's toggle a value nothing read.
+	 */
+	balanceWarnings: true,
 	/**
 	 * Playback volume for every spoken clip, 0..1.
 	 *
@@ -208,6 +216,7 @@ export function normalizeLayout(patch, base = DEFAULT_LAYOUT) {
 		// An unknown scope degrades to the previous one, matching how `crop` is handled: the value reaches the drift, and an
 		// unrecognised string there would silently match no branch and leave the mode doing nothing.
 		randomModeScope: RANDOM_MODE_SCOPES.includes(raw.randomModeScope) ? raw.randomModeScope : base.randomModeScope,
+		balanceWarnings: typeof raw.balanceWarnings === "boolean" ? raw.balanceWarnings : base.balanceWarnings,
 		voiceVolume: clampNumber(raw.voiceVolume, base.voiceVolume, LAYOUT_LIMITS.voiceVolume.min, LAYOUT_LIMITS.voiceVolume.max)
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-pet-live2d-viola",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "Live2D desktop pet for the DeepSeek Harness web GUI. One pet, three characters: 都子 (miyako_014_casual_spring_01_marukun), 薇欧拉 in casual or school uniform, and 由乃 in casual clothes or her virtual-avatar outfit — each with its own motions, expressions, voice lines, captions, idle drift, click reactions and goodbye.",
   "type": "module",
   "main": "lib/index.js",