修复：摩摩怪往小游戏服务器发包时改用后台线程发送，修复前台发送会导致主界面卡顿1秒的问题

优化：部分list使用pop(0)的地方改为pop()并反转排序顺序，提升性能

Author: lingcraft

mole.py

@@ -164,6 +164,8 @@ def __init__(self):
         # 线程初始化
         self.send_thread = SendThread()
         self.send_ex_thread = SendExThread()
+        self.send_to_server_thread = SendToServerThread()
+        self.send_to_server_thread.result.connect(self.mmg_get_reward)
         self.update_thread = UpdateThread()
         self.update_thread.result.connect(self.update_result)
         self.advance_dialog = AdvanceDialog()
@@ -622,7 +624,7 @@ def mmg_run(self):
             case 3:  # 挑战好友
                 match mmg_times:
                     case n if n < mmg_vigour // 10 and len(mmg_fight_friends) > 0:
-                        level_id, fight_type = mmg_fight_friends.pop(0)
+                        level_id, fight_type = mmg_fight_friends.pop()
                         self.mmg_fight(level_id, fight_type)
                     case _:
                         self.mmg_wish()
@@ -633,21 +635,24 @@ def mmg_fight(self, level_id, fight_type):
             "00000000000000019300000000000000000000000100000000"  # 进入游戏
         ])
 
