poi-plugin-kancolle-chs 1.3.8 → 1.4.2

package/index.es

@@ -3,6 +3,7 @@ import { configManager } from './src/config'
 import { dataLoader } from './src/loaders/data-loader'
 import { mainPatcher } from './src/core/main-patcher'
 import { resourceManager } from './src/core/resource-manager'
+import { startupChecker } from './src/core/startup-checker'
 
 // 导出插件在 POI 中展示的界面组件
 export const reactClass = MainPanel
@@ -31,7 +32,9 @@ export const pluginDidLoad = async () => {
         await mainPatcher.buildAndDeploy()
       }
 
-      // 4. 若开启了启动自动检查更新，由 MainPanel 在渲染时自动检测并在有更新时弹窗提醒
+      // 4. 后台静默自检：即便用户未打开插件面板，也自动检查更新并在有更新时置顶弹窗提醒
+      startupChecker.scheduleStartupCheck(2000)
+
       console.log('[砍口垒汉化计划PLUS] 插件加载完毕，原生汉化模式已生效！')
     } else {
       console.log('[砍口垒汉化计划PLUS] 插件当前处于停用状态，确保环境纯净官方原版...')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-kancolle-chs",
-  "version": "1.3.8",
+  "version": "1.4.2",
   "description": "砍口垒汉化计划PLUS POI 原生独立插件：提供全界面文本替换、正则动态替换、KCSAPI 响应合流、中文字体与贴图魔改、自定义字体适配与官方资源更新",
   "main": "index.es",
   "files": [

package/src/config.es

@@ -93,8 +93,9 @@ class ConfigManager {
 
       if (saved && typeof saved === 'object') {
         this.config = { ...DEFAULT_CONFIG, ...saved }
-        if (saved.autoCheckResourceUpdate === undefined && saved.autoCheckUpdate !== undefined) {
-          this.config.autoCheckResourceUpdate = saved.autoCheckUpdate
+        // 自动保障：只要自动检查更新为开启状态，汉化资源自检与弹窗提醒同步开启
+        if (this.config.autoCheckUpdate !== false) {
+          this.config.autoCheckResourceUpdate = true
         }
       } else {
         // 若首次启动且无配置，尝试全平台推荐路径初始化

package/src/constants.es

@@ -15,7 +15,7 @@ export const OFFICIAL_REPO_GIT = 'https://github.com/asaico/Kancolle_to_CHS.git'
 export const OFFICIAL_REPO_RELEASES = 'https://github.com/asaico/Kancolle_to_CHS/releases'
 
 // 插件版本与 npm 元信息
-let pkgVersion = '1.3.8'
+let pkgVersion = '1.4.2'
 try {
   const pkg = require('../package.json')
   if (pkg && pkg.version) pkgVersion = pkg.version

package/src/core/startup-checker.es

@@ -0,0 +1,136 @@
+import { configManager } from '../config'
+import { resourceUpdater } from './resource-updater'
+import { checkPluginUpdate } from './plugin-updater'
+import { PLUGIN_VERSION } from '../constants'
+
+/**
+ * POI 启动自检管理器 (单例)
+ * 在后台静默检查插件本体版本 (npm) 与本地汉化资源增量 (GitHub)。
+ * 检查结果同步派发给插件面板 (MainPanel)，由插件内原生的暗黑风格 Blueprint Alert 统一弹窗展示，
+ * 彻底移除侵入式的 Windows 原生白色系统对话框。
+ */
+class StartupChecker {
+  constructor() {
+    this.hasChecked = false
+    this.isChecking = false
+    this.lastResult = null
+    this.listeners = new Set()
+  }
+
+  subscribe(listener) {
+    this.listeners.add(listener)
+    return () => this.listeners.delete(listener)
+  }
+
+  notify() {
+    for (const fn of this.listeners) {
+      try {
+        fn(this.lastResult)
+      } catch (_) {}
+    }
+  }
+
+  /**
+   * 启动时异步后台静默检查 (延迟 2 秒执行，避开 POI 启动窗口与网络初始化高峰)
+   */
+  scheduleStartupCheck(delayMs = 2000) {
+    if (this.hasChecked) return
+    setTimeout(() => {
+      this.checkOnStartup().catch((e) => {
+        console.warn('[KanCHS] 启动后台自检异常:', e)
+      })
+    }, delayMs)
+  }
+
+  /**
+   * 执行启动自检逻辑
+   */
+  async checkOnStartup() {
+    if (this.hasChecked || this.isChecking) return
+    this.isChecking = true
+    this.hasChecked = true
+
+    // 检查配置开关
+    const autoCheck = configManager.get('autoCheckUpdate', true) !== false &&
+      configManager.get('autoCheckResourceUpdate', true) !== false
+
+    if (!autoCheck) {
+      console.log('[KanCHS] 启动自检已在配置中关闭，跳过检查。')
+      this.isChecking = false
+      return
+    }
+
+    const sourceDir = configManager.resolveSourcePath()
+    const mirrorId = configManager.get('downloadMirror', 'ghproxy')
+
+    console.log('[KanCHS] 正在后台静默检查插件与汉化资源远端更新...')
+
+    try {
+      // 并发检查插件本体版本 (npm) 与本地汉化资源增量 (GitHub)
+      const [pluginRes, resourceRes] = await Promise.all([
+        checkPluginUpdate(PLUGIN_VERSION).catch((err) => {
+          console.warn('[KanCHS] 检查插件本体更新异常:', err.message)
+          return { hasUpdate: false, latestVersion: PLUGIN_VERSION }
+        }),
+        sourceDir
+          ? resourceUpdater.checkIncrementalUpdates({ sourceDir, mirrorId }).catch((err) => {
+              console.warn('[KanCHS] 检查汉化资源增量异常:', err.message)
+              return null
+            })
+          : null,
+      ])
+
+      const hasPlugin = Boolean(pluginRes && pluginRes.hasUpdate)
+      const hasResource = Boolean(
+        resourceRes &&
+        resourceRes.hasUpdate &&
+        Array.isArray(resourceRes.changedFiles) &&
+        resourceRes.changedFiles.length > 0
+      )
+
+      this.lastResult = {
+        pluginRes: pluginRes || { hasUpdate: false, latestVersion: PLUGIN_VERSION },
+        resourceRes,
+        hasPlugin,
+        hasResource,
+      }
+
+      this.notify()
+
+      if (hasPlugin || hasResource) {
+        console.log(`[KanCHS] 发现更新！插件更新: ${hasPlugin}, 资源变动: ${hasResource ? resourceRes.changedFiles.length + '项' : '无'}`)
+        this.notifyUpdateToast({
+          pluginRes: this.lastResult.pluginRes,
+          resourceRes,
+          hasPlugin,
+          hasResource,
+        })
+      } else {
+        console.log('[KanCHS] 启动自检完成：插件与汉化资源均为最新版本，保持完全静默。')
+      }
+    } catch (err) {
+      console.warn('[KanCHS] 启动检查失败:', err)
+    } finally {
+      this.isChecking = false
+    }
+  }
+
+  /**
+   * 发送 POI 系统 Toast 提示（非侵入式，完全不使用原生白色对话框）
+   */
+  notifyUpdateToast({ pluginRes, resourceRes, hasPlugin, hasResource }) {
+    try {
+      if (typeof window !== 'undefined' && typeof window.toast === 'function') {
+        if (hasResource && hasPlugin) {
+          window.toast(`[砍口垒汉化] 发现插件 v${pluginRes.latestVersion} 及 ${resourceRes.changedFiles.length} 项资源更新，已在面板就绪！`, { type: 'warning' })
+        } else if (hasResource) {
+          window.toast(`[砍口垒汉化] 发现 ${resourceRes.changedFiles.length} 项汉化资源可更新，已在面板就绪！`, { type: 'warning' })
+        } else if (hasPlugin) {
+          window.toast(`[砍口垒汉化] 发现插件新版本 v${pluginRes.latestVersion}，已在面板就绪！`, { type: 'warning' })
+        }
+      }
+    } catch (_) {}
+  }
+}
+
+export const startupChecker = new StartupChecker()

package/src/views/MainPanel.es

@@ -39,6 +39,7 @@ import {
   NPM_PACKAGE_URL,
 } from '../constants'
 import { checkPluginUpdate } from '../core/plugin-updater'
+import { startupChecker } from '../core/startup-checker'
 
 export class MainPanel extends Component {
   rootRef = React.createRef()
@@ -92,6 +93,8 @@ export class MainPanel extends Component {
       showUnconfiguredAlert: false, // 启用汉化时资源包未配置提示弹窗
       showRestartConfirm: false, // 重启 POI 客户端二次确认弹窗
       showResourceUpdateAlert: false, // 启动或检查检测到本地汉化资源有更新提醒弹窗
+      showPluginUpdateAlert: false, // 启动或检查检测到插件本体有新版本更新提醒弹窗
+      showPostUpdateRestartAlert: false, // 资源更新完成后提示是否自动清缓存并重启弹窗
       logs: [],
     }
   }
@@ -121,33 +124,78 @@ export class MainPanel extends Component {
       }).catch(() => {})
     }
 
-    // 启动时自动检查本地汉化资源更新 (支持弹窗提醒)
-    const shouldCheckResource = this.state.config.autoCheckResourceUpdate !== undefined
-      ? this.state.config.autoCheckResourceUpdate
-      : this.state.config.autoCheckUpdate
-
-    if (shouldCheckResource && !this.hasAutoCheckedUpdates) {
-      this.hasAutoCheckedUpdates = true
-      this.handleCheckIncrementalUpdates({ isAutoStartup: true }).catch(() => {})
-    }
+    // 监听与同步全局启动自检结果 (由 index.es 或 MainPanel 触发)
+    this.unsubStartupChecker = startupChecker.subscribe((res) => {
+      if (res) {
+        this.setState({
+          pluginUpdate: res.pluginRes || this.state.pluginUpdate,
+          resourceUpdaterStatus: {
+            ...this.state.resourceUpdaterStatus,
+            hasIncrementalUpdate: res.hasResource,
+            changedFiles: res.resourceRes?.changedFiles || [],
+          },
+          showResourceUpdateAlert: res.hasResource,
+          showPluginUpdateAlert: res.hasPlugin,
+        })
+      }
+    })
 
-    // 自动在后台静默检查插件本体版本更新
-    if (this.state.config.autoCheckUpdate) {
-      this.handleCheckPluginUpdate(true).catch(() => {})
+    if (startupChecker.lastResult) {
+      const res = startupChecker.lastResult
+      this.setState({
+        pluginUpdate: res.pluginRes || this.state.pluginUpdate,
+        resourceUpdaterStatus: {
+          ...this.state.resourceUpdaterStatus,
+          hasIncrementalUpdate: res.hasResource,
+          changedFiles: res.resourceRes?.changedFiles || [],
+        },
+        showResourceUpdateAlert: res.hasResource,
+        showPluginUpdateAlert: res.hasPlugin,
+      })
+    } else {
+      const shouldAutoCheck = this.state.config.autoCheckUpdate !== false
+      if (shouldAutoCheck && !startupChecker.hasChecked) {
+        startupChecker.scheduleStartupCheck(500)
+      }
     }
 
     // 针对旧版 POI 或特定主题外层容器修正高度与滚动上下文
     this.fixParentScrollStyles()
+    setTimeout(this.fixParentScrollStyles, 50)
+    setTimeout(this.fixParentScrollStyles, 250)
+
+    const rootEl = this.rootRef.current
+    if (rootEl) {
+      rootEl.addEventListener('wheel', this.handleWheel, { passive: false })
+
+      const doc = rootEl.ownerDocument || document
+      const win = doc.defaultView || (typeof window !== 'undefined' ? window : null)
+      this.currentDoc = doc
+      this.currentWin = win
+
+      if (win) {
+        win.addEventListener('resize', this.handleResize)
+        if (win !== window) {
+          // 独立新窗口模式：在 window 与 document 均挂载滚轮监听，实现全屏无死角即时滚动响应
+          win.addEventListener('wheel', this.handleWheel, { passive: false })
+          doc.addEventListener('wheel', this.handleWheel, { passive: false })
+        }
+      }
 
-    // 绑定原生滚轮双重补偿监听 (保障老旧 Electron 或卡片事件捕获异常环境)
-    if (this.rootRef && this.rootRef.current) {
-      this.rootRef.current.addEventListener('wheel', this.handleWheel, { passive: true })
+      // 确保进入新窗口时容器立即可获得焦点与滚动上下文
+      setTimeout(() => {
+        try {
+          rootEl.focus({ preventScroll: true })
+        } catch (_) {}
+      }, 50)
     }
 
     // 监听窗口与容器自适应宽度变化，实现动态窄窗紧凑排版适配
     this.handleResize = () => {
       if (this.rootRef && this.rootRef.current) {
         this.setState({ containerWidth: this.rootRef.current.offsetWidth })
+      } else if (this.currentWin) {
+        this.setState({ containerWidth: this.currentWin.innerWidth })
       } else if (typeof window !== 'undefined') {
         this.setState({ containerWidth: window.innerWidth })
       }
@@ -205,27 +253,65 @@ export class MainPanel extends Component {
     if (this.pluginUpdateNoticeTimer) clearTimeout(this.pluginUpdateNoticeTimer)
     if (this.unsubConfig) this.unsubConfig()
     if (this.unsubGit) this.unsubGit()
+    if (this.unsubStartupChecker) this.unsubStartupChecker()
     if (typeof window !== 'undefined') {
       window.removeEventListener('resize', this.handleResize)
     }
     if (this.rootRef && this.rootRef.current) {
       this.rootRef.current.removeEventListener('wheel', this.handleWheel)
     }
+    if (this.currentWin) {
+      this.currentWin.removeEventListener('resize', this.handleResize)
+      if (this.currentWin !== window) {
+        this.currentWin.removeEventListener('wheel', this.handleWheel)
+      }
+    }
+    if (this.currentDoc && this.currentDoc !== document) {
+      this.currentDoc.removeEventListener('wheel', this.handleWheel)
+    }
     if (this.ro) {
       this.ro.disconnect()
     }
   }
 
   /**
-   * 自动向上递归修正 POI 外层 Tab 容器的高度与 flex 布局，确保内层滚动条与滚轮绝对可用
+   * 自动向上递归修正 POI 外层 Tab 及独立新窗口容器的高度与 flex 布局，确保内层滚动条与滚轮绝对可用
    */
   fixParentScrollStyles = () => {
     try {
       const root = this.rootRef.current
       if (!root) return
+
+      const doc = root.ownerDocument || document
+      const win = doc.defaultView || window
+      const isDetachedWindow = (doc !== document) || (win !== window) || Boolean(doc.getElementById('plugin-mountpoint'))
+
+      // 1. 若处于独立新窗口模式，修正 html、body 及 #plugin-mountpoint 的高度与溢出策略
+      if (isDetachedWindow) {
+        if (doc.documentElement) {
+          if (doc.documentElement.style.height !== '100%') doc.documentElement.style.height = '100%'
+          if (doc.documentElement.style.overflow !== 'hidden') doc.documentElement.style.overflow = 'hidden'
+        }
+        if (doc.body) {
+          if (doc.body.style.height !== '100%') doc.body.style.height = '100%'
+          if (doc.body.style.margin !== '0px') doc.body.style.margin = '0'
+          if (doc.body.style.padding !== '0px') doc.body.style.padding = '0'
+          if (doc.body.style.overflow !== 'hidden') doc.body.style.overflow = 'hidden'
+        }
+        const mountpoint = doc.getElementById('plugin-mountpoint')
+        if (mountpoint) {
+          if (mountpoint.style.height !== '100vh') mountpoint.style.height = '100vh'
+          if (mountpoint.style.maxHeight !== '100vh') mountpoint.style.maxHeight = '100vh'
+          if (mountpoint.style.display !== 'flex') mountpoint.style.display = 'flex'
+          if (mountpoint.style.flexDirection !== 'column') mountpoint.style.flexDirection = 'column'
+          if (mountpoint.style.overflow !== 'hidden') mountpoint.style.overflow = 'hidden'
+        }
+      }
+
+      // 2. 向上递归修正所有外层容器的高度与 flex 布局
       let parent = root.parentElement
       let depth = 0
-      while (parent && depth < 4) {
+      while (parent && depth < 6) {
         const id = parent.id || ''
         const cls = parent.className || ''
         if (
@@ -235,9 +321,17 @@ export class MainPanel extends Component {
           id.includes('poi-plugin-kancolle-chs') ||
           id === 'plugin-mountpoint'
         ) {
-          if (parent.style.height !== '100%') parent.style.height = '100%'
+          if (id === 'plugin-mountpoint') {
+            if (parent.style.height !== '100vh') parent.style.height = '100vh'
+            if (parent.style.maxHeight !== '100vh') parent.style.maxHeight = '100vh'
+          } else {
+            if (parent.style.height !== '100%') parent.style.height = '100%'
+            if (parent.style.maxHeight !== '100%') parent.style.maxHeight = '100%'
+          }
           if (parent.style.display !== 'flex') parent.style.display = 'flex'
           if (parent.style.flexDirection !== 'column') parent.style.flexDirection = 'column'
+          if (parent.style.flex !== '1 1 0px' && parent.style.flex !== '1') parent.style.flex = '1 1 0'
+          if (parent.style.minHeight !== '0px') parent.style.minHeight = '0'
           if (parent.style.overflow !== 'hidden') parent.style.overflow = 'hidden'
         }
         parent = parent.parentElement
@@ -247,20 +341,50 @@ export class MainPanel extends Component {
   }
 
   /**
-   * 滚轮平滑滚动双重补偿兜底
+   * 滚轮平滑滚动双重补偿与新窗口即时响应机制
    */
   handleWheel = (e) => {
     const container = this.rootRef.current
     if (!container) return
-    if (container.scrollHeight <= container.clientHeight) return
 
-    // 双重保障：若在老版本 POI / Electron 中原生滚轮事件未驱动 scrollTop，进行位移补偿
-    const prevScrollTop = container.scrollTop
-    requestAnimationFrame(() => {
-      if (container && container.scrollTop === prevScrollTop && e.deltaY !== 0) {
-        container.scrollTop += e.deltaY
-      }
-    })
+    // 如果事件目标是拥有独立滚动条的子元素（如 textarea），不予干涉
+    const target = e.target
+    if (target && (target.tagName === 'TEXTAREA' || target.tagName === 'INPUT')) {
+      if (target.scrollHeight > target.clientHeight) return
+    }
+
+    // 获取当前所属窗口（若在新窗口打开，则使用该独立窗口的 window 与 rAF）
+    const win = container.ownerDocument?.defaultView || (typeof window !== 'undefined' ? window : null)
+    const isDetachedWindow = (container.ownerDocument !== document) || (win && win !== window)
+
+    // 计算滚轮位移量
+    let delta = e.deltaY
+    if (e.deltaMode === 1) delta *= 25
+    else if (e.deltaMode === 2) delta *= container.clientHeight
+
+    if (container.scrollHeight <= container.clientHeight) {
+      // 容错重试：若尚未修正外层样式导致高度膨胀，立即修正一次
+      this.fixParentScrollStyles()
+      if (container.scrollHeight <= container.clientHeight) return
+    }
+
+    if (isDetachedWindow) {
+      // 独立新窗口模式：直接驱动 scrollTop 确保 100% 极速平滑滚动响应
+      container.scrollTop += delta
+      if (e.cancelable) e.preventDefault()
+    } else {
+      // 常规主窗口 Tab：双重补偿保障机制
+      const prevScrollTop = container.scrollTop
+      const rAF = (win && typeof win.requestAnimationFrame === 'function')
+        ? win.requestAnimationFrame.bind(win)
+        : requestAnimationFrame
+
+      rAF(() => {
+        if (container && container.scrollTop === prevScrollTop && delta !== 0) {
+          container.scrollTop += delta
+        }
+      })
+    }
   }
 
   /**
@@ -510,6 +634,22 @@ export class MainPanel extends Component {
     }
   }
 
+  /**
+   * 清除游戏缓存并自动重启 POI 客户端 (更新完成后一键执行)
+   */
+  executeClearCacheAndRestartPoi = async () => {
+    this.setState({ showPostUpdateRestartAlert: false })
+    this.addLog('正在全方位清理游戏底层缓存与会话数据...')
+    try {
+      await resourceManager.clearGameCache()
+      this.addLog('游戏缓存清理完成，即将自动重启 POI 客户端...')
+    } catch (e) {
+      console.warn('清理游戏缓存异常:', e)
+      this.addLog(`清理游戏缓存轻微异常: ${e.message}，继续执行重启...`)
+    }
+    this.executeRestartPoi()
+  }
+
   /**
    * 点击切换总开关 (弹出二次确认弹窗，防止用户误触并支持自动清缓存刷新)
    */
@@ -977,6 +1117,81 @@ export class MainPanel extends Component {
     }
   }
 
+  /**
+   * 一键检查插件和汉化资源的更新
+   * @param {boolean} silent 是否静默检查 (后台自动检查不显示全局状态文字，但若有资源更新依旧弹窗)
+   */
+  handleCheckAllUpdates = async (silent = false) => {
+    this.setState({ isCheckingPluginUpdate: true })
+    if (!silent) {
+      this.setState({
+        statusMessage: '正在一键检查插件本体与汉化资源更新...',
+        statusIntent: Intent.PRIMARY,
+      })
+      this.addLog('正在一键检查插件本体（npm）与汉化资源包（GitHub）远端更新...')
+    }
+
+    try {
+      // 并发执行：1. 插件 npm 版本检查 2. 汉化资源增量文件哈希比对
+      const [pluginRes] = await Promise.all([
+        checkPluginUpdate(PLUGIN_VERSION).catch((e) => {
+          this.addLog(`检查插件更新失败: ${e.message}`)
+          return { hasUpdate: false, latestVersion: PLUGIN_VERSION }
+        }),
+        this.handleCheckIncrementalUpdates({
+          isAutoStartup: silent,
+          showAlert: true,
+        }).catch((e) => {
+          this.addLog(`检查汉化资源更新失败: ${e.message}`)
+          return null
+        }),
+      ])
+
+      this.setState({
+        pluginUpdate: pluginRes || { hasUpdate: false, latestVersion: PLUGIN_VERSION },
+        isCheckingPluginUpdate: false,
+        hidePluginUpdateNotice: false,
+      })
+
+      if (pluginRes && pluginRes.hasUpdate) {
+        this.addLog(`🎉 发现插件新版本: v${pluginRes.latestVersion} (当前已安装: v${PLUGIN_VERSION})`)
+        this.setState({ showPluginUpdateAlert: true })
+        if (!silent) {
+          this.setState({
+            statusMessage: `🎉 发现插件新版本 v${pluginRes.latestVersion}！请前往 POI「设置 - 插件」面板更新`,
+            statusIntent: Intent.WARNING,
+          })
+        }
+      } else {
+        this.addLog(`插件本体当前已是最新版本 (v${PLUGIN_VERSION})`)
+      }
+
+      if (!silent) {
+        const hasResUpdate = Boolean(
+          this.state.resourceUpdaterStatus &&
+          this.state.resourceUpdaterStatus.hasIncrementalUpdate &&
+          this.state.resourceUpdaterStatus.changedFiles &&
+          this.state.resourceUpdaterStatus.changedFiles.length > 0
+        )
+        if (!pluginRes?.hasUpdate && !hasResUpdate) {
+          this.setState({
+            statusMessage: `✅ 检查完成：插件本体与汉化资源包均为最新版本！`,
+            statusIntent: Intent.SUCCESS,
+          })
+        }
+      }
+    } catch (err) {
+      this.setState({
+        isCheckingPluginUpdate: false,
+        statusMessage: `检查更新失败: ${err.message}`,
+        statusIntent: Intent.DANGER,
+      })
+      this.addLog(`一键检查更新异常: ${err.message}`)
+    } finally {
+      this.setState({ isCheckingPluginUpdate: false })
+    }
+  }
+
   /**
    * 极度健壮的打开本地文件夹方法 (优先 Electron openPath，兜底 Windows explorer)
    */
@@ -1240,6 +1455,7 @@ export class MainPanel extends Component {
           isUpdating: false,
           updateType: null,
         },
+        showPostUpdateRestartAlert: true,
       })
       await this.refreshAllStatus()
     } catch (e) {
@@ -1280,12 +1496,13 @@ export class MainPanel extends Component {
    */
   handleCheckIncrementalUpdates = async (options = {}) => {
     const isAutoStartup = Boolean(options && options.isAutoStartup)
+    const showAlert = options && options.showAlert !== undefined ? Boolean(options.showAlert) : true
     const sourceDir = configManager.resolveSourcePath()
     if (!sourceDir) {
       if (!isAutoStartup) {
         this.setState({ statusMessage: '尚未配置汉化资源包路径，请先指定或下载资源包', statusIntent: Intent.WARNING })
       }
-      return
+      return null
     }
 
     if (!isAutoStartup) {
@@ -1307,11 +1524,11 @@ export class MainPanel extends Component {
             hasIncrementalUpdate: true,
             changedFiles: res.changedFiles,
           },
-          showResourceUpdateAlert: false,
-          statusMessage: `检测到 ${res.changedFiles.length} 个文件与远端有差异`,
-          statusIntent: Intent.NONE,
+          showResourceUpdateAlert: showAlert,
+          statusMessage: `🎉 检测到 ${res.changedFiles.length} 个汉化资源文件可更新`,
+          statusIntent: Intent.WARNING,
         })
-        this.addLog(`检测到 ${res.changedFiles.length} 个汉化资源文件与远端有差异（已记录，不弹窗打扰）`)
+        this.addLog(`🎉 检测到 ${res.changedFiles.length} 个汉化资源文件与远端有差异${showAlert ? '，已弹出更新提醒窗口' : ''}`)
       } else {
         this.setState({
           resourceUpdaterStatus: {
@@ -1326,6 +1543,7 @@ export class MainPanel extends Component {
           this.addLog('启动自检完成：本地汉化资源已是最新版本，无变动文件')
         }
       }
+      return res
     } catch (e) {
       if (!isAutoStartup) {
         this.setState({
@@ -1334,6 +1552,7 @@ export class MainPanel extends Component {
         })
       }
       this.addLog(`检查汉化资源变动失败: ${e.message}`)
+      return null
     } finally {
       if (!isAutoStartup) {
         this.setState({ isProcessing: false })
@@ -1383,6 +1602,7 @@ export class MainPanel extends Component {
         },
         statusMessage: '轻量化更新成功！所有变动词条已自动合流并重新部署生效',
         statusIntent: Intent.SUCCESS,
+        showPostUpdateRestartAlert: true,
       })
       await this.refreshAllStatus()
     } catch (e) {
@@ -1701,6 +1921,8 @@ export class MainPanel extends Component {
       showTimeoutAlert,
       showRestartConfirm,
       showResourceUpdateAlert,
+      showPluginUpdateAlert,
+      showPostUpdateRestartAlert,
       logs,
     } = this.state
 
@@ -1745,8 +1967,9 @@ export class MainPanel extends Component {
         style={{
           width: '100%',
           height: '100%',
-          minHeight: '100%',
+          minHeight: 0,
           maxHeight: '100%',
+          flex: '1 1 0',
           overflowY: 'auto',
           overflowX: 'hidden',
           WebkitOverflowScrolling: 'touch',
@@ -1848,22 +2071,42 @@ export class MainPanel extends Component {
             }
           }
 
+          /* 新窗口与常规 Tab 模式全层级自适应滚动链保障 */
+          html, body {
+            height: 100% !important;
+            overflow: hidden !important;
+          }
+          #plugin-mountpoint {
+            height: 100vh !important;
+            max-height: 100vh !important;
+            display: flex !important;
+            flex-direction: column !important;
+            overflow: hidden !important;
+            box-sizing: border-box !important;
+          }
+          .poi-app-tabpane,
           #poi-plugin-kancolle-chs,
           #poi-plugin-kancolle-chs.poi-app-tabpane,
           .poi-plugin-content-poi-plugin-kancolle-chs {
             height: 100% !important;
+            max-height: 100% !important;
             display: flex !important;
+            flex: 1 1 0 !important;
+            min-height: 0 !important;
             flex-direction: column !important;
             overflow: hidden !important;
+            box-sizing: border-box !important;
           }
           .kancolle-chs-plus-scroll-container {
             height: 100% !important;
-            min-height: 100% !important;
+            min-height: 0 !important;
             max-height: 100% !important;
+            flex: 1 1 0 !important;
             overflow-y: auto !important;
             overflow-x: hidden !important;
             -webkit-overflow-scrolling: touch !important;
             outline: none !important;
+            box-sizing: border-box !important;
           }
           .kancolle-chs-plus-scroll-container::-webkit-scrollbar {
             width: 8px;
@@ -1918,11 +2161,21 @@ export class MainPanel extends Component {
                 small
                 minimal
                 icon="refresh"
-                title="通过 npm 检查插件最新发布版本"
-                text={isCheckingPluginUpdate ? '检查中...' : (pluginUpdate.hasUpdate ? `发现新版 v${pluginUpdate.latestVersion}!` : '检查更新')}
-                intent={pluginUpdate.hasUpdate ? Intent.WARNING : Intent.NONE}
+                title="一键检查插件本体(npm)与汉化资源包(GitHub)更新"
+                text={
+                  isCheckingPluginUpdate
+                    ? '检查中...'
+                    : (pluginUpdate.hasUpdate && resourceUpdaterStatus.hasIncrementalUpdate)
+                      ? '发现更新! (插件+资源)'
+                      : pluginUpdate.hasUpdate
+                        ? `插件新版 v${pluginUpdate.latestVersion}!`
+                        : resourceUpdaterStatus.hasIncrementalUpdate
+                          ? `资源可更新 (${(resourceUpdaterStatus.changedFiles || []).length})`
+                          : (isCompact ? '检查更新' : '一键检查更新')
+                }
+                intent={(pluginUpdate.hasUpdate || resourceUpdaterStatus.hasIncrementalUpdate) ? Intent.WARNING : Intent.NONE}
                 loading={isCheckingPluginUpdate}
-                onClick={() => this.handleCheckPluginUpdate(false)}
+                onClick={() => this.handleCheckAllUpdates(false)}
               />
               <Button
                 small
@@ -2427,9 +2680,19 @@ export class MainPanel extends Component {
 
               <div style={{ marginTop: '8px' }}>
                 <Switch
-                  label="启动 POI 时自动检查本地汉化资源更新并在面板提示"
-                  checked={config.autoCheckResourceUpdate !== undefined ? config.autoCheckResourceUpdate : config.autoCheckUpdate}
-                  onChange={() => this.handleToggleOption('autoCheckResourceUpdate')}
+                  label="每次启动 POI 时静默自动检查更新并在有更新时弹窗提示"
+                  checked={config.autoCheckResourceUpdate !== false && config.autoCheckUpdate !== false}
+                  onChange={() => {
+                    const current = config.autoCheckResourceUpdate !== false && config.autoCheckUpdate !== false
+                    configManager.update({
+                      autoCheckUpdate: !current,
+                      autoCheckResourceUpdate: !current,
+                    })
+                    this.setState({
+                      statusMessage: `已${!current ? '开启' : '关闭'}每次启动 POI 自动检查更新提醒`,
+                      statusIntent: Intent.SUCCESS,
+                    })
+                  }}
                 />
               </div>
             </div>
@@ -3422,6 +3685,139 @@ export class MainPanel extends Component {
             </div>
           </div>
         </Alert>
+
+        {/* 启动与一键检查发现更新时的统一提醒弹窗 (资源更新 / 插件更新 / 两者皆有) */}
+        <Alert
+          isOpen={showResourceUpdateAlert || showPluginUpdateAlert}
+          cancelButtonText="稍后再说"
+          confirmButtonText={
+            resourceUpdaterStatus.hasIncrementalUpdate
+              ? (isCompact ? '立即更新资源' : `⚡ 立即轻量更新资源 (${(resourceUpdaterStatus.changedFiles || []).length}项)`)
+              : '查看插件发布页'
+          }
+          intent={Intent.PRIMARY}
+          icon={pluginUpdate.hasUpdate && resourceUpdaterStatus.hasIncrementalUpdate ? 'notifications' : (resourceUpdaterStatus.hasIncrementalUpdate ? 'cloud-download' : 'updated')}
+          onCancel={() => this.setState({ showResourceUpdateAlert: false, showPluginUpdateAlert: false })}
+          onConfirm={() => {
+            const hasRes = resourceUpdaterStatus.hasIncrementalUpdate
+            this.setState({ showResourceUpdateAlert: false, showPluginUpdateAlert: false })
+            if (hasRes) {
+              this.handleApplyIncrementalUpdates()
+            } else {
+              this.handleOpenExternal(pluginUpdate.npmUrl || NPM_PACKAGE_URL)
+            }
+          }}
+          canOutsideClickCancel={true}
+          canEscapeKeyCancel={true}
+          className={isDarkTheme ? 'bp3-dark bp4-dark kancolle-chs-dark-theme' : ''}
+          style={{ maxWidth: '540px' }}
+        >
+          <div style={{ lineHeight: '1.6' }}>
+            <h5 style={{ margin: '0 0 10px 0', fontSize: '15px', fontWeight: 'bold' }}>
+              {pluginUpdate.hasUpdate && resourceUpdaterStatus.hasIncrementalUpdate
+                ? '🎉 发现插件与汉化资源均有新更新！'
+                : pluginUpdate.hasUpdate
+                  ? '🎉 发现砍口垒汉化计划PLUS插件新版本！'
+                  : '📦 发现本地汉化资源有新更新！'}
+            </h5>
+
+            {/* 插件本体更新板块 */}
+            {pluginUpdate.hasUpdate && (
+              <div
+                style={{
+                  padding: '10px 12px',
+                  background: 'rgba(16, 107, 163, 0.08)',
+                  borderRadius: '6px',
+                  borderLeft: '4px solid #106ba3',
+                  marginBottom: resourceUpdaterStatus.hasIncrementalUpdate ? '12px' : '8px',
+                }}
+              >
+                <div style={{ fontWeight: 'bold', fontSize: '13px', color: '#106ba3' }}>
+                  🚀 插件本体新版本: v{pluginUpdate.latestVersion}（当前已安装: v{PLUGIN_VERSION}）
+                </div>
+                <div style={{ fontSize: '12px', color: '#444', marginTop: '4px' }}>
+                  更新方法：点击 POI 顶部菜单【设置】➔【插件】➔ 找到【砍口垒汉化计划PLUS】点击【更新】即可。
+                </div>
+              </div>
+            )}
+
+            {/* 汉化资源更新板块 */}
+            {resourceUpdaterStatus.hasIncrementalUpdate && (
+              <div>
+                <p style={{ margin: '0 0 8px 0', fontSize: '13px' }}>
+                  经比对官方汉化仓库，检测到本地有 <strong>{(resourceUpdaterStatus.changedFiles || []).length}</strong> 个汉化文件可更新：
+                </p>
+                {(resourceUpdaterStatus.changedFiles || []).length > 0 && (
+                  <div
+                    style={{
+                      maxHeight: '130px',
+                      overflowY: 'auto',
+                      background: 'rgba(0,0,0,0.03)',
+                      padding: '8px 10px',
+                      borderRadius: '6px',
+                      border: '1px solid rgba(0,0,0,0.08)',
+                      marginBottom: '10px',
+                      fontSize: '12px',
+                      fontFamily: 'monospace',
+                    }}
+                  >
+                    <div style={{ fontWeight: 'bold', marginBottom: '4px', color: '#0d8050' }}>变动文件列表：</div>
+                    {(resourceUpdaterStatus.changedFiles || []).slice(0, 8).map((f, idx) => (
+                      <div key={idx} style={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+                        • {typeof f === 'string' ? f : (f.path || f.file || JSON.stringify(f))}
+                      </div>
+                    ))}
+                    {(resourceUpdaterStatus.changedFiles || []).length > 8 && (
+                      <div style={{ color: '#888', fontStyle: 'italic', marginTop: '2px' }}>
+                        ... 等共 {(resourceUpdaterStatus.changedFiles || []).length} 个文件
+                      </div>
+                    )}
+                  </div>
+                )}
+                <div style={{ fontSize: '12px', color: '#666' }}>
+                  💡 推荐执行轻量增量更新，仅下载替换变动文件，耗时极短且无需重新下载完整资源包。
+                </div>
+              </div>
+            )}
+          </div>
+        </Alert>
+
+        {/* 汉化资源更新完成后的清缓存并重启确认弹窗 */}
+        <Alert
+          isOpen={showPostUpdateRestartAlert}
+          cancelButtonText="稍后手动重启"
+          confirmButtonText="⚡ 清缓存并重启 POI"
+          intent={Intent.PRIMARY}
+          icon="refresh"
+          onCancel={() => this.setState({ showPostUpdateRestartAlert: false })}
+          onConfirm={this.executeClearCacheAndRestartPoi}
+          canOutsideClickCancel={true}
+          canEscapeKeyCancel={true}
+          className={isDarkTheme ? 'bp3-dark bp4-dark kancolle-chs-dark-theme' : ''}
+          style={{ maxWidth: '480px' }}
+        >
+          <div style={{ lineHeight: '1.6' }}>
+            <h5 style={{ margin: '0 0 10px 0', fontSize: '15px', fontWeight: 'bold' }}>
+              🎉 汉化资源已更新完成！
+            </h5>
+            <p style={{ margin: '0 0 10px 0', fontSize: '13px' }}>
+              所有汉化资源已成功下载并自动完成合流注入。<br />
+              是否立即<strong>自动清理游戏缓存并重启 POI</strong>，使最新资源彻底生效？
+            </p>
+            <div
+              style={{
+                fontSize: '12px',
+                color: '#d9822b',
+                background: 'rgba(217, 130, 43, 0.1)',
+                padding: '8px 10px',
+                borderRadius: '4px',
+                borderLeft: '3px solid #d9822b',
+              }}
+            >
+              <span>💡 <strong>安全建议：</strong>若当前舰队正在出击战斗中，建议点击「稍后手动重启」，待出击结束回港安全后再行重启。</span>
+            </div>
+          </div>
+        </Alert>
       </div>
     )
   }