Skip to content

Commit d8b3eab

Browse files
committed
fix: 修复确实event.json导致报错
1 parent 518d60d commit d8b3eab

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VITE_VERSION=2.0.7
1+
VITE_VERSION=2.0.8
22
# 程序名称
33
VITE_RENDERER_NAME=物华弥新
44
# 资源包版本文件地址

src/main/customMaa/eventSelect.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
* @Author: Night-stars-1 nujj1042633805@gmail.com
33
* @Date: 2024-09-08 14:57:20
44
* @LastEditors: Night-stars-1 nujj1042633805@gmail.com
5-
* @LastEditTime: 2024-09-15 16:40:06
5+
* @LastEditTime: 2024-10-09 13:54:24
66
*/
77
import * as maa from '@nekosu/maa-node'
88
import { log } from '../utils/logger'
9-
import { getEvent } from '../reszip'
10-
11-
const EVENT_DATA: { [key: string]: string } = JSON.parse(getEvent())
9+
import { EVENT_DATA } from '../reszip'
1210

1311
const eventSelect: maa.CustomRecognizerCallback = async (self) => {
1412
const data = await self.context.run_recognition('OCR', self.image, {

src/main/reszip.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @Author: Night-stars-1 nujj1042633805@gmail.com
44
* @Date: 2024-09-07 22:51:22
55
* @LastEditors: Night-stars-1 nujj1042633805@gmail.com
6-
* @LastEditTime: 2024-10-05 17:04:33
6+
* @LastEditTime: 2024-10-09 13:52:12
77
*/
88
import fs from 'fs'
99
import path from 'path'
@@ -55,6 +55,7 @@ async function update(version: string, proxyUrl: string, event: IpcMainEvent) {
5555
version,
5656
event
5757
)
58+
EVENT_DATA = getEvent()
5859
} catch (error: any) {
5960
logger.info(error.code)
6061
logger.error('下载资源包时发生错误:', error.message)
@@ -162,13 +163,18 @@ function copyOcrModel() {
162163
}
163164
copyOcrModel()
164165

166+
let EVENT_DATA: { [key: string]: string } = getEvent()
165167
function getEvent() {
166-
const data = fs.readFileSync(EVENT_PATH, {
167-
encoding: 'utf-8'
168-
})
168+
let data: { [key: string]: string } = {}
169+
if (fs.existsSync(EVENT_PATH)) {
170+
data = JSON.parse(
171+
fs.readFileSync(EVENT_PATH, {
172+
encoding: 'utf-8'
173+
})
174+
)
175+
}
169176
return data
170177
}
171-
172178
// 监听渲染进程的请求,执行解压任务
173179
ipcMain.on('res-update', (event, version, proxyUrl) => {
174180
update(version, proxyUrl, event)
@@ -182,4 +188,4 @@ ipcMain.on('res-open-folder', () => {
182188
shell.openPath(BASE_RES_PATH)
183189
})
184190

185-
export { BASE_RES_PATH, INTERFACE_PATH, getEvent }
191+
export { BASE_RES_PATH, INTERFACE_PATH, EVENT_DATA }

0 commit comments

Comments
 (0)