-        def fight():
-            is_no_error = send_lines_to_server(("123.206.131.63", 3001), [
+        run_later(lambda: send_lines_to_server_back(
+            ("123.206.131.63", 3001),
+            [
                 f"0000008101000075310000000000000000{mmg_game_id}",  # 进入游戏
                 f"000000212000007724000000000000000000000004{get_hex(fight_type)}{get_hex(level_id)}00000000",  # 开始挑战
                 "000000152000007724000000000000000000000040",  # 开始战斗
                 "000000152000007724000000000000000000000080"  # 快速战斗
-            ], [3, 1, 1, 2])  # 摩摩怪服务器操作
-            if is_no_error:
-                run_later(lambda: send_lines([
-                    "0000000000000020140000000000000000",  # 校验能否翻牌
-                    "000000000000002015000000000000000000000000",  # 翻牌
-                    "000000000000000194000000000000000000"  # 离开游戏
-                ]))
-
-        run_later(fight, 400)
+            ],
+            [3, 1, 1, 2]
+        ), 400)
+
+    def mmg_get_reward(self, is_success):
+        if is_success:
+            run_later(lambda: send_lines([
+                "0000000000000020140000000000000000",  # 校验能否翻牌
+                "000000000000002015000000000000000000000000",  # 翻牌
+                "000000000000000194000000000000000000"  # 离开游戏
+            ]))
 
     def mmg_wish(self):
         send_lines_back([
@@ -1018,7 +1023,7 @@ def advance(self):
         for need_card_type in need_card_types:
             if need_card_type in owned_cards_dict:
                 owned_cards = owned_cards_dict.get(need_card_type)
-                card_data = owned_cards.pop(0)
+                card_data = owned_cards.pop()
                 if card_data.get("已装备"):
                     unequip_cards.append(card_data.get("ID"))
                 consume_cards.append(card_data.get("名称"))
@@ -1068,6 +1073,19 @@ def run(self):
             send_lines_to_socket(self.lines, self.interval)
 
 
+class SendToServerThread(QThread):
+    result = Signal(bool)
+
+    def set_data(self, address: tuple, lines: list, wait_recv_nums: list):
+        self.address = address
+        self.lines = lines
+        self.wait_recv_nums = wait_recv_nums
+
+    def run(self):
+        is_success = send_lines_to_server(self.address, self.lines, self.wait_recv_nums)
+        self.result.emit(is_success)
+
+
 class UpdateThread(QThread):
     result = Signal(int, str, str)
 
@@ -1336,6 +1354,18 @@ def send_lines(lines: list, interval: int = Interval.NONE):
             sleep(interval / 1000)
 
 
+def send_lines_back(lines: list, interval: int = Interval.NORMAL):
+    if not window.send_thread.isRunning():
+        window.send_thread.set_data(lines, interval)
+        window.send_thread.start()
+
+
+def send_lines_back_ex(lines: list, interval: int = Interval.NORMAL):
+    if not window.send_ex_thread.isRunning():
+        window.send_ex_thread.set_data(lines, interval)
+        window.send_ex_thread.start()
+
+
 def send_lines_to_server(address: tuple, lines: list, wait_recv_nums: list = None):
     need_wait_recv = wait_recv_nums is not None
     with socket(AF_INET, SOCK_STREAM) as s:
@@ -1354,6 +1384,12 @@ def send_lines_to_server(address: tuple, lines: list, wait_recv_nums: list = Non
     return True
 
 
+def send_lines_to_server_back(address: tuple, lines: list, wait_recv_nums: list = None):
+    if not window.send_to_server_thread.isRunning():
+        window.send_to_server_thread.set_data(address, lines, wait_recv_nums)
+        window.send_to_server_thread.start()
+
+
 def send_lines_to_socket(lines: list, interval: int = Interval.NONE):
     socket_num = window.socketLineEdit.text()
     if socket_num.isdigit():
@@ -1370,12 +1406,6 @@ def send_lines_to_socket(lines: list, interval: int = Interval.NONE):
             pass
 
 
-def send_lines_back(lines: list, interval: int = Interval.NORMAL):
-    if not window.send_thread.isRunning():
-        window.send_thread.set_data(lines, interval)
-        window.send_thread.start()
-
-
 def is_not_running(timer: str):
     return not window.timer(timer).isActive()
 
@@ -1384,12 +1414,6 @@ def is_not_sending():
     return not window.send_thread.isRunning()
 
 
-def send_lines_back_ex(lines: list, interval: int = Interval.NORMAL):
-    if not window.send_ex_thread.isRunning():
-        window.send_ex_thread.set_data(lines, interval)
-        window.send_ex_thread.start()
-
-
 def get_ip_port(socket_num: int):
     try:
         with fromfd(socket_num, AF_INET, SOCK_STREAM) as s:
@@ -1563,8 +1587,8 @@ def process_recv_packet(socket_num, buf, length):
                                 start += size1 + other_state_num * size2
                             mmg_query_page += 1
                             if mmg_query_page == mmg_query_page_max:  # 查询完毕
-                                # 将师徒放在最前面，因为返回的好友挑战信息和查询时的好友ID顺序可能不一样
-                                mmg_fight_friends.sort(key=lambda item: item[1], reverse=True)
+                                # 将师徒放后面先pop，因为返回的好友挑战信息和查询时的好友ID顺序可能不一样
+                                mmg_fight_friends.sort(key=lambda item: item[1])
                                 window.mmg_start()
                         if packet.cmd_id == 12004:  # 魔灵用户信息
                             mlcs_energy = get_int(packet.body, 13, 2)  # 剩余体力值
@@ -1641,9 +1665,9 @@ def process_recv_packet(socket_num, buf, length):
                                 # 满级卡牌信息
                                 else:
                                     ysqs_max_level_cards_dict.setdefault(card_data.get("类型"), []).append(card_data)
-                            # 未出战的排前面
+                            # 未装备卡牌放后面先pop
                             for card_list in ysqs_max_level_cards_dict.values():
-                                card_list.sort(key=lambda item: item.get("已装备"))
+                                card_list.sort(key=lambda item: item.get("已装备"), reverse=True)
                             if old_card_id is not None:
                                 index = window.ysqsCardBox.findData(old_card_id)
                                 if index != -1:

ui_main.py

@@ -234,6 +234,7 @@ def setupUi(self, MainWindow):
 
         self.tabWidget.setCurrentIndex(0)
         self.mmgLevelBox.setCurrentIndex(27)
+        self.mmgBossBox.setCurrentIndex(3)
 
 
         QMetaObject.connectSlotsByName(MainWindow)
@@ -294,10 +295,10 @@ def retranslateUi(self, MainWindow):
         self.mmgLevelBox.setItemText(31, QCoreApplication.translate("MainWindow", u"呐奇树洞疯", None))
 
         self.mmgPVEButton.setText(QCoreApplication.translate("MainWindow", u"一键挑战副本", None))
-        self.mmgBossBox.setItemText(0, QCoreApplication.translate("MainWindow", u"萨尔冥王", None))
-        self.mmgBossBox.setItemText(1, QCoreApplication.translate("MainWindow", u"呆呆牛头人", None))
-        self.mmgBossBox.setItemText(2, QCoreApplication.translate("MainWindow", u"地狱神犬", None))
-        self.mmgBossBox.setItemText(3, QCoreApplication.translate("MainWindow", u"暗夜精灵", None))
+        self.mmgBossBox.setItemText(0, QCoreApplication.translate("MainWindow", u"呆呆牛头人", None))
+        self.mmgBossBox.setItemText(1, QCoreApplication.translate("MainWindow", u"地狱神犬", None))
+        self.mmgBossBox.setItemText(2, QCoreApplication.translate("MainWindow", u"暗夜精灵", None))
+        self.mmgBossBox.setItemText(3, QCoreApplication.translate("MainWindow", u"萨尔冥王", None))
         self.mmgBossBox.setItemText(4, QCoreApplication.translate("MainWindow", u"独角萨摩", None))
 
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab1), QCoreApplication.translate("MainWindow", u"第1页", None))

ui_main.ui

@@ -576,27 +576,30 @@
          <height>25</height>
         </rect>
        </property>
+       <property name="currentIndex">
+        <number>3</number>
+       </property>
        <property name="duplicatesEnabled">
         <bool>false</bool>
        </property>
        <item>
         <property name="text">
-         <string>萨尔冥王</string>
+         <string>呆呆牛头人</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>呆呆牛头人</string>
+         <string>地狱神犬</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>地狱神犬</string>
+         <string>暗夜精灵</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>暗夜精灵</string>
+         <string>萨尔冥王</string>
         </property>
        </item>
        <item>

version.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.7.3",
-    "description": "- 优化：card_dict 增加“上一星级”、“进阶材料”字段，增加星级之间的关联性和进阶材料计算\n- 优化：卡牌进阶所需材料本地计算，并给出可以进阶的消耗提示、无法进阶的卡牌缺失提示\n- 优化：进阶前卸载卡牌功能优化，现在不卸载全部卡牌，只卸载进阶需要消耗的卡牌\n- 优化：提示函数按钮相关功能优化\n- 修复：增加语言文件并加载，修复通用按钮文本是英文的问题"
+    "version": "1.7.4",
+    "description": "- 修复：摩摩怪往小游戏服务器发包时改用后台线程发送，修复前台发送会导致主界面卡顿1秒的问题\n- 优化：部分list使用pop(0)的地方改为pop()并反转排序顺序，提升性能"
 }