6.1.110

🐞 修正一些問題
yayacat · May 24, 2024 · 139c633 · 139c633
1 parent 61bbb5d
commit 139c633
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 7 deletions.
diff --git 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
diff --git a/TREM.Electron/js/macos_arm64_client6.jar b/TREM.Electron/js/macos_arm64_client6.jar
diff --git a/TREM.Electron/js/macos_arm64_server.jar b/TREM.Electron/js/macos_arm64_server.jar
diff --git a/TREM.Electron/js/macos_x64_client.jar b/TREM.Electron/js/macos_x64_client.jar
diff --git a/TREM.Electron/js/macos_x64_client6.jar b/TREM.Electron/js/macos_x64_client6.jar
diff --git a/TREM.Electron/js/macos_x64_server.jar b/TREM.Electron/js/macos_x64_server.jar
diff --git a/TREM.Electron/js/macosclient.jar b/TREM.Electron/js/macosclient.jar
diff --git a/TREM.Electron/js/macosclient6.jar b/TREM.Electron/js/macosclient6.jar
diff --git a/TREM.Electron/js/macosserver.jar b/TREM.Electron/js/macosserver.jar
diff --git 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"
           ]
         }
       ]