dsh-live2dwaifu 0.6.0 → 0.7.1

package/README.md

@@ -23,7 +23,7 @@
 
 **会出声**：一个字一声很短的电音，标点停一拍，句尾沉一下——不是朗读，是“哔哔”那种。标题栏的 **♪** 打开调音页，放个真模型在旁边，边调边听；每只模型各存一份音色，换人换声。音量拉到 0 就安静，只剩气泡和口型。
 
-**她也会甩图**：图库直接吃 `dsh-meme` 那套，说话时按情绪挑一张，贴在气泡里。
+**她也会甩图（测试功能）**：⚙ 里有一根滑轴，四档——不使用 / 只使用自带 / 均开启 / 只用 dsh-meme。自带那套是夏铃自己的 Q 版贴纸，二十张，随插件分发，版权归本插件；dsh-meme 那套只是借用你本机已经装的图库。默认关着，功能还在试。
 
 **她还会问你要选项**：话说到了需要你挑的地方，气泡下面会冒出两三个按钮，点一个就等于你回了她。
 
@@ -125,6 +125,16 @@ frame.contentWindow.postMessage({ type: 'dsh-live2d/manage' }, '*');
 **能放动作吗？**
 暂时不能编排 `.motion3.json`，表情是固定的七种。想要更多情绪，给它发 `mood`，等以后的版本。
 
+## 关于别人的插件
+
+她的图、她的耳朵，都是从你**已经装好的**插件里读的。这个包里不带任何第三方素材，也一行没改别人的代码：
+
+- **表情图**：从 `dsh-meme` 的图库目录里挑一张，只在本机显示，不上传、不分发。没装 `dsh-meme` 就没有图，其它照常。
+- **麦克风**：交给 `dsh-ears`，本插件不碰录音，只是把转写好的字送进对话。
+- **对话**：走 DSH 自己的模型接口（`ctx.llm`），不经过任何人的会话，也不写你的聊天记录。
+
+不喜欢这些联动，⚙ 里都能单独关掉。
+
 ## 已知限制
 
 - 只支持 Cubism 3 / 4（表情只认 `.exp3.json`，不认 `.motion3.json` 里的表情轨）

package/assets/memes/manifest.json

@@ -0,0 +1,29 @@
+{
+  "id": "xialing-001",
+  "name": "夏铃",
+  "version": "1.0.0",
+  "license": "随本插件以 MIT 分发；图由 LFR 用 Seedream 生成",
+  "note": "Q 版三头身，白大褂 + 红高领毛衣 + 黑裤，淡灰虹膜，细黑框眼镜。",
+  "items": [
+    { "file": "deyi.jpg", "label": "得意", "moods": ["开心"] },
+    { "file": "shengqi.jpg", "label": "生气", "moods": ["生气"] },
+    { "file": "haixiu.jpg", "label": "害羞", "moods": ["害羞"] },
+    { "file": "kun.jpg", "label": "困", "moods": ["困"] },
+    { "file": "wuyu.jpg", "label": "无语", "moods": ["无语"] },
+    { "file": "jingya.jpg", "label": "惊讶", "moods": ["惊讶"] },
+    { "file": "kaixin.jpg", "label": "开心", "moods": ["开心"] },
+    { "file": "sikao.jpg", "label": "想事情", "moods": ["平静"] },
+    { "file": "xianqi.jpg", "label": "嫌弃", "moods": ["无语", "生气"] },
+    { "file": "diantou.jpg", "label": "点头", "moods": ["平静"] },
+    { "file": "zhaoshou.jpg", "label": "打招呼", "moods": ["开心"] },
+    { "file": "bunaifan.jpg", "label": "别烦我", "moods": ["生气"] },
+    { "file": "xin-ing.jpg", "label": "心动", "moods": ["害羞"] },
+    { "file": "xin-cui.jpg", "label": "手指抵唇", "moods": ["害羞"] },
+    { "file": "xin-peng.jpg", "label": "崩溃", "moods": ["惊讶"] },
+    { "file": "xin-tiao.jpg", "label": "挑衅", "moods": ["生气"] },
+    { "file": "xin-xiao.jpg", "label": "看好戏", "moods": ["开心"] },
+    { "file": "xin-daxiao.jpg", "label": "大笑", "moods": ["开心"] },
+    { "file": "xin-hei.jpg", "label": "暗笑", "moods": ["无语"] },
+    { "file": "xin-yao.jpg", "label": "馋", "moods": ["害羞"] }
+  ]
+}

