diff --git a/TREM.Electron/js/earthquake.js b/TREM.Electron/js/earthquake.js index 974959a5..7d67b533 100644 --- a/TREM.Electron/js/earthquake.js +++ b/TREM.Electron/js/earthquake.js @@ -921,15 +921,19 @@ async function init() { // Connect to server try { - if (process.platform === "win32") + if (process.platform === "win32") { bytenode.runBytecodeFile(path.resolve(__dirname, "../js/winserver.jar")); - else if (process.platform === "darwin") - bytenode.runBytecodeFile(path.resolve(__dirname, "../js/macosserver.jar")); - else if (process.platform === "linux") + } else if (process.platform === "darwin") { + if (process.arch === "x64") + bytenode.runBytecodeFile(path.resolve(__dirname, "../js/macos_x64_server.jar")); + else if (process.arch === "arm64") + bytenode.runBytecodeFile(path.resolve(__dirname, "../js/macos_arm64_server.jar")); + } else if (process.platform === "linux") { if (process.arch === "x64") bytenode.runBytecodeFile(path.resolve(__dirname, "../js/linux_x64_server.jar")); else if (process.arch === "arm64") bytenode.runBytecodeFile(path.resolve(__dirname, "../js/linux_arm64_server.jar")); + } $("#loading").text(TREM.Localization.getString("Application_Connecting")); log("Trying to connect to the server...", 1, "ResourceLoader", "init"); diff --git a/TREM.Electron/js/macos_arm64_client.jar b/TREM.Electron/js/macos_arm64_client.jar new file mode 100644 index 00000000..f9c195bd Binary files /dev/null and b/TREM.Electron/js/macos_arm64_client.jar differ diff --git a/TREM.Electron/js/macos_arm64_client6.jar b/TREM.Electron/js/macos_arm64_client6.jar new file mode 100644 index 00000000..9e674137 Binary files /dev/null and b/TREM.Electron/js/macos_arm64_client6.jar differ diff --git a/TREM.Electron/js/macos_arm64_server.jar b/TREM.Electron/js/macos_arm64_server.jar new file mode 100644 index 00000000..86b986bc Binary files /dev/null and b/TREM.Electron/js/macos_arm64_server.jar differ diff --git a/TREM.Electron/js/macos_x64_client.jar b/TREM.Electron/js/macos_x64_client.jar new file mode 100644 index 00000000..0efaf145 Binary files /dev/null and b/TREM.Electron/js/macos_x64_client.jar differ diff --git a/TREM.Electron/js/macos_x64_client6.jar b/TREM.Electron/js/macos_x64_client6.jar new file mode 100644 index 00000000..567a9bbb Binary files /dev/null and b/TREM.Electron/js/macos_x64_client6.jar differ diff --git a/TREM.Electron/js/macos_x64_server.jar b/TREM.Electron/js/macos_x64_server.jar new file mode 100644 index 00000000..e6308295 Binary files /dev/null and b/TREM.Electron/js/macos_x64_server.jar differ diff --git a/TREM.Electron/js/macosclient.jar b/TREM.Electron/js/macosclient.jar deleted file mode 100644 index ab348bb3..00000000 Binary files a/TREM.Electron/js/macosclient.jar and /dev/null differ diff --git a/TREM.Electron/js/macosclient6.jar b/TREM.Electron/js/macosclient6.jar deleted file mode 100644 index 22bbfb80..00000000 Binary files a/TREM.Electron/js/macosclient6.jar and /dev/null differ diff --git a/TREM.Electron/js/macosserver.jar b/TREM.Electron/js/macosserver.jar deleted file mode 100644 index 31a77646..00000000 Binary files a/TREM.Electron/js/macosserver.jar and /dev/null differ diff --git a/TREM.Electron/package.json b/TREM.Electron/package.json index 76fa8d1f..3b233234 100644 --- a/TREM.Electron/package.json +++ b/TREM.Electron/package.json @@ -1,6 +1,6 @@ { "name": "tremv", - "version": "6.1.109", + "version": "6.1.110", "description": "Taiwan Real-time Earthquake Monitoring Variety ( 臺灣即時地震監測變體 )", "main": "main.js", "homepage": "https://exptech.com.tw/", @@ -25,13 +25,15 @@ { "target": "dmg", "arch": [ - "x64" + "x64", + "arm64" ] }, { "target": "pkg", "arch": [ - "x64" + "x64", + "arm64" ] } ]