@lily-cooperative/custom-farm 0.38.0 → 0.38.1

package/README.md

@@ -29,6 +29,7 @@
 | **状态自定义** | 数值状态、开关状态、条件规则、消耗行为（例如饥饿时自动吃背包里的东西） |
 | **道具自定义** | 种子/农作物/消耗品/装饰的买价卖价、能不能吃、吃掉后的状态效果、图标、摆放贴图、图层、缩放 |
 | **合成表** | 1~4 个材料合成 1 个产物，桌宠可以用 `farm_craft` 合成 |
+| **性能** | 图层节流：不节流（默认）/ 自动 / 节流；改完自动重启图层 |
 | **设置模板 ZIP** | 导出/导入全部设置和自定义贴图（不含存档） |
 | **环境提示词** | 发给桌宠的静态提示词，写“饿了怎么办、什么时候提醒主人”等 |
 
@@ -116,13 +117,11 @@ Coopanion 只提供打包后的 `Coopanion.exe`，没有可复用的独立 `elec
 
 ### 备份与重置
 
-**游戏配置** 页底部有「存档与重置」：
+**游戏配置** 页最上面有「存档与重置」，不再单独占页签：
 
 - **备份存档**：把 `state.json` 和 `custom.json` 复制到 `data\farm\backups\backup-时间\`
 - **重置一切**：先自动备份，再清空 `state.json` 和 `custom.json`，World 自动重启并生成默认目录；安装路径和已上传的 PNG 文件不会被删除
 
-也可以从「存档与重置」页签操作同样的按钮。
-
 ## 桌面图层
 
 - 图层拆成 `bg` / `top` 两个透明窗口：`bg` 在桌宠下面，`top` 是桌宠的 owned window，永远在桌宠上面。

package/dist/webui.js

@@ -37,7 +37,7 @@ if (typeof document !== 'undefined') {
 
 /** 调 World 的 manage 面板：备份 / 重置 / 自检。 */
 async function farmManageCall(method, args = []) {
-  const res = await fetch('/api/webui/providers/' + encodeURIComponent('world:farm') + '/panels/manage/' + method, {
+  const res = await fetch('/api/webui/providers/' + encodeURIComponent('world:farm') + '/panels/customize/' + method, {
     method: 'POST',
     headers: { 'content-type': 'application/json' },
     body: JSON.stringify({ args }),
@@ -219,7 +219,7 @@ function injectFarmConfigActions() {
 
     field.append(backup, reset, status);
     row.append(label, field);
-    view.append(section, desc, row);
+    view.prepend(section, desc, row);
   } catch { /* 不是宿主的配置页就算了 */ }
 }
 
@@ -2912,64 +2912,8 @@ function ecologyPanel(ctx) {
   reload();
 }
 
-function managePanel(ctx) {
-  const { ui } = ctx;
-  const root = ui.h('div', 'cf-root');
-  ctx.root.appendChild(root);
-  const sheet = ui.sheet({
-    title: '存档与重置',
-    desc: '备份会复制 state.json 和 custom.json 到 data/farm/backups；重置会先备份，再清空存档和全部自定义设置，World 随后重启。',
-  });
-  const bar = ui.rowbar();
-  const status = ui.h('p', 'cf-note', '');
-  const check = ui.button('环境自检', {
-    onClick: async () => {
-      check.disabled = true;
-      status.textContent = '正在检查…';
-      try {
-        const r = await ctx.invoke('check');
-        status.textContent = r.message || r.text || '';
-      } catch (err) {
-        status.textContent = '自检失败：' + ((err && err.message) || err);
-      } finally { check.disabled = false; }
-    },
-  });
-  const backup = ui.button('备份存档', {
-    variant: 'primary',
-    onClick: async () => {
-      backup.disabled = true;
-      status.textContent = '正在备份…';
-      try {
-        const r = await ctx.invoke('backup');
-        status.textContent = r.text || '已备份';
-      } catch (err) {
-        status.textContent = '备份失败：' + ((err && err.message) || err);
-      } finally { backup.disabled = false; }
-    },
-  });
-  const reset = ui.button('重置一切', {
-    onClick: async () => {
-      if (!window.confirm('确定重置一切？会清空存档和全部自定义设置（会先自动备份）。')) return;
-      reset.disabled = true;
-      status.textContent = '正在重置…';
-      try {
-        const r = await ctx.invoke('reset');
-        status.textContent = r.text || '已重置，World 正在重启…';
-        setTimeout(() => { try { location.reload(); } catch { /* ignore */ } }, 3000);
-      } catch (err) {
-        status.textContent = '重置失败：' + ((err && err.message) || err);
-        reset.disabled = false;
-      }
-    },
-  });
-  bar.append(check, backup, reset);
-  sheet.body.append(bar, status);
-  root.appendChild(sheet.el);
-}
-
 export default {
   panels: {
-    manage: { mount: managePanel },
     bag: { mount: bagPanel },
     shop: { mount: shopPanel },
     customize: { mount: panel },
@@ -2978,3 +2922,4 @@ export default {
     items: { mount: itemsPanel },
   },
 };
+

package/overlay/overlay-webview.ps1

@@ -9,7 +9,8 @@ param(
     [string]$LogPath = '',
     [int]$StripHeight = 320,
     [int]$LeaseSeconds = 20,
-    [ValidateSet('bg', 'top')][string]$Layer = 'bg'
+    [ValidateSet('bg', 'top')][string]$Layer = 'bg',
+    [ValidateSet('off', 'auto', 'on')][string]$Throttle = 'off'
 )
 
 $ErrorActionPreference = 'Stop'
@@ -64,6 +65,8 @@ public static class FarmWebViewWin32 {
     [DllImport("user32.dll")] public static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
     [DllImport("user32.dll")] public static extern bool EnumChildWindows(IntPtr hWnd, EnumProc cb, IntPtr lParam);
     [DllImport("user32.dll")] public static extern bool SetWindowPos(IntPtr hWnd, IntPtr after, int x, int y, int cx, int cy, uint flags);
+    [DllImport("user32.dll")] public static extern IntPtr GetWindow(IntPtr hWnd, uint cmd);
+    public const uint GW_HWNDPREV = 3;
     [DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr hWnd, out RECT rect);
     [DllImport("user32.dll")] public static extern bool EnumWindows(EnumProc cb, IntPtr lParam);
     [DllImport("user32.dll", CharSet=CharSet.Unicode)] public static extern int GetWindowTextW(IntPtr hWnd, System.Text.StringBuilder s, int n);
@@ -111,6 +114,7 @@ public static class FarmWebViewWin32 {
 '@
 
 $script:owner = [IntPtr]::Zero
+$script:bgPet = [IntPtr]::Zero
 function Update-PetZOrder {
     try {
         $h = (New-Object System.Windows.Interop.WindowInteropHelper($win)).Handle
@@ -123,8 +127,11 @@ function Update-PetZOrder {
                 $script:owner = $pet
             }
         } else {
-            [void][FarmWebViewWin32]::SetWindowPos($h, $pet, 0, 0, 0, 0,
-                ([FarmWebViewWin32]::SWP_NOMOVE -bor [FarmWebViewWin32]::SWP_NOSIZE -bor [FarmWebViewWin32]::SWP_NOACTIVATE))
+            if ($script:bgPet -ne $pet -or [FarmWebViewWin32]::GetWindow($h, [FarmWebViewWin32]::GW_HWNDPREV) -ne $pet) {
+                [void][FarmWebViewWin32]::SetWindowPos($h, $pet, 0, 0, 0, 0,
+                    ([FarmWebViewWin32]::SWP_NOMOVE -bor [FarmWebViewWin32]::SWP_NOSIZE -bor [FarmWebViewWin32]::SWP_NOACTIVATE))
+                $script:bgPet = $pet
+            }
         }
     } catch { }
 }
@@ -152,6 +159,9 @@ $props = New-Object Microsoft.Web.WebView2.Wpf.CoreWebView2CreationProperties
 $ud = Join-Path (Split-Path -Parent $StatePath) ('webview2-' + $Layer)
 New-Item -ItemType Directory -Path $ud -Force | Out-Null
 $props.UserDataFolder = $ud
+if ($Throttle -eq 'off') {
+    $props.AdditionalBrowserArguments = '--disable-backgrounding-occluded-windows --disable-renderer-backgrounding --disable-features=CalculateNativeWinOcclusion'
+}
 $wv.CreationProperties = $props
 $win.Content = $wv
 

package/overlay-electron/main.js

@@ -14,6 +14,8 @@ const screensPath = path.join(path.dirname(statePath), 'screens.json');
 const assetsDir = path.resolve(arg('assets-dir', path.join(__dirname, '..', 'assets', 'sprites')));
 const logPath = arg('log', '');
 const pidPath = arg('pid', '');
+const rawThrottle = String(arg('throttle', 'off'));
+const THROTTLE = ['off', 'auto', 'on'].includes(rawThrottle) ? rawThrottle : 'off';
 const logStream = logPath ? fs.createWriteStream(logPath, { flags: 'a' }) : null;
 function log(s) {
   const line = new Date().toISOString() + ' [electron] ' + s + '\n';
@@ -127,11 +129,12 @@ function createWindow(layer) {
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false,
-      backgroundThrottling: false,
+      backgroundThrottling: THROTTLE !== 'off',
     },
   });
   win.setAlwaysOnTop(true, 'screen-saver');
   win.setIgnoreMouseEvents(true, { forward: true });
+  if (THROTTLE === 'off') win.webContents.setBackgroundThrottling(false);
   try { win.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true }); } catch { }
   win.loadFile(path.join(__dirname, 'renderer.html'), { query: { state: statePath, assets: assetsDir, layer } });
   win.once('ready-to-show', () => {
@@ -162,6 +165,11 @@ function fit() {
 }
 
 app.commandLine.appendSwitch('enable-transparent-visuals');
+if (THROTTLE === 'off') {
+  app.commandLine.appendSwitch('disable-backgrounding-occluded-windows');
+  app.commandLine.appendSwitch('disable-renderer-backgrounding');
+  app.commandLine.appendSwitch('disable-features', 'CalculateNativeWinOcclusion');
+}
 
 if (!app.requestSingleInstanceLock()) {
   app.quit();

package/overlay-electron/zorder.ps1

@@ -11,6 +11,7 @@ $ErrorActionPreference = 'SilentlyContinue'
 $bgPtr = [IntPtr]([Int64]$Bg)
 $topPtr = [IntPtr]([Int64]$Top)
 $script:owner = [IntPtr]::Zero
+$script:bgPet = [IntPtr]::Zero
 
 Add-Type -TypeDefinition @'
 using System;
@@ -25,6 +26,8 @@ public static class FarmZ {
     [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint pid);
     [DllImport("user32.dll", EntryPoint="SetWindowLongPtrW", SetLastError=true)] public static extern IntPtr SetWindowLongPtr(IntPtr h, int n, IntPtr v);
     [DllImport("user32.dll")] public static extern bool SetWindowPos(IntPtr h, IntPtr after, int x, int y, int cx, int cy, uint flags);
+    [DllImport("user32.dll")] public static extern IntPtr GetWindow(IntPtr h, uint cmd);
+    public const uint GW_HWNDPREV = 3;
     public const int GWLP_HWNDPARENT = -8;
     public const uint SWP_NOSIZE = 0x1;
     public const uint SWP_NOMOVE = 0x2;
@@ -54,11 +57,14 @@ while ([FarmZ]::IsWindow($bgPtr) -and [FarmZ]::IsWindow($topPtr)) {
             [void][FarmZ]::SetWindowLongPtr($topPtr, [FarmZ]::GWLP_HWNDPARENT, $pet)
             $script:owner = $pet
         }
-        [void][FarmZ]::SetWindowPos($bgPtr, $pet, 0, 0, 0, 0,
-            ([FarmZ]::SWP_NOMOVE -bor [FarmZ]::SWP_NOSIZE -bor [FarmZ]::SWP_NOACTIVATE))
+        if ($script:bgPet -ne $pet -or [FarmZ]::GetWindow($bgPtr, [FarmZ]::GW_HWNDPREV) -ne $pet) {
+            [void][FarmZ]::SetWindowPos($bgPtr, $pet, 0, 0, 0, 0,
+                ([FarmZ]::SWP_NOMOVE -bor [FarmZ]::SWP_NOSIZE -bor [FarmZ]::SWP_NOACTIVATE))
+            $script:bgPet = $pet
+        }
     }
-    Start-Sleep -Milliseconds 500
+    Start-Sleep -Milliseconds 1000
 }
-
-
-
+
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lily-cooperative/custom-farm",
-  "version": "0.38.0",
+  "version": "0.38.1",
   "type": "module",
   "private": false,
   "publishConfig": {

package/src/farm.js

@@ -55,6 +55,8 @@ export const DEFAULTS = {
   overlayEngine: 'auto',
   /** 备用 electron.exe / electron 可执行文件路径；空 = 自动找。 */
   electronPath: '',
+  /** 图层节流：off = 不节流（默认）；auto = 交给 Chromium；on = 允许后台/遮挡节流。 */
+  throttle: 'off',
   /** 最多同时种几棵（屏幕上不重叠地放得下的上限） */
   maxPlants: 12,
   /** 屏幕逻辑宽度，用来把"像素宽"换算成 x 间距 */

package/src/index.js

@@ -76,6 +76,14 @@ export const farmDefinition = {
         { value: 'wpf', label: zh ? 'WPF/WebView2（不需要 Electron）' : 'WPF/WebView2 (no Electron)' },
       ];
     }
+    if (kind === 'farm-throttle') {
+      const zh = String(language).toLowerCase().startsWith('zh');
+      return [
+        { value: 'off', label: zh ? '不节流（默认，推荐）' : 'Off (default, recommended)' },
+        { value: 'auto', label: zh ? '自动（交给 Chromium）' : 'Auto (Chromium decides)' },
+        { value: 'on', label: zh ? '节流（后台/遮挡时降帧）' : 'On (throttle when backgrounded/occluded)' },
+      ];
+    }
     return [];
   },
   describe: {

package/src/world.js

@@ -334,6 +334,24 @@ function farmConfigGroups(language = 'zh', defaultHomePath = '') {
         },
       },
     },
+    {
+      id: 'world:farm/performance',
+      owner: 'world:farm',
+      schema: {
+        type: 'object',
+        title: t('性能', 'Performance'),
+        description: t('桌面图层的后台/遮挡节流。默认不节流，收获和动画更跟手；如果 CPU/GPU 占用高，可改成自动或节流。', 'Background/occlusion throttling for the desktop layers. Off by default for responsive harvest animations; switch to Auto or Throttle if CPU/GPU usage is high.'),
+        properties: {
+          'worlds.farm.throttle': {
+            type: 'string',
+            title: t('节流', 'Throttling'),
+            description: t('不节流：禁用后台/遮挡节流（推荐）。自动：交给 Chromium。节流：允许后台和遮挡时降帧。', 'Off disables background/occlusion throttling (recommended). Auto lets Chromium decide. On allows lower frame rates when backgrounded or occluded.'),
+            'x-options': 'farm-throttle',
+            'x-hot': true,
+          },
+        },
+      },
+    },
   ];
 }
 
@@ -410,6 +428,7 @@ export class FarmWorld {
       screen: String(this.cfg?.screen ?? ''),
       overlayEngine: ['auto', 'electron', 'wpf'].includes(String(this.cfg?.overlayEngine ?? 'auto')) ? String(this.cfg?.overlayEngine ?? 'auto') : 'auto',
       electronPath: String(this.cfg?.electronPath ?? ''),
+      throttle: ['off', 'auto', 'on'].includes(String(this.cfg?.throttle ?? 'off')) ? String(this.cfg?.throttle ?? 'off') : 'off',
       maxPlants: this.#num('maxPlants', 1, 24),
       screenWidth,
       zoom: this.#num('zoom', 1, 8),
@@ -1591,11 +1610,6 @@ export class FarmWorld {
         { label: '天数', value: started ? '第 ' + s.day + ' 天' : '—', tone: 'plain' },
       ],
       panels: [{
-        id: 'manage',
-        title: '存档与重置',
-        description: '备份存档，或把存档和全部自定义设置重置为默认。',
-        getMethods: ['state'],
-      }, {
         id: 'bag',
         title: '背包',
         description: '背包、农场预览、摆放道具与手动合成；装饰在这里输入坐标放置。',
@@ -1642,33 +1656,7 @@ export class FarmWorld {
   async invoke(panel, method, args = []) {
     return this.#serial(async () => {
       const cfg = this.#cfgAll();
-      if (panel === 'manage') {
-        if (method === 'backup') return this.#backupNow();
-        if (method === 'reset') return this.#resetAll();
-        if (method === 'check') return this.#envCheck();
-        if (method === 'setElectronPath') {
-          const file = String(args?.[0] ?? '').trim();
-          if (file && !existsSync(file)) throw new Error('找不到这个 Electron 文件：' + file);
-          this.persistConfig?.({ electronPath: file });
-          try { this.cfg.electronPath = file; } catch { /* cfg 可能是只读代理 */ }
-          await this.#stopLayers('Electron 路径变更');
-          this.#ensureLayers('Electron 路径变更');
-          this.#layerEngineKey = this.#engine() + '|' + file;
-          return this.#envCheck();
-        }
-        if (method === 'setEngine') {
-          const mode = String(args?.[0] ?? 'auto');
-          if (!['auto', 'electron', 'wpf'].includes(mode)) throw new Error('不认识的图层引擎：' + mode);
-          this.persistConfig?.({ overlayEngine: mode });
-          try { this.cfg.overlayEngine = mode; } catch { /* cfg 可能是只读代理 */ }
-          await this.#stopLayers('图层引擎变更');
-          this.#ensureLayers('图层引擎变更');
-          this.#layerEngineKey = this.#engine() + '|' + String(this.cfg?.electronPath ?? '');
-          return this.#envCheck();
-        }
-        if (method === 'state') return { ok: true };
-        throw new Error('不认识的存档操作：' + method);
-      }
+      if (panel === 'manage') return this.#manageAction(method, args);
       if (panel === 'status') return this.#statusInvoke(method, args, cfg);
       if (panel === 'bag') return this.#bagInvoke(method, args);
       if (panel === 'shop') return this.#shopInvoke(method, args);
@@ -1729,8 +1717,39 @@ export class FarmWorld {
     };
   }
 
+  async #manageAction(method, args = []) {
+    if (method === 'backup') return this.#backupNow();
+    if (method === 'reset') return this.#resetAll();
+    if (method === 'check') return this.#envCheck();
+    if (method === 'setElectronPath') {
+      const file = String(args?.[0] ?? '').trim();
+      if (file && !existsSync(file)) throw new Error('找不到这个 Electron 文件：' + file);
+      this.persistConfig?.({ electronPath: file });
+      try { this.cfg.electronPath = file; } catch { /* cfg 可能是只读代理 */ }
+      await this.#stopLayers('Electron 路径变更');
+      this.#ensureLayers('Electron 路径变更');
+      this.#layerEngineKey = this.#engine() + '|' + file + '|' + String(this.cfg?.throttle ?? 'off');
+      return this.#envCheck();
+    }
+    if (method === 'setEngine') {
+      const mode = String(args?.[0] ?? 'auto');
+      if (!['auto', 'electron', 'wpf'].includes(mode)) throw new Error('不认识的图层引擎：' + mode);
+      this.persistConfig?.({ overlayEngine: mode });
+      try { this.cfg.overlayEngine = mode; } catch { /* cfg 可能是只读代理 */ }
+      await this.#stopLayers('图层引擎变更');
+      this.#ensureLayers('图层引擎变更');
+      this.#layerEngineKey = this.#engine() + '|' + String(this.cfg?.electronPath ?? '') + '|' + String(this.cfg?.throttle ?? 'off');
+      return this.#envCheck();
+    }
+    if (method === 'state') return { ok: true };
+    throw new Error('不认识的存档操作：' + method);
+  }
+
   /** 「农场自定义」页的数据面。统一返回最新 snapshot，面板不用再读一次。 */
   async #customInvoke(method, args, cfg) {
+    if (['backup', 'reset', 'check', 'setEngine', 'setElectronPath'].includes(method)) {
+      return this.#manageAction(method, args);
+    }
     if (method === 'sprite') {
       const name = String(args?.[0] ?? '');
       return { $binary: this.#catalogOrThrow().spriteBase64(name) };
@@ -2413,7 +2432,7 @@ export class FarmWorld {
   }
 
   async #syncLayerEngine() {
-    const key = this.#engine() + '|' + String(this.cfg?.electronPath ?? '');
+    const key = this.#engine() + '|' + String(this.cfg?.electronPath ?? '') + '|' + String(this.cfg?.throttle ?? 'off');
     if (!this.#layerEngineKey) { this.#layerEngineKey = key; return; }
     if (key === this.#layerEngineKey) return;
     this.#layerEngineKey = key;
@@ -2529,7 +2548,7 @@ export class FarmWorld {
     try {
       const launcher = join(paths.electronDir, 'launch.js');
       const pidFile = join(this.dataDir, 'farm', 'electron.pid');
-      const child = spawn(process.execPath, [launcher, '--electron', exe, '--state-path', paths.overlayState, '--assets-dir', paths.assetsDir, '--pid', pidFile, '--log', join(dirname(this.overlayFile()), 'electron.log')], { detached: true, stdio: 'ignore', windowsHide: true, env: { ...process.env, ELECTRON_RUN_AS_NODE: '1' } });
+      const child = spawn(process.execPath, [launcher, '--electron', exe, '--throttle', String(this.cfg?.throttle ?? 'off'), '--state-path', paths.overlayState, '--assets-dir', paths.assetsDir, '--pid', pidFile, '--log', join(dirname(this.overlayFile()), 'electron.log')], { detached: true, stdio: 'ignore', windowsHide: true, env: { ...process.env, ELECTRON_RUN_AS_NODE: '1' } });
       child.unref();
       this.#layerChild = child;
       this.#layerAt = Date.now();
@@ -2568,7 +2587,7 @@ export class FarmWorld {
         const child = spawn('powershell.exe',
           ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', script,
             '-StatePath', paths.overlayState, '-HomeDir', paths.home, '-AssetsDir', paths.assetsDir,
-            '-PidPath', pidFile, '-LogPath', logFile, '-Layer', layer],
+            '-PidPath', pidFile, '-LogPath', logFile, '-Layer', layer, '-Throttle', String(this.cfg?.throttle ?? 'off')],
           { stdio: 'ignore', windowsHide: true });
         child.unref();
         try { writeFileSync(pidFile, String(child.pid)); } catch { }
@@ -2807,8 +2826,11 @@ export class FarmWorld {
       this.#started = true;
       this.#schedule();
       this.#cmdTimer = setInterval(() => { void this.#drainCommands(); }, 1000);
+      if (this.persistConfig && this.cfg?.throttle === undefined) {
+        try { this.persistConfig({ throttle: 'off' }); this.cfg.throttle = 'off'; } catch { /* 默认仍是 off */ }
+      }
       this.#hidden = this.#flag('hideFarm');
-      this.#layerEngineKey = this.#engine() + '|' + String(this.cfg?.electronPath ?? '');
+      this.#layerEngineKey = this.#engine() + '|' + String(this.cfg?.electronPath ?? '') + '|' + String(this.cfg?.throttle ?? 'off');
       if (!this.#hidden) { try { this.#ensureLayers(); } catch { /* 忽略 */ } }
       this.#envCheckPending = Boolean(this.#host?.pushEvent);
       // 不做周期巡检：巡检会触发"杀掉再起"，和正在启动的进程互相打断（这就是之前反复缺层的原因）