package/assets/viewer.html

@@ -42,6 +42,10 @@
   #settings h3 { font-size: 10px; letter-spacing: .6px; color: #6f7783; font-weight: 600; margin: 8px 0 4px; }
   .opt { display: flex; align-items: center; gap: 8px; padding: 3px 2px; font-size: 12px; color: #c3c9d3; }
   .opt input { accent-color: #6aa9ff; }
+  .opt-col { padding: 4px 2px 2px; }
+  .opt-col input[type=range] { width: 100%; accent-color: #6aa9ff; }
+  .opt-lab { font-size: 12px; color: #dfe4ec; margin-top: 2px; }
+  .opt-note { font-size: 10.5px; line-height: 1.6; color: #6f7783; margin-top: 4px; }
   .bub-img { display: block; max-width: 100%; max-height: 120px; border-radius: 8px; margin-bottom: 6px; object-fit: contain; }
   #actions { display: flex; gap: 6px; }
   #actions button { flex: 1; background: #2f343d; color: #cfd4dd; border: 1px solid #3c424c;

package/assets/viewer.js

@@ -44346,10 +44346,11 @@ void main(void)\r
   ];
   var SERVER_OPTS = [
     ["proactive", "\u6CA1\u4EBA\u7406\u5C31\u81EA\u5DF1\u5F00\u53E3"],
-    ["memes", "\u4F1A\u7529\u8868\u60C5\u5305"],
     ["choices", "\u7ED9\u9009\u9879\u8BA9\u4ED6\u6311"],
     ["memory", "\u8BB0\u4F4F\u4E4B\u524D\u8BF4\u7684"]
   ];
+  var MEME_MODES = ["off", "own", "both", "external"];
+  var MEME_LABELS = ["\u4E0D\u4F7F\u7528", "\u53EA\u4F7F\u7528\u81EA\u5E26", "\u5747\u5F00\u542F", "\u53EA\u7528 dsh-meme"];
   var serverSettings = {};
   function renderSettings() {
     const box = $2("settings");
@@ -44391,6 +44392,41 @@ void main(void)\r
       row.appendChild(document.createTextNode(label));
       box.appendChild(row);
     }
+    const h3 = document.createElement("h3");
+    h3.textContent = "\u8868\u60C5\u5305\uFF08\u6D4B\u8BD5\u529F\u80FD\uFF09";
+    box.appendChild(h3);
+    const wrap = document.createElement("div");
+    wrap.className = "opt-col";
+    const slider = document.createElement("input");
+    slider.type = "range";
+    slider.min = "0";
+    slider.max = String(MEME_MODES.length - 1);
+    slider.step = "1";
+    const cur = Math.max(0, MEME_MODES.indexOf(serverSettings.memesMode || "off"));
+    slider.value = String(cur);
+    const lab = document.createElement("div");
+    lab.className = "opt-lab";
+    lab.textContent = MEME_LABELS[cur];
+    slider.oninput = () => {
+      lab.textContent = MEME_LABELS[Number(slider.value)];
+    };
+    slider.onchange = () => {
+      const mode = MEME_MODES[Number(slider.value)];
+      serverSettings.memesMode = mode;
+      fetch(BASE + "/api/settings", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ settings: { memesMode: mode } })
+      }).catch(() => {
+      });
+    };
+    const note = document.createElement("div");
+    note.className = "opt-note";
+    note.textContent = "\u81EA\u5E26\u90A3\u5957\u662F\u590F\u94C3\u7684 Q \u7248\u8D34\u7EB8\uFF0C\u4E8C\u5341\u5F20\uFF1Bdsh-meme \u90A3\u5957\u501F\u7528\u4F60\u672C\u673A\u5DF2\u7ECF\u88C5\u7684\u56FE\u5E93\u3002\u529F\u80FD\u8FD8\u5728\u8BD5\u9A8C\uFF0C\u53EF\u80FD\u4F1A\u8C03\u3002";
+    wrap.appendChild(slider);
+    wrap.appendChild(lab);
+    wrap.appendChild(note);
+    box.appendChild(wrap);
   }
   function loadSettings() {
     fetch(BASE + "/api/settings").then((r2) => r2.json()).then((d2) => {

package/lib/index.js

@@ -25,7 +25,8 @@ const MEME_TAGS = {
 
 const DEFAULT_SETTINGS = {
   proactive: true,
-  memes: true,
+  /** off | own | both | external —— 测试功能，默认关 */
+  memesMode: 'off',
   choices: true,
   memory: true,
   follow: true,
@@ -35,6 +36,45 @@ const DEFAULT_SETTINGS = {
   sound: true,
 };
 
+const MEMES_MODES = ['off', 'own', 'both', 'external'];
+const OWN_MEME_DIR = join(ASSETS, 'memes');
+
+function readOwnMemes() {
+  try {
+    const m = JSON.parse(readFileSync(join(OWN_MEME_DIR, 'manifest.json'), 'utf8'));
+    return Array.isArray(m.items) ? m.items : [];
+  } catch {
+    return [];
+  }
+}
+
+/** 从自带那套里按情绪挑一张，返回文件名 */
+function pickOwnMeme(mood) {
+  const items = readOwnMemes();
+  if (!items.length) return null;
+  const hit = items.filter((it) => Array.isArray(it.moods) && it.moods.includes(mood));
+  const pool = hit.length ? hit : items;
+  const it = pool[Math.floor(Math.random() * pool.length)];
+  return it && it.file ? it.file : null;
+}
+
+/** 按模式挑一张配图，返回可直接用的 URL */
+function pickImage(mode, mood, label) {
+  const m = MEMES_MODES.includes(mode) ? mode : 'off';
+  if (m === 'off') return null;
+  const pool = [];
+  if (m === 'own' || m === 'both') {
+    const f = (label && pickOwnMemeByLabel(label)) || pickOwnMeme(mood);
+    if (f) pool.push('/dsh-live2d/ownmeme/' + encodeURIComponent(f));
+  }
+  if (m === 'external' || m === 'both') {
+    const f = pickMeme(mood);
+    if (f) pool.push('/dsh-live2d/media/' + f.split('/').map(encodeURIComponent).join('/'));
+  }
+  if (!pool.length) return null;
+  return pool[Math.floor(Math.random() * pool.length)];
+}
+
 function settingsOf(cfg) {
   return { ...DEFAULT_SETTINGS, ...(cfg?.settings || {}) };
 }
@@ -78,7 +118,30 @@ function splitChoices(raw) {
   return { text: raw.slice(0, m.index).trim(), choices };
 }
 
-/** 粗判情绪，配图用 */
+/** 先摘「||图:名字」，再摘「||选项1|选项2」 */
+function splitMeta(raw) {
+  let text = String(raw || '');
+  let imageLabel = '';
+  const imgMatch = /\|\|\s*图\s*[:：]\s*([^\n|]+)\s*$/m.exec(text);
+  if (imgMatch) {
+    imageLabel = imgMatch[1].trim().replace(/^["“「『']+|["”」』']+$/g, '');
+    text = (text.slice(0, imgMatch.index) + text.slice(imgMatch.index + imgMatch[0].length)).trim();
+  }
+  const parsed = splitChoices(text);
+  return { text: parsed.text, choices: parsed.choices, imageLabel };
+}
+
+/** 按名字取自带那张 */
+function pickOwnMemeByLabel(label) {
+  const items = readOwnMemes();
+  if (!items.length || !label) return null;
+  const key = String(label).trim();
+  const hit =
+    items.find((it) => it.label === key) ||
+    items.find((it) => String(it.file).replace(/\.\w+$/, '') === key) ||
+    items.find((it) => key && String(it.label).includes(key));
+  return hit ? hit.file : null;
+}
 function guessMood(text) {
   const s = String(text || '');
   if (/[气烦讨厌]/.test(s)) return '生气';
@@ -383,6 +446,12 @@ async function handle(req, res, ctx) {
     return file ? sendFile(res, file) : send(res, 403, 'forbidden');
   }
 
+  // 自带的 Q 版表情包
+  if (path.startsWith('/ownmeme/')) {
+    const file = safeJoin(OWN_MEME_DIR, decodeURIComponent(path.slice('/ownmeme/'.length)));
+    return file ? sendFile(res, file) : send(res, 403, 'forbidden');
+  }
+
   // 表情图库
   if (path.startsWith('/media/')) {
     const file = safeJoin(MEMES_ROOT, decodeURIComponent(path.slice('/media/'.length)));
@@ -426,6 +495,14 @@ async function handle(req, res, ctx) {
       '他说：' + text,
       '回他一句。只输出这句话本身：一到三句，短，口语，像发消息。不要解释，不要加引号，不要旁白，不要括号里的动作。',
       st.choices ? '如果你想让他挑，可以在最后另起一行写 ||选项一|选项二，最多三项。' : '',
+      st.memesMode === 'own' || st.memesMode === 'both'
+        ? '如果你想附一张贴图，就在最后另起一行写 ||图:名字。能挑的名字有：' +
+          readOwnMemes()
+            .map((it) => it.label)
+            .filter(Boolean)
+            .join('、') +
+          '。不想配就别写。'
+        : '',
     ]
       .filter(Boolean)
       .join('\n\n');
@@ -437,7 +514,7 @@ async function handle(req, res, ctx) {
       return sendJson(res, 502, { error: '生成失败：' + (e instanceof Error ? e.message : String(e)) });
     }
     LAST_ACTIVE.at = Date.now();
-    const parsed = splitChoices(reply || '');
+    const parsed = splitMeta(reply || '');
     let line = parsed.text;
     let choices = st.choices ? parsed.choices : [];
     if (line.length > 240) line = line.slice(0, 240);
@@ -445,7 +522,15 @@ async function handle(req, res, ctx) {
       choices = FALLBACK_CHOICES[guessMood(line)] || FALLBACK_CHOICES['平静'];
     }
     if (!line && !choices.length) return sendJson(res, 200, { ok: true, reply: '', id });
-    const image = st.memes && guessMood(line) && Math.random() < 0.35 ? pickMeme(guessMood(line)) : null;
+    const moodNow = guessMood(line);
+    const image =
+      st.memesMode === 'off'
+        ? null
+        : parsed.imageLabel
+          ? pickImage(st.memesMode, moodNow, parsed.imageLabel)
+          : Math.random() < 0.35
+            ? pickImage(st.memesMode, moodNow)
+            : null;
 
     writeChat(id, hist.concat([
       { role: 'user', text, at: Date.now() },
@@ -491,6 +576,9 @@ async function handle(req, res, ctx) {
     for (const k of Object.keys(DEFAULT_SETTINGS)) {
       if (typeof patch?.[k] === 'boolean') next[k] = patch[k];
     }
+    if (typeof patch?.memesMode === 'string' && MEMES_MODES.includes(patch.memesMode)) {
+      next.memesMode = patch.memesMode;
+    }
     writeConfig({ ...cfg, settings: next });
     return sendJson(res, 200, { ok: true, settings: next });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-live2dwaifu",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "给 DSH 网页右下角请一个 Live2D 角色：会眨眼、会呼吸、视线跟着鼠标、点她有反应、说话时嘴动、心情变了眉毛跟着动。模型不用内置——谁装谁放自己的文件夹；支持自定义 .exp3.json 表情和 .motion3.json 动作，卡片能拖能缩，背景可换。",
   "type": "module",
   "main": "lib/index.js",