dsh-live2dwaifu 1.0.1 → 1.0.3

package/README.md

@@ -35,7 +35,9 @@ dsh plugin --profile desktop add dsh-live2dwaifu
 
 ### 位置和大小
 
-按住**标题栏**能拖到屏幕任何地方；右下角那个小斜纹拖的是大小（宽 200–720，高 220–视口高−80）。位置、大小、背景、开合状态都记在本机，下次打开还是这样。
+按住**标题栏**能拖到屏幕任何地方。
+**改大小**：卡片左上角那个小斜纹，往左上拖变大、往右下拖变小——卡片本身钉在屏幕右下角，所以动的是它的左上角（宽 200–720，高 220–视口高−80）。
+位置、大小、背景、开合状态都记在本机，下次打开还是这样。
 
 拖到一半跑到屏幕外了？关掉重开一次就回到默认位置。
 
@@ -188,6 +190,19 @@ python tools/export-dsh-meme.py
 
 | 开关 | 位置 | 默认 | 说明 |
 |---|---|---|---|
+| 视线跟随鼠标 | 本机 | 开 | 角色的眼睛和头跟着鼠标动 |
+| 点击角色有反应 | 本机 | 开 | 点她不同部位有不同反应 |
+| 自动播放动作 | 本机 | 开 | 模型带动作文件时，隔一会儿播一个 |
+| 说话带电子音 | 本机 | 开 | 每个字一声短音 |
+| 复述聊天内容 | 本机 | 开 | 聊天窗口出现新回复时，由她念出来 |
+| 闲置时主动说话 | 服务端 | 开 | 一段时间没人说话，她自己开一句 |
+| 回复附带选项按钮 | 服务端 | 开 | 她觉得需要选择时，气泡上方出现可点按钮 |
+| 记住聊过的内容 | 服务端 | 开 | 关掉就不带记忆、不压缩 |
+| 表情包（四档） | 服务端 | 不使用 | 测试功能，见上面那节 |
+
+「本机」存 localStorage，只影响这一台浏览器；「服务端」存 `~/.dsh/dsh-live2d/config.json`，换浏览器也一样。
+
+---|---|---|---|
 | 眼睛跟着鼠标 | 本机 | 开 | 关掉她就不看鼠标了 |
 | 点她有反应 | 本机 | 开 | 摸头害羞、戳身上瞪你 |
 | 自己播动作 | 本机 | 开 | 有动作文件的模型才会动 |
@@ -272,7 +287,7 @@ curl -X POST http://127.0.0.1:<端口>/dsh-live2d/api/push \
 先重启。还不来，看 profile 的 `package.json`：`dsh.profile.bundles` 和 `dependencies` 里都得有 `dsh-live2dwaifu`。手动拷进 `node_modules` 的不会自动登记。
 
 **她只有半张脸 / 位置偏上**
-模型画布比例跟卡片不一样。卡片是竖的，太宽或太扁的模型会被裁两边。拖右下角改形状试试。
+模型画布比例跟卡片不一样。卡片是竖的，太宽或太扁的模型会被裁两边。拖左上角那个小斜纹改形状试试。
 
 **导入了却不认得**
 `.model3.json` 的层级选错了。选它隔壁那一层。

package/assets/viewer.js

