Fix: 解决打包后的应用找不到素材的问题
@ -52,5 +52,5 @@ npm run start
|
|||||||
## TODO
|
## TODO
|
||||||
|
|
||||||
- [x] 更美观的说的道理,优化 UI
|
- [x] 更美观的说的道理,优化 UI
|
||||||
- [x] 更多的哇袄
|
- [ ] 更多的哇袄
|
||||||
- [ ] 自定义更换不同的道理
|
- [x] 自定义更换不同的道理
|
||||||
|
35
main/main.js
@ -123,9 +123,9 @@ ipcMain.handle('set-pet-selection', async (_, petAsset) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.on("show-context-menu", async () => {
|
ipcMain.on("show-context-menu", async () => {
|
||||||
// 尝试动态读取 renderer 下的 assets 目录,开发/生产路径均尝试
|
// 尝试动态读取 renderer 下的 public/pets 目录,开发/生产路径均尝试
|
||||||
const devAssets = path.join(__dirname, "../renderer/src/assets");
|
const devAssets = path.join(__dirname, "../renderer/public/pets");
|
||||||
const prodAssets = path.join(__dirname, "../renderer/dist/assets");
|
const prodAssets = path.join(__dirname, "../renderer/dist/pets");
|
||||||
let assetsDir = null;
|
let assetsDir = null;
|
||||||
if (fs.existsSync(devAssets)) assetsDir = devAssets;
|
if (fs.existsSync(devAssets)) assetsDir = devAssets;
|
||||||
else if (fs.existsSync(prodAssets)) assetsDir = prodAssets;
|
else if (fs.existsSync(prodAssets)) assetsDir = prodAssets;
|
||||||
@ -212,6 +212,35 @@ ipcMain.on("show-context-menu", async () => {
|
|||||||
menu.popup({ window: mainWindow });
|
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 isAlwaysOnTop = true;
|
||||||
let mainWindow;
|
let mainWindow;
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||||||
onPetSelectionChanged: (callback) => {
|
onPetSelectionChanged: (callback) => {
|
||||||
ipcRenderer.on('pet-selection-changed', (_, fileName) => callback(fileName));
|
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),
|
showTooltip: (text) => ipcRenderer.send('show-tooltip', text),
|
||||||
onUpdatePosition: (callback) => {
|
onUpdatePosition: (callback) => {
|
||||||
ipcRenderer.on('update-position', (_, position) => callback(position))
|
ipcRenderer.on('update-position', (_, position) => callback(position))
|
||||||
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 677 KiB After Width: | Height: | Size: 677 KiB |
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 166 KiB |
Before Width: | Height: | Size: 10 MiB After Width: | Height: | Size: 10 MiB |
Before Width: | Height: | Size: 6.5 MiB After Width: | Height: | Size: 6.5 MiB |
BIN
renderer/public/pets/木柜子汤圆.jpg
Normal file
After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
@ -2,13 +2,7 @@
|
|||||||
import { ref, onMounted, reactive, computed } from "vue";
|
import { ref, onMounted, reactive, computed } from "vue";
|
||||||
import { Howl } from "howler";
|
import { Howl } from "howler";
|
||||||
|
|
||||||
// 默认图片(打包时位于 assets)
|
import defaultPet from "/public/pets/普通型道理.gif";
|
||||||
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);
|
|
||||||
|
|
||||||
// 状态
|
// 状态
|
||||||
const soundFiles = ref([]);
|
const soundFiles = ref([]);
|
||||||
@ -18,40 +12,53 @@ const isLoading = ref(true);
|
|||||||
const isPlaying = ref(false);
|
const isPlaying = ref(false);
|
||||||
|
|
||||||
// 处理宠物素材选择
|
// 处理宠物素材选择
|
||||||
const assetList = assetEntries.map(([path, resolver]) => ({ path, resolver }));
|
const assetPreviews = ref([]); // { name, fileName, url }
|
||||||
const assetPreviews = ref([]); // { path, url }
|
|
||||||
const selectedAsset = ref(null); // 将保存为 URL
|
const selectedAsset = ref(null); // 将保存为 URL
|
||||||
const showSettings = ref(false);
|
const showSettings = ref(false);
|
||||||
|
|
||||||
const selectedAssetName = computed(() => {
|
const selectedAssetName = computed(() => {
|
||||||
if (!selectedAsset.value) return null;
|
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('/');
|
const parts = selectedAsset.value.split('/');
|
||||||
return parts[parts.length - 1];
|
return parts[parts.length - 1];
|
||||||
});
|
});
|
||||||
|
|
||||||
async function loadSavedSelection() {
|
async function loadSavedSelection() {
|
||||||
// 优先从主进程读取持久化选择
|
// 优先从主进程读取持久化选择(返回 fileName)
|
||||||
if (window.electronAPI && typeof window.electronAPI.getPetSelection === 'function') {
|
try {
|
||||||
try {
|
if (window.electronAPI && typeof window.electronAPI.getPetSelection === 'function') {
|
||||||
const assetPath = await window.electronAPI.getPetSelection();
|
const fileName = await window.electronAPI.getPetSelection();
|
||||||
if (assetPath) {
|
if (fileName) {
|
||||||
// assetPath 存储为相对于 assets 的文件名,例如 "pet2.gif"
|
const match = assetPreviews.value.find(p => p.fileName === fileName);
|
||||||
const match = assetList.find(a => a.path.endsWith('/' + assetPath));
|
|
||||||
if (match) {
|
if (match) {
|
||||||
selectedAsset.value = await match.resolver();
|
selectedAsset.value = match.url;
|
||||||
return;
|
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
|
// fallback: localStorage
|
||||||
const ls = localStorage.getItem('petAsset');
|
try {
|
||||||
if (ls) {
|
const ls = localStorage.getItem('petAsset');
|
||||||
const match = assetList.find(a => a.path.endsWith('/' + ls));
|
if (ls) {
|
||||||
if (match) selectedAsset.value = await match.resolver();
|
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;
|
isLoading.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await loadSavedSelection();
|
// 从主进程读取 public/pets 下的素材文件名,然后为每个文件请求可用 URL
|
||||||
// 预解析所有资源的 URL,用于设置面板的缩略图显示
|
|
||||||
try {
|
try {
|
||||||
const previews = await Promise.all(assetList.map(async (a) => ({ path: a.path, url: await a.resolver() })));
|
if (window.electronAPI && typeof window.electronAPI.getPetFiles === 'function') {
|
||||||
assetPreviews.value = previews;
|
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) {
|
} catch (e) {
|
||||||
console.error('解析素材预览失败:', e);
|
console.error('获取 pets 列表失败:', e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 加载并应用保存的选择(依赖于 assetPreviews 已构建)
|
||||||
|
await loadSavedSelection();
|
||||||
|
|
||||||
// 监听主进程通过右键菜单发来的选择变更
|
// 监听主进程通过右键菜单发来的选择变更
|
||||||
if (window.electronAPI && typeof window.electronAPI.onPetSelectionChanged === 'function') {
|
if (window.electronAPI && typeof window.electronAPI.onPetSelectionChanged === 'function') {
|
||||||
window.electronAPI.onPetSelectionChanged(async (fileName) => {
|
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;
|
if (match) selectedAsset.value = match.url;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -170,15 +187,9 @@ function handleMouseUp() {
|
|||||||
function handleRightClick() { window.electronAPI.showContextMenu(); }
|
function handleRightClick() { window.electronAPI.showContextMenu(); }
|
||||||
|
|
||||||
async function chooseAsset(entry) {
|
async function chooseAsset(entry) {
|
||||||
// entry can be either {path, resolver} or a preview {path, url}
|
// entry is { fileName, url, name }
|
||||||
if (entry.url) {
|
selectedAsset.value = entry.url;
|
||||||
selectedAsset.value = entry.url;
|
await saveSelection(entry.fileName);
|
||||||
await saveSelection(entry.path);
|
|
||||||
} else {
|
|
||||||
const url = await entry.resolver();
|
|
||||||
selectedAsset.value = url;
|
|
||||||
await saveSelection(entry.path);
|
|
||||||
}
|
|
||||||
showSettings.value = false;
|
showSettings.value = false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|