修复发现的bug

eee555 · eee555 · commit d4446806d7e3 · 2025-03-01T00:39:14.000+08:00
diff --git a/src/main.py b/src/main.py
@@ -70,7 +70,7 @@ def find_window(class_name, window_name):
             time.sleep(0.5)
             app.quit()
         else:
-            localServer = QLocalServer() 
+            localServer = QLocalServer()
             localServer.listen(serverName)
             localServer.newConnection.connect(lambda: on_new_connection(localServer=localServer))
             mainWindow = mainWindowGUI.MainWindow()
diff --git a/src/mineSweeperGUI.py b/src/mineSweeperGUI.py
@@ -2,7 +2,7 @@
 from PyQt5.QtCore import QTimer, QCoreApplication, Qt, QRect
 from PyQt5.QtGui import QPixmap
 # from PyQt5.QtWidgets import QLineEdit, QInputDialog, QShortcut
-from PyQt5.QtWidgets import QApplication, QFileDialog
+from PyQt5.QtWidgets import QApplication, QFileDialog, QWidget
 import gameDefinedParameter
 import superGUI, gameAbout, gameSettings, gameSettingShortcuts,\
     captureScreen, mine_num_bar, videoControl, gameRecordPop
@@ -131,6 +131,9 @@ def pixSize(self):
     @pixSize.setter
     def pixSize(self, pixSize):
         pixSize = max(5, pixSize)
+        pixSize = min(255, pixSize)
+        pixSize = min(32767//self.column, pixSize)
+        pixSize = min(32767//self.row, pixSize)
         if hasattr(self, "_pixSize") and pixSize == self._pixSize:
             return
         self.label.set_rcp(self.row, self.column, pixSize)
@@ -149,19 +152,14 @@ def pixSize(self, pixSize):
         # self.label.setFixedSize(QtCore.QSize(self.pixSize*self.column + 8, self.pixSize*self.row + 8))
 
         self.reimportLEDPic(pixSize) # 重新导入图片，无磁盘io
-        # if hasattr(self, "_pixSize"):
-        #     self._pixSize = pixSize
-        #     self.reimportLEDPic(pixSize) # 重新导入图片，无磁盘io
-        # else:
-        #     self._pixSize = pixSize
-        #     self.mineUnFlagedNum = self.mineNum
-        #     self.importLEDPic(pixSize) # 导入图片，有磁盘io
         self.label_2.reloadFace(pixSize)
         self.set_face(14)
         self.showMineNum(self.mineUnFlagedNum)
         self.showTime(0)
         if hasattr(self, "_pixSize") and pixSize < self._pixSize:
+            self._pixSize = pixSize
             self.minimumWindow()
+            return
         self._pixSize = pixSize
 
     @property
@@ -405,6 +403,7 @@ def mineAreaLeftRelease(self, i, j):
                     self.start_time_unix_2 = QtCore.QDateTime.currentDateTime().\
                                                 toMSecsSinceEpoch()
                     self.timer_10ms.start()
+                    # 禁用双击修改指标名称公式
                     self.score_board_manager.editing_row = -2
                     
                 self.label.ms_board.step('lr', (i, j))
@@ -688,7 +687,7 @@ def dump_evf_file_data(self):
             self.label.ms_board.player_identifier = self.player_identifier
             self.label.ms_board.race_identifier = self.race_identifier
             self.label.ms_board.uniqueness_identifier = self.unique_identifier
-            self.label.ms_board.country = country_name[self.country].upper()
+            self.label.ms_board.country = "XX" if not self.country else country_name[self.country].upper()
             self.label.ms_board.device_uuid = hashlib.md5(bytes(str(uuid.getnode()).encode())).hexdigest().encode( "UTF-8" )
     
             self.label.ms_board.generate_evf_v4_raw_data()
@@ -724,6 +723,8 @@ def save_evf_file(self):
             filename_level = "e_"
         else:
             filename_level = "c_"
+        if self.game_state == "display" or self.game_state == "showdisplay":
+            self.label.ms_board.current_time = 999999.9
         file_name = self.replay_path + '\\' + filename_level +\
                          f'{self.label.ms_board.mode}' + '_' +\
                              f'{self.label.ms_board.rtime:.3f}' +\
@@ -1061,11 +1062,7 @@ def action_NEvent(self):
         if ui.alter:
             
             self.pixSize = ui.pixSize
-            # for i in range(4):
-            #     self.predefinedBoardPara[i]['pix_size'] = ui.pixSize
-
             self.gameStart()
-            
             self.gameMode = ui.gameMode
             self.auto_replay = ui.auto_replay
             self.end_then_flag = ui.end_then_flag
@@ -1086,24 +1083,24 @@ def action_NEvent(self):
                 self.predefinedBoardPara[1]['attempt_times_limit'] = self.attempt_times_limit
                 self.predefinedBoardPara[1]['board_constraint'] = self.board_constraint
                 self.predefinedBoardPara[1]['gamemode'] = ui.gameMode
-                # self.predefinedBoardPara[1]['pix_size'] = ui.pixSize
             elif (self.row, self.column, self.mineNum) == (16, 16, 40):
                 self.predefinedBoardPara[2]['attempt_times_limit'] = self.attempt_times_limit
                 self.predefinedBoardPara[2]['board_constraint'] = self.board_constraint
                 self.predefinedBoardPara[2]['gamemode'] = ui.gameMode
-                # self.predefinedBoardPara[2]['pix_size'] = ui.pixSize
             elif (self.row, self.column, self.mineNum) == (16, 30, 99):
                 self.predefinedBoardPara[3]['attempt_times_limit'] = self.attempt_times_limit
                 self.predefinedBoardPara[3]['board_constraint'] = self.board_constraint
                 self.predefinedBoardPara[3]['gamemode'] = ui.gameMode
-                # self.predefinedBoardPara[3]['pix_size'] = ui.pixSize
             else:
                 self.predefinedBoardPara[0]['attempt_times_limit'] = self.attempt_times_limit
                 self.predefinedBoardPara[0]['board_constraint'] = self.board_constraint
                 self.predefinedBoardPara[0]['gamemode'] = ui.gameMode
-                # self.predefinedBoardPara[0]['pix_size'] = ui.pixSize
 
             self.mainWindow.setWindowOpacity(ui.transparency / 100)
+            for child in self.mainWindow.findChildren(QWidget):
+                # 设置子窗口的透明度
+                child.setWindowOpacity(ui.transparency / 100)
+            
             self.score_board_manager.with_namespace({
                 "race_identifier": ui.race_identifier,
                 "mode": self.gameMode,
@@ -1413,7 +1410,8 @@ def play_video(self, video):
         self.video_time_step = 0.01 # 录像时间的步长，定时器始终是10毫秒
         self.label.paint_cursor = True
         self.video_playing = True # 录像正在播放
-        self.timer_video.start(10)
+        # 禁用双击修改指标名称公式
+        self.score_board_manager.editing_row = -2
 
         video.video_playing_pix_size = self.label.pixSize
         self.label.ms_board = video
@@ -1422,6 +1420,8 @@ def play_video(self, video):
         self.label_info.setText(self.label.ms_board.player_identifier)
         # 改成录像的国旗
         self.set_country_flag(self.label.ms_board.country)
+        
+        self.timer_video.start(10)
 
 
     def video_playing_step(self):
@@ -1558,17 +1558,10 @@ def closeEvent_(self):
         else:
             self.game_setting.set_value("CUSTOM/gamemode", str(self.gameMode))
             self.game_setting.set_value("CUSTOM/pixsize", str(self.pixSize))
-            
+
         self.game_setting.sync()
-        
         self.record_setting.sync()
 
-        # conf = configparser.ConfigParser()
-        # conf.read(self.record_path, encoding='utf-8')
-        # for key_name in self.record_key_name_list:
-        #     conf[key_name] = self.record[key_name]
-        # with open(self.record_path, 'w') as configfile:
-        #     conf.write(configfile)  # 将对象写入文件
 
 
 
diff --git a/src/superGUI.py b/src/superGUI.py
@@ -23,6 +23,7 @@ def __init__(self, file_path):
         self.file_path = file_path
         # QSettings的键名是无序的，无法使用
         self.config = configparser.ConfigParser()
+        self.config.default_section = ""
         # 如果文件不存在则创建
         if not os.path.exists(file_path):
             with open(file_path, 'w', encoding="utf-8"):
@@ -53,7 +54,7 @@ def value(self, key, default=None, value_type=str):
         :return: 获取到的值或默认值
         """
         section, key = self._parse_key(key)
-        if section != "DEFAULT" and not self.config.has_section(section):
+        if not self.config.has_section(section):
             return default
         if self.config.has_option(section, key):
             if value_type == int:
@@ -90,7 +91,7 @@ def get_or_set_section(self, section, default: List[Tuple[str,str]],
         :param force_add: 是否强制补全default中的所有键
         :return: section 的内容
         """
-        if section != "DEFAULT" and not self.config.has_section(section):
+        if not self.config.has_section(section):
             self.config.add_section(section)
             for (key, value) in default:
                 self.config.set(section, str(key), str(value))
@@ -111,7 +112,7 @@ def set_value(self, key, value):
         :param value: 要设置的值
         """
         section, key = self._parse_key(key)
-        if section != "DEFAULT" and not self.config.has_section(section):
+        if not self.config.has_section(section):
             self.config.add_section(section)
         self.config.set(section, key, str(value))
         
@@ -138,7 +139,7 @@ def set_section(self, section, section_value: List[Tuple[str,str]]):
                 key_set.add(new_key)
                 section_value[idv] = (new_key, v[1])
                     
-        if section != "DEFAULT" and not self.config.has_section(section):
+        if not self.config.has_section(section):
             self.config.add_section(section)
             
         # 遍历并删除每个 option
@@ -342,7 +343,7 @@ def readPredefinedBoardPara(self):
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("CUSTOM", s, True)
-        self.predefinedBoardPara[0] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[0] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
         s = [
             ("gamemode", 0),
             ("row", 8),
@@ -353,7 +354,7 @@ def readPredefinedBoardPara(self):
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("BEGINNER", s, True)
-        self.predefinedBoardPara[1] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[1] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
         s = [
             ("gamemode", 0),
             ("row", 16),
@@ -364,18 +365,18 @@ def readPredefinedBoardPara(self):
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("INTERMEDIATE", s, True)
-        self.predefinedBoardPara[2] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[2] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
         s = [
             ("gamemode", 0),
             ("row", 16),
             ("column", 30),
             ("pixsize", 20),
-            ("mine_num", 90),
+            ("mine_num", 99),
             ("board_constraint", ""),
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("EXPERT", s, True)
-        self.predefinedBoardPara[3] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[3] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
         s = [
             ("gamemode", 5),
             ("row", 16),
@@ -386,7 +387,7 @@ def readPredefinedBoardPara(self):
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("CUSTOM_PRESET_4", s, True)
-        self.predefinedBoardPara[4] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[4] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
         s = [
             ("gamemode", 5),
             ("row", 16),
@@ -397,7 +398,7 @@ def readPredefinedBoardPara(self):
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("CUSTOM_PRESET_5", s, True)
-        self.predefinedBoardPara[5] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[5] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
         s = [
             ("gamemode", 5),
             ("row", 24),
@@ -408,7 +409,7 @@ def readPredefinedBoardPara(self):
             ("attempt_times_limit", 100000),
             ]
         s = self.game_setting.get_or_set_section("CUSTOM_PRESET_6", s, True)
-        self.predefinedBoardPara[6] = { k: int(v) if v.isdigit() else v for (k, v) in s }
+        self.predefinedBoardPara[6] = { k: int(v) if isinstance(v, str) and v.isdigit() else v for (k, v) in s }
 
 
     def minimumWindow(self):
diff --git a/src/ui/uiComponents.py b/src/ui/uiComponents.py
@@ -163,11 +163,10 @@ def __init__(self, parent=None):
     def reloadFace(self, pixSize):
         # 重新修改脸的大小，叫rescale_face更妥
         self.pixSize = pixSize
-        self.pixmap1 = QPixmap(self.smilefacedown_path).scaled(int(self.pixSize * 1.5), int(self.pixSize * 1.5))
-        self.pixmap2 = QPixmap(self.smileface_path).scaled(int(self.pixSize * 1.5), int(self.pixSize * 1.5))
-        # self.resize(QtCore.QSize(int(self.pixSize * 1.5), int(self.pixSize * 1.5)))
-        self.setMinimumSize(QtCore.QSize(int(self.pixSize * 1.5), int(self.pixSize * 1.5)))
-        self.setMaximumSize(QtCore.QSize(int(self.pixSize * 1.5), int(self.pixSize * 1.5)))
+        self.pixmap1 = QPixmap(self.smilefacedown_path).scaled(int(pixSize * 1.5), int(pixSize * 1.5))
+        self.pixmap2 = QPixmap(self.smileface_path).scaled(int(pixSize * 1.5), int(pixSize * 1.5))
+        self.setMinimumSize(QtCore.QSize(int(pixSize * 1.5), int(pixSize * 1.5)))
+        self.setMaximumSize(QtCore.QSize(int(pixSize * 1.5), int(pixSize * 1.5)))
 
     def setPath(self, r_path):
         # 告诉脸，相对路径