@@ -44338,30 +44338,43 @@ void main(void)\r
     }
   }
   var LOCAL_OPTS = [
-    ["gaze", "\u773C\u775B\u8DDF\u7740\u9F20\u6807"],
-    ["poke", "\u70B9\u5979\u6709\u53CD\u5E94"],
-    ["motion", "\u81EA\u5DF1\u64AD\u52A8\u4F5C"],
-    ["sound", "\u51FA\u58F0"],
-    ["follow", "\u8DDF\u7740\u804A\u5929\u5FF5"]
+    ["gaze", "\u89C6\u7EBF\u8DDF\u968F\u9F20\u6807"],
+    ["poke", "\u70B9\u51FB\u89D2\u8272\u6709\u53CD\u5E94"],
+    ["motion", "\u81EA\u52A8\u64AD\u653E\u52A8\u4F5C"],
+    ["sound", "\u8BF4\u8BDD\u5E26\u7535\u5B50\u97F3"],
+    ["follow", "\u590D\u8FF0\u804A\u5929\u5185\u5BB9"]
   ];
   var SERVER_OPTS = [
-    ["proactive", "\u6CA1\u4EBA\u7406\u5C31\u81EA\u5DF1\u5F00\u53E3"],
-    ["choices", "\u7ED9\u9009\u9879\u8BA9\u4ED6\u6311"],
-    ["memory", "\u8BB0\u4F4F\u4E4B\u524D\u8BF4\u7684"]
+    ["proactive", "\u95F2\u7F6E\u65F6\u4E3B\u52A8\u8BF4\u8BDD"],
+    ["choices", "\u56DE\u590D\u9644\u5E26\u9009\u9879\u6309\u94AE"],
+    ["memory", "\u8BB0\u4F4F\u804A\u8FC7\u7684\u5185\u5BB9"]
   ];
+  var LOCAL_HINT = {
+    gaze: "\u89D2\u8272\u7684\u773C\u775B\u548C\u5934\u4F1A\u8DDF\u7740\u9F20\u6807\u79FB\u52A8",
+    poke: "\u70B9\u89D2\u8272\u7684\u4E0D\u540C\u90E8\u4F4D\u4F1A\u6709\u4E0D\u540C\u53CD\u5E94",
+    motion: "\u6A21\u578B\u5E26\u52A8\u4F5C\u6587\u4EF6\u65F6\uFF0C\u9694\u4E00\u4F1A\u513F\u81EA\u52A8\u64AD\u4E00\u4E2A",
+    sound: "\u8BF4\u8BDD\u65F6\u6BCF\u4E2A\u5B57\u53D1\u4E00\u58F0\u5F88\u77ED\u7684\u7535\u5B50\u97F3",
+    follow: "\u804A\u5929\u7A97\u53E3\u51FA\u73B0\u65B0\u56DE\u590D\u65F6\uFF0C\u7531\u89D2\u8272\u5FF5\u51FA\u6765"
+  };
+  var SERVER_HINT = {
+    proactive: "\u4E00\u6BB5\u65F6\u95F4\u6CA1\u4EBA\u8BF4\u8BDD\uFF0C\u89D2\u8272\u81EA\u5DF1\u5F00\u4E00\u53E5",
+    choices: "\u89D2\u8272\u89C9\u5F97\u9700\u8981\u9009\u62E9\u65F6\uFF0C\u6C14\u6CE1\u4E0A\u65B9\u51FA\u73B0\u53EF\u70B9\u7684\u6309\u94AE",
+    memory: "\u4FDD\u7559\u804A\u8FC7\u7684\u5185\u5BB9\uFF0C\u4E0B\u6B21\u63A5\u7740\u804A\uFF08\u5360\u66F4\u591A\u6A21\u578B\u989D\u5EA6\uFF09"
+  };
   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 MEME_LABELS = ["\u4E0D\u4F7F\u7528", "\u4EC5\u81EA\u5E26", "\u4E24\u8005\u90FD\u7528", "\u4EC5 dsh-meme"];
   var serverSettings = {};
   function renderSettings() {
     const box = $2("settings");
     if (!box) return;
     box.innerHTML = "";
     const h1 = document.createElement("h3");
-    h1.textContent = "\u8FD9\u53F0\u673A\u5668\u4E0A";
+    h1.textContent = "\u663E\u793A\u4E0E\u4EA4\u4E92\uFF08\u5B58\u672C\u673A\uFF09";
     box.appendChild(h1);
     for (const [k2, label] of LOCAL_OPTS) {
       const row = document.createElement("label");
       row.className = "opt";
+      row.title = LOCAL_HINT[k2] || "";
       const cb = document.createElement("input");
       cb.type = "checkbox";
       cb.checked = flag(k2);
@@ -44371,11 +44384,12 @@ void main(void)\r
       box.appendChild(row);
     }
     const h2 = document.createElement("h3");
-    h2.textContent = "\u5979\u90A3\u8FB9";
+    h2.textContent = "\u5BF9\u8BDD\u4E0E\u884C\u4E3A\uFF08\u5B58\u670D\u52A1\u7AEF\uFF09";
     box.appendChild(h2);
     for (const [k2, label] of SERVER_OPTS) {
       const row = document.createElement("label");
       row.className = "opt";
+      row.title = SERVER_HINT[k2] || "";
       const cb = document.createElement("input");
       cb.type = "checkbox";
       cb.checked = serverSettings[k2] !== false;
@@ -44422,7 +44436,7 @@ void main(void)\r
     };
     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";
+    note.textContent = "\u9009\u8BF4\u8BDD\u65F6\u914D\u56FE\u7684\u6765\u6E90\uFF1A\u81EA\u5E26\u662F\u63D2\u4EF6\u5185\u7F6E\u7684\u8D34\u56FE\uFF1Bdsh-meme \u662F\u4F60\u5DF2\u7ECF\u88C5\u597D\u7684\u56FE\u5E93\u3002\u6B64\u529F\u80FD\u4ECD\u5728\u6D4B\u8BD5\uFF0C\u884C\u4E3A\u53EF\u80FD\u8C03\u6574\u3002";
     wrap.appendChild(slider);
     wrap.appendChild(lab);
     wrap.appendChild(note);

package/lib/client.js

@@ -18,7 +18,7 @@
         transition:box-shadow .2s ease}
       .dsh-l2d-card:hover{box-shadow:0 22px 58px rgba(0,0,0,.58)}
       .dsh-l2d-card.collapsed{width:150px!important;height:38px!important}
