Fix: 解决打包后的应用找不到素材的问题

README.md

@@ -52,5 +52,5 @@ npm run start
 ## TODO
 
 - [x] 更美观的说的道理，优化 UI
-- [x] 更多的哇袄
-- [ ] 自定义更换不同的道理
+- [ ] 更多的哇袄
+- [x] 自定义更换不同的道理

main/main.js

@@ -123,9 +123,9 @@ ipcMain.handle('set-pet-selection', async (_, petAsset) => {
 });
 
 ipcMain.on("show-context-menu", async () => {
-  // 尝试动态读取 renderer 下的 assets 目录，开发/生产路径均尝试
-  const devAssets = path.join(__dirname, "../renderer/src/assets");
-  const prodAssets = path.join(__dirname, "../renderer/dist/assets");
+  // 尝试动态读取 renderer 下的 public/pets 目录，开发/生产路径均尝试
+  const devAssets = path.join(__dirname, "../renderer/public/pets");
+  const prodAssets = path.join(__dirname, "../renderer/dist/pets");
   let assetsDir = null;
   if (fs.existsSync(devAssets)) assetsDir = devAssets;
   else if (fs.existsSync(prodAssets)) assetsDir = prodAssets;
@@ -212,6 +212,35 @@ ipcMain.on("show-context-menu", async () => {
   menu.popup({ window: mainWindow });
 });
 
+// 提供给渲染进程：列出 public/pets 中的素材文件（开发/生产路径）
+ipcMain.handle('get-pet-files', async () => {
+  const devDir = path.join(__dirname, '../renderer/public/pets');
+  const prodDir = path.join(__dirname, '../renderer/dist/pets');
+  const dir = fs.existsSync(devDir) ? devDir : (fs.existsSync(prodDir) ? prodDir : null);
+  if (!dir) return [];
+  try {
+    const files = await fs.promises.readdir(dir);
+    return files.filter(f => /\.(png|jpg|jpeg|gif)$/i.test(f));
+  } catch (e) {
+    console.error('读取 pets 目录失败:', e);
+    return [];
+  }
+});
+
+ipcMain.handle('get-pet-url', (_, fileName) => {
+  // 在开发时，public 文件由 dev server 以根路径提供
+  if (process.env.NODE_ENV === 'development') {
+    return `http://localhost:5173/pets/${encodeURIComponent(fileName)}`;
+  }
+  // 生产时，从 dist/pets 返回 file:// URL
+  const prodPath = path.join(__dirname, '../renderer/dist/pets', fileName);
+  if (fs.existsSync(prodPath)) return `file://${prodPath}`;
+  // fallback: try public path in source tree
+  const devPath = path.join(__dirname, '../renderer/public/pets', fileName);
+  if (fs.existsSync(devPath)) return `file://${devPath}`;
+  return null;
+});
+
 let isAlwaysOnTop = true;
 let mainWindow;
 

main/preload.js

@@ -15,6 +15,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
   onPetSelectionChanged: (callback) => {
     ipcRenderer.on('pet-selection-changed', (_, fileName) => callback(fileName));
   },
+  getPetFiles: () => ipcRenderer.invoke('get-pet-files'),
+  getPetUrl: (fileName) => ipcRenderer.invoke('get-pet-url', fileName),
   showTooltip: (text) => ipcRenderer.send('show-tooltip', text),
   onUpdatePosition: (callback) => {
     ipcRenderer.on('update-position', (_, position) => callback(position))

renderer/src/App.vue

@@ -2,13 +2,7 @@
 import { ref, onMounted, reactive, computed } from "vue";
 import { Howl } from "howler";
 
-// 默认图片（打包时位于 assets）
-import defaultPet from "./assets/普通型道理.gif";
-
-// 列出 renderer/src/assets 下的图片资源（Vite 特性）
-// 只匹配常见的图片后缀
-const modules = import.meta.glob('./assets/*.{png,jpg,jpeg,gif}', { as: 'url' });
-const assetEntries = Object.entries(modules);
+import defaultPet from "/public/pets/普通型道理.gif";
 
 // 状态
 const soundFiles = ref([]);
@@ -18,40 +12,53 @@ const isLoading = ref(true);
 const isPlaying = ref(false);
 
 // 处理宠物素材选择
-const assetList = assetEntries.map(([path, resolver]) => ({ path, resolver }));
-const assetPreviews = ref([]); // { path, url }
+const assetPreviews = ref([]); // { name, fileName, url }
 const selectedAsset = ref(null); // 将保存为 URL
 const showSettings = ref(false);
 
 const selectedAssetName = computed(() => {
   if (!selectedAsset.value) return null;
-  // 从路径中取文件名
+  const match = assetPreviews.value.find(p => p.url === selectedAsset.value);
+  if (match) return match.name;
+  // fallback: 从 URL 中取最后一段
   const parts = selectedAsset.value.split('/');
   return parts[parts.length - 1];
 });
 
 async function loadSavedSelection() {
-  // 优先从主进程读取持久化选择
-  if (window.electronAPI && typeof window.electronAPI.getPetSelection === 'function') {
-    try {
-      const assetPath = await window.electronAPI.getPetSelection();
-      if (assetPath) {
-        // assetPath 存储为相对于 assets 的文件名，例如 "pet2.gif"
-        const match = assetList.find(a => a.path.endsWith('/' + assetPath));
+  // 优先从主进程读取持久化选择（返回 fileName）
+  try {
+    if (window.electronAPI && typeof window.electronAPI.getPetSelection === 'function') {
+      const fileName = await window.electronAPI.getPetSelection();
+      if (fileName) {
+        const match = assetPreviews.value.find(p => p.fileName === fileName);
         if (match) {
-          selectedAsset.value = await match.resolver();
+          selectedAsset.value = match.url;
           return;
         }
+        // 如果 assetPreviews 中没有，但文件名存在，尝试直接请求 URL
+        if (window.electronAPI && typeof window.electronAPI.getPetUrl === 'function') {
+          const url = await window.electronAPI.getPetUrl(fileName);
+          if (url) { selectedAsset.value = url; return; }
+        }
       }
-    } catch (e) {
-      console.error('读取保存的宠物素材失败:', e);
     }
+  } catch (e) {
+    console.error('读取保存的宠物素材失败:', e);
   }
   // fallback: localStorage
-  const ls = localStorage.getItem('petAsset');
-  if (ls) {
-    const match = assetList.find(a => a.path.endsWith('/' + ls));
-    if (match) selectedAsset.value = await match.resolver();
+  try {
+    const ls = localStorage.getItem('petAsset');
+    if (ls) {
+      const match = assetPreviews.value.find(p => p.fileName === ls);
+      if (match) { selectedAsset.value = match.url; return; }
+      if (window.electronAPI && typeof window.electronAPI.getPetUrl === 'function') {
+        const url = await window.electronAPI.getPetUrl(ls);
+        if (url) selectedAsset.value = url;
+      }
+    }
+  } catch (e) {
+    // ignore
   }
 }
 
@@ -81,19 +88,29 @@ onMounted(async () => {
       isLoading.value = false;
     }
   }
-  await loadSavedSelection();
-  // 预解析所有资源的 URL，用于设置面板的缩略图显示
+  // 从主进程读取 public/pets 下的素材文件名，然后为每个文件请求可用 URL
   try {
-    const previews = await Promise.all(assetList.map(async (a) => ({ path: a.path, url: await a.resolver() })));
-    assetPreviews.value = previews;
+    if (window.electronAPI && typeof window.electronAPI.getPetFiles === 'function') {
+      const files = await window.electronAPI.getPetFiles();
+      const previews = await Promise.all(files.map(async (file) => {
+        const url = await window.electronAPI.getPetUrl(file);
+        const name = file.replace(/\.[^.]+$/, '');
+        const displayName = name + (/\.gif$/i.test(file) ? '（可动）' : '');
+        return { fileName: file, url, name: displayName };
+      }));
+      assetPreviews.value = previews;
+    }
   } catch (e) {
-    console.error('解析素材预览失败:', e);
+    console.error('获取 pets 列表失败:', e);
   }
 
+  // 加载并应用保存的选择（依赖于 assetPreviews 已构建）
+  await loadSavedSelection();
+
   // 监听主进程通过右键菜单发来的选择变更
   if (window.electronAPI && typeof window.electronAPI.onPetSelectionChanged === 'function') {
     window.electronAPI.onPetSelectionChanged(async (fileName) => {
-      const match = assetPreviews.value.find(p => p.path.endsWith('/' + fileName));
+      const match = assetPreviews.value.find(p => p.fileName === fileName);
       if (match) selectedAsset.value = match.url;
     });
   }
@@ -170,15 +187,9 @@ function handleMouseUp() {
 function handleRightClick() { window.electronAPI.showContextMenu(); }
 
 async function chooseAsset(entry) {
-  // entry can be either {path, resolver} or a preview {path, url}
-  if (entry.url) {
-    selectedAsset.value = entry.url;
-    await saveSelection(entry.path);
-  } else {
-    const url = await entry.resolver();
-    selectedAsset.value = url;
-    await saveSelection(entry.path);
-  }
+  // entry is { fileName, url, name }
+  selectedAsset.value = entry.url;
+  await saveSelection(entry.fileName);
   showSettings.value = false;
 }
 </script>