From 4ce537b2828bdb83b29f28cc13ae321ff7853a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?= <1173718158@qq.com> Date: Fri, 15 Nov 2024 05:10:37 +0800 Subject: [PATCH] fix --- py/LunaTranslator/LunaTranslator_main.py | 7 ++-- py/LunaTranslator/gui/setting_about.py | 2 +- py/files/defaultconfig/static_data.json | 42 ++++++++++++++++++++---- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/py/LunaTranslator/LunaTranslator_main.py b/py/LunaTranslator/LunaTranslator_main.py index 8615b45d..29c39e2a 100644 --- a/py/LunaTranslator/LunaTranslator_main.py +++ b/py/LunaTranslator/LunaTranslator_main.py @@ -135,9 +135,12 @@ def checkintegrity(): js = static_data["checkintegrity"] flist = js["shared"] - if platform.architecture()[0] == "64bit": + + if tuple(sys.version_info)[:2] == (3, 4): + flist = js["xp"] + elif platform.architecture()[0] == "64bit": flist += js["64"] - else: + elif platform.architecture()[0] == "32bit": flist += js["32"] collect = [] for f in flist: diff --git a/py/LunaTranslator/gui/setting_about.py b/py/LunaTranslator/gui/setting_about.py index 34c005b4..5513c5b6 100644 --- a/py/LunaTranslator/gui/setting_about.py +++ b/py/LunaTranslator/gui/setting_about.py @@ -57,7 +57,7 @@ def trygetupdate(): if tuple(sys.version_info)[:2] == (3, 4): bit = "xp" - if platform.architecture()[0] == "64bit": + elif platform.architecture()[0] == "64bit": bit = "64" elif platform.architecture()[0] == "32bit": bit = "32" diff --git a/py/files/defaultconfig/static_data.json b/py/files/defaultconfig/static_data.json index 8039a46c..d91fdf00 100644 --- a/py/files/defaultconfig/static_data.json +++ b/py/files/defaultconfig/static_data.json @@ -1422,30 +1422,58 @@ "诸": "諸" }, "checkintegrity": { + "xp": [ + "./files/plugins/shareddllproxy32.exe", + "./files/plugins/LoaderDll.dll", + "./files/plugins/LocaleEmulator.dll", + "./files/plugins/Locale_Remulator/LRHookx32.dll", + "./files/plugins/Locale_Remulator/LRHookx64.dll", + "./files/plugins/NTLEAS/ntleak.dll", + "./files/plugins/NTLEAS/ntleai.dll", + "./files/plugins/LunaHook/LunaHook32.dll", + "./files/plugins/LunaHook/LunaHost32.dll", + "./files/plugins/DLL32/winsharedutils32.dll", + "./files/plugins/DLL32/libmecab.dll", + "./files/plugins/DLL32/libcurl.dll", + "./files/plugins/DLL32/bass.dll", + "./files/plugins/DLL32/brotlicommon.dll", + "./files/plugins/DLL32/brotlidec.dll" + ], "shared": [ "./files/plugins/shareddllproxy32.exe", "./files/plugins/shareddllproxy64.exe", - "./files/plugins/LunaHook/LunaHook32.dll", - "./files/plugins/LunaHook/LunaHook64.dll", - "./files/plugins/LunaHook/LunaHost64.dll", - "./files/plugins/LunaHook/LunaHost32.dll", "./files/plugins/LoaderDll.dll", "./files/plugins/LocaleEmulator.dll", - "./files/plugins/hookmagpie.dll" + "./files/plugins/hookmagpie.dll", + "./files/plugins/Magpie/Magpie.Core.exe", + "./files/plugins/Locale_Remulator/LRHookx32.dll", + "./files/plugins/Locale_Remulator/LRHookx64.dll", + "./files/plugins/NTLEAS/ntleak.dll", + "./files/plugins/NTLEAS/ntleai.dll", + "./files/plugins/LunaHook/LunaHook32.dll", + "./files/plugins/LunaHook/LunaHost32.dll", + "./files/plugins/LunaHook/LunaHook64.dll", + "./files/plugins/LunaHook/LunaHost64.dll" ], "64": [ "./files/plugins/DLL64/winsharedutils64.dll", "./files/plugins/DLL64/winrtutils64.dll", "./files/plugins/DLL64/LunaOCR64.dll", "./files/plugins/DLL64/libmecab.dll", - "./files/plugins/DLL64/libcurl-x64.dll" + "./files/plugins/DLL64/libcurl-x64.dll", + "./files/plugins/DLL64/bass.dll", + "./files/plugins/DLL64/brotlicommon.dll", + "./files/plugins/DLL64/brotlidec.dll" ], "32": [ "./files/plugins/DLL32/winsharedutils32.dll", "./files/plugins/DLL32/winrtutils32.dll", "./files/plugins/DLL32/LunaOCR32.dll", "./files/plugins/DLL32/libmecab.dll", - "./files/plugins/DLL32/libcurl.dll" + "./files/plugins/DLL32/libcurl.dll", + "./files/plugins/DLL32/bass.dll", + "./files/plugins/DLL32/brotlicommon.dll", + "./files/plugins/DLL32/brotlidec.dll" ] }, "scalemethods": [