-      .dsh-l2d-head{display:flex;align-items:center;gap:7px;padding:9px 11px;color:#a8b1bf;font-size:11px;
+      .dsh-l2d-head{display:flex;align-items:center;gap:7px;padding:9px 11px 9px 24px;color:#a8b1bf;font-size:11px;
         letter-spacing:.4px;border-bottom:1px solid rgba(255,255,255,.06);user-select:none;flex:none;cursor:move;
         background:linear-gradient(180deg,rgba(255,255,255,.045),rgba(255,255,255,0))}
       .dsh-l2d-dot{width:7px;height:7px;border-radius:50%;background:#6aa9ff;flex:none;
@@ -43,10 +43,12 @@
         transition:filter .15s ease}
       .dsh-l2d-send:hover{filter:brightness(1.14)}
       .dsh-l2d-send:active{filter:brightness(.96)}
-      .dsh-l2d-grip{position:absolute;right:1px;bottom:1px;width:18px;height:18px;cursor:nwse-resize;opacity:.5;
-        transition:opacity .15s ease;
-        background:repeating-linear-gradient(135deg,transparent 0 2px,rgba(255,255,255,.4) 2px 3px) no-repeat right bottom/10px 10px}
-      .dsh-l2d-grip:hover{opacity:1}
+      .dsh-l2d-grip{position:absolute;left:0;top:0;width:20px;height:20px;cursor:nwse-resize;opacity:.4;
+        transition:opacity .15s ease,background .15s ease;border-radius:16px 0 8px 0;z-index:2;
+        background:repeating-linear-gradient(135deg,transparent 0 2px,rgba(255,255,255,.45) 2px 3px) no-repeat left top/10px 10px}
+      .dsh-l2d-grip:hover{opacity:1;background-color:rgba(255,255,255,.08)}
+      .dsh-l2d-card.resizing{cursor:nwse-resize;box-shadow:0 0 0 1px rgba(106,169,255,.45),0 22px 58px rgba(0,0,0,.6)}
+      .dsh-l2d-card.moving{cursor:move;box-shadow:0 0 0 1px rgba(106,169,255,.35),0 22px 58px rgba(0,0,0,.6)}
     `;
 
     function ensureCss() {
@@ -149,42 +151,67 @@
           .catch(() => setTitle('Live2D'));
       }, [nonce]);
 
+      // 拖动时把 iframe 的指针事件关掉，否则光标一进 iframe 父窗口就收不到事件，手感像粘住
+      const lockPointer = (on, cls, cardEl) => {
+        const f = ref.current;
+        if (f) f.style.pointerEvents = on ? 'none' : '';
+        if (cardEl && cardEl.classList) {
+          cardEl.classList.toggle('resizing', on && cls === 'resizing');
+          cardEl.classList.toggle('moving', on && cls === 'moving');
+        }
+        document.body.style.userSelect = on ? 'none' : '';
+      };
+
+      const bindDrag = (move, cls, cardEl) => {
+        const up = () => {
+          window.removeEventListener('pointermove', move);
+          window.removeEventListener('pointerup', up);
+          window.removeEventListener('pointercancel', up);
+          lockPointer(false, cls, cardEl);
+        };
+        window.addEventListener('pointermove', move);
+        window.addEventListener('pointerup', up);
+        window.addEventListener('pointercancel', up);
+      };
+
+      // 卡片钉在右下角，所以只有左上角会动：往左上拖变大，往右下拖变小
       const startDrag = (e) => {
         e.preventDefault();
+        e.stopPropagation();
+        const cardEl = e.currentTarget.closest('.dsh-l2d-card');
         const sx = e.clientX;
         const sy = e.clientY;
         const w0 = size.w;
         const h0 = size.h;
-        const move = (ev) => {
-          const w = Math.max(200, Math.min(720, w0 + (sx - ev.clientX)));
-          const hh = Math.max(220, Math.min(window.innerHeight - 80, h0 + (sy - ev.clientY)));
+        lockPointer(true, 'resizing', cardEl);
+        bindDrag((ev) => {
+          const maxW = Math.min(720, Math.max(240, window.innerWidth - 60));
+          const maxH = Math.max(240, window.innerHeight - 80);
+          const w = Math.max(200, Math.min(maxW, w0 + (sx - ev.clientX)));
+          const hh = Math.max(220, Math.min(maxH, h0 + (sy - ev.clientY)));
           setSize({ w: Math.round(w), h: Math.round(hh) });
-        };
-        const up = () => {
-          window.removeEventListener('pointermove', move);
-          window.removeEventListener('pointerup', up);
-        };
-        window.addEventListener('pointermove', move);
-        window.addEventListener('pointerup', up);
+        }, 'resizing', cardEl);
       };
 
       const startMove = (e) => {
         if (e.button !== undefined && e.button !== 0) return;
+        const cardEl = e.currentTarget.closest('.dsh-l2d-card');
         const sx = e.clientX;
         const sy = e.clientY;
         const x0 = pos.x;
         const y0 = pos.y;
-        const move = (ev) => {
+        const w = size.w;
+        const hh = open ? size.h : 38;
+        lockPointer(true, 'moving', cardEl);
+        bindDrag((ev) => {
           const nx = x0 + (ev.clientX - sx);
           const ny = y0 + (ev.clientY - sy);
-          setPos({ x: Math.round(nx), y: Math.round(ny) });
-        };
-        const up = () => {
-          window.removeEventListener('pointermove', move);
-          window.removeEventListener('pointerup', up);
-        };
-        window.addEventListener('pointermove', move);
-        window.addEventListener('pointerup', up);
+          // 至少留八十像素在视口里，别拖丢
+          setPos({
+            x: Math.round(Math.min(window.innerWidth - 80, Math.max(-w + 80, nx))),
+            y: Math.round(Math.min(window.innerHeight - 44, Math.max(-hh + 44, ny))),
+          });
+        }, 'moving', cardEl);
       };
       const noDrag = (e) => e.stopPropagation();
 

package/package.json

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