merge

LunaTranslator/LunaTranslator/LunaTranslator.py

@@ -162,7 +162,6 @@ class MAINUI:
 
         returnandembedcallback = lambda: embedcallback("") if embedcallback else ""
 
-        if type(text) == str:
         if text.startswith("<notrans>"):
             self.translation_ui.displayres.emit(
                 dict(
@@ -194,10 +193,6 @@ class MAINUI:
         if onlytrans == False:
             self.currentsignature = time.time()
         try:
-            if type(text) == list:
-                origin = "\n".join(text)
-                text = "\n".join([self._POSTSOLVE(_) for _ in text])
-            else:
             origin = text
             text = self._POSTSOLVE(text)
         except Exception as e:
@@ -725,7 +720,6 @@ class MAINUI:
 
                 print_exc()
 
-
     def autohookmonitorthread(self):
         while self.isrunning:
             self.onwindowloadautohook()
@@ -895,6 +889,7 @@ class MAINUI:
             __t = time.time()
             time.sleep(1)
             _t = time.time()
+
             def isok(name_):
                 savehook_new_data[name_]["statistic_playtime"] += _t - __t
                 if self.__currentexe == name_:

LunaTranslator/LunaTranslator/gui/dialog_savedgame.py

@@ -841,7 +841,7 @@ class dialog_setting_game_internal(QWidget):
         else:
             _methods = ["Locale-Emulator", "Locale_Remulator", "Ntleas"]
         if b == 6 and savehook_new_data[exepath]["localeswitcher"] == 0:
-            savehook_new_data[exepath]["localeswitcher"] = 2
+            savehook_new_data[exepath]["localeswitcher"] = 1
         formLayout.addRow(
             _TR("转区启动"),
             getboxlayout(

LunaTranslator/LunaTranslator/textsource/texthook.py

@@ -453,7 +453,7 @@ class texthook(basetext):
                 collector.sort(key=lambda xx: self.selectedhook.index(xx[0]))
             except:
                 pass
-            collector = [_[1] for _ in collector]
+            collector = "\n".join([_[1] for _ in collector])
             self.newline.put(collector)
             self.runonce_line = collector
 

LunaTranslator/LunaTranslator/textsource/textsourcebase.py

@@ -137,9 +137,6 @@ class basetext:
             try:
                 t = self.gettextthread()
                 if t and globalconfig["autorun"]:
-                    if type(t) == tuple:
-                        self.textgetmethod(*t)
-                    else:
                     self.textgetmethod(t)
             except:
                 print_exc()

plugins/CMakeLists.txt

@@ -29,7 +29,7 @@ include(generate_product_version)
 
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 6)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 
 add_library(pch pch.cpp)
 target_precompile_headers(pch PUBLIC pch.h)