feat: 给计数器添加log, sin, tan, cos, row, column, minenum函数和变量

Author: eee555

src/gameDefinedParameter.py

@@ -11,7 +11,7 @@ class ui_Form(Ui_Form):
     def __init__(self, r_path, row, column, num, parent):
         self.row = row
         self.column = column
-        self.mineNum = num
+        self.minenum = num
         # self.maxRow = 1e6
         # self.maxColumn = 1e6
         self.alter = False
@@ -33,7 +33,7 @@ def __init__(self, r_path, row, column, num, parent):
     def setParameter(self):
         self.spinBox.setValue (self.row)
         self.spinBox_2.setValue (self.column)
-        self.spinBox_3.setValue (self.mineNum)
+        self.spinBox_3.setValue (self.minenum)
         self.change_minenum_limit()
         self.spinBox.valueChanged.connect(self.change_minenum_limit)
         self.spinBox_2.valueChanged.connect(self.change_minenum_limit)
@@ -47,11 +47,11 @@ def processParameter(self):
         r = self.spinBox.value ()
         c = self.spinBox_2.value ()
         n = self.spinBox_3.value ()
-        if r != self.row or c != self.column or n != self.mineNum:
+        if r != self.row or c != self.column or n != self.minenum:
             self.alter = True
             self.row = r
             self.column = c
-            self.mineNum = min (max (n, 1), r * c - 1)
+            self.minenum = min (max (n, 1), r * c - 1)
         self.Dialog.close ()
 
 

src/gameScoreBoard.py

@@ -140,9 +140,9 @@ def update_score_board_items_type(self):
                 self.score_board_items_type.append(1)
 
     def with_namespace(self, namespace: dict):
-        # 埋雷结束后调用，固化参数
-        # self.pix_size = pix_size
-        # self.board = board
+        '''
+        给计数器添加变量和值。非覆盖，而是可以叠加。
+        '''
         if "mode" in namespace:
             self._game_mode_code: int = namespace["mode"]
             namespace["mode"] = mm.trans_game_mode(namespace["mode"])

src/gameSettings.py

@@ -19,7 +19,7 @@ def __init__(self, mainWindow):
         self.pixSize = mainWindow.pixSize
         self.row = mainWindow.row
         self.column = mainWindow.column
-        self.mineNum = mainWindow.mineNum
+        self.minenum = mainWindow.minenum
 
         self.auto_replay = self.game_setting.value('DEFAULT/auto_replay', None, int)
         self.auto_notification = self.game_setting.value('DEFAULT/auto_notification', None, bool)
@@ -143,38 +143,38 @@ def processParameter(self):
         self.game_setting.set_value("DEFAULT/race_identifier", self.race_identifier)
         self.game_setting.set_value("DEFAULT/unique_identifier", self.unique_identifier)
         self.game_setting.set_value("DEFAULT/country", self.country)
-        if (self.row, self.column, self.mineNum) == (8, 8, 10):
+        if (self.row, self.column, self.minenum) == (8, 8, 10):
             self.game_setting.set_value("BEGINNER/gamemode", self.gameMode)
             self.game_setting.set_value("BEGINNER/board_constraint", self.board_constraint)
             self.game_setting.set_value("BEGINNER/attempt_times_limit", self.attempt_times_limit)
             self.game_setting.set_value("BEGINNER/pixsize", self.pixSize)
-        elif (self.row, self.column, self.mineNum) == (16, 16, 40):
+        elif (self.row, self.column, self.minenum) == (16, 16, 40):
             self.game_setting.set_value("INTERMEDIATE/gamemode", self.gameMode)
             self.game_setting.set_value("INTERMEDIATE/board_constraint", self.board_constraint)
             self.game_setting.set_value("INTERMEDIATE/attempt_times_limit", self.attempt_times_limit)
             self.game_setting.set_value("INTERMEDIATE/pixsize", self.pixSize)
-        elif (self.row, self.column, self.mineNum) == (16, 30, 99):
+        elif (self.row, self.column, self.minenum) == (16, 30, 99):
             self.game_setting.set_value("EXPERT/gamemode", self.gameMode)
             self.game_setting.set_value("EXPERT/board_constraint", self.board_constraint)
             self.game_setting.set_value("EXPERT/attempt_times_limit", self.attempt_times_limit)
             self.game_setting.set_value("EXPERT/pixsize", self.pixSize)
-        elif (self.row, self.column, self.mineNum) ==\
+        elif (self.row, self.column, self.minenum) ==\
             (self.game_setting.value("CUSTOM_PRESET_4/row", None, int),
              self.game_setting.value("CUSTOM_PRESET_4/column", None, int),
              self.game_setting.value("CUSTOM_PRESET_4/mine_num", None, int)):
             self.game_setting.set_value("CUSTOM_PRESET_4/gamemode", self.gameMode)
             self.game_setting.set_value("CUSTOM_PRESET_4/board_constraint", self.board_constraint)
             self.game_setting.set_value("CUSTOM_PRESET_4/attempt_times_limit", self.attempt_times_limit)
             self.game_setting.set_value("CUSTOM_PRESET_4/pixsize", self.pixSize)
-        elif (self.row, self.column, self.mineNum) ==\
+        elif (self.row, self.column, self.minenum) ==\
             (self.game_setting.value("CUSTOM_PRESET_5/row", None, int),
              self.game_setting.value("CUSTOM_PRESET_5/column", None, int),
              self.game_setting.value("CUSTOM_PRESET_5/mine_num", None, int)):
             self.game_setting.set_value("CUSTOM_PRESET_5/gamemode", self.gameMode)
             self.game_setting.set_value("CUSTOM_PRESET_5/board_constraint", self.board_constraint)
             self.game_setting.set_value("CUSTOM_PRESET_5/attempt_times_limit", self.attempt_times_limit)
             self.game_setting.set_value("CUSTOM_PRESET_5/pixsize", self.pixSize)
-        elif (self.row, self.column, self.mineNum) ==\
+        elif (self.row, self.column, self.minenum) ==\
             (self.game_setting.value("CUSTOM_PRESET_6/row", None, int),
              self.game_setting.value("CUSTOM_PRESET_6/column", None, int),
              self.game_setting.value("CUSTOM_PRESET_6/mine_num", None, int)):