fix：python升级3.12、api改名

Author: eee555

README.md

@@ -86,7 +86,7 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 ### 方案3：从源码安装(不推荐)
 **请注意**：通过此方法安装的软件，不能对录像文件进行正确的签名。即，自行打包的软件，其生成的录像文件，无法通过`正版`的软件的校验。但其余功能保证与`正版`相同。同时，如有需要，玩家可通过这种方式安装来自行制作改版，并自行实现秘密的签名。  
 在编译之前，请确保自己拥有：
-*   Python >=3.7, <=3.11（推荐3.10，即打包使用的版本）
+*   Python >=3.10, <=3.12（推荐3.12，即打包使用的版本）
 *   会用Powershell或者其它命令行工具的能力
 
 以下为安装步骤：

requirements.txt

@@ -1,2 +1,7 @@
 pyQt5==5.15.7
-ms-toollib==1.4.19
+ms-toollib==1.4.19
+setuptools==70.2.0
+
+
+
+

src/captureScreen.py

@@ -100,7 +100,7 @@ def getBoard(self):
         self.data = s.unpack(bits[0:])
         self.success_flag = True
         try:
-            self.board = ms_toollib.OBR_board(self.data, self.height, self.width)
+            self.board = ms_toollib.obr_board(self.data, self.height, self.width)
         except:
             self.success_flag = False
 

src/mineSweeperGUI.py

@@ -416,11 +416,13 @@ def mineAreaLeftRelease(self, i, j):
                     # 正式埋雷开始
                     self.layMine(i // self.pixSize, j // self.pixSize)
 
+                    # 只有没有“局面约束”时，录像才可能是“official”的
                     if self.board_constraint:
                         self.game_state = 'joking'
                     else:
                         self.game_state = 'playing'
 
+                    # 假如未开启“直播模式”，禁用代码截图
                     if self.player_identifier[:6] != "[live]":
                         self.disable_screenshot()
                     else:
@@ -527,7 +529,7 @@ def mineMouseMove(self, i, j):
                 self.label_info.setText('(是雷的概率)')
             else:
                 text4 = '{:.3f}'.format(
-                    max(0, self.label.boardPossibility[i//self.pixSize][j//self.pixSize]))
+                    max(0, self.label.boardProbability[i//self.pixSize][j//self.pixSize]))
                 self.label_info.setText(text4)
         # 播放录像时的鼠标移动事件
         elif self.game_state == 'showdisplay':
@@ -600,7 +602,7 @@ def gameStart(self):
         self.timer_10ms.stop()
         self.score_board_manager.editing_row = -1
 
-        self.label.paintPossibility = False
+        self.label.paintProbability = False
         self.label_info.setText(self.player_identifier)
 
         # 这里有点乱
@@ -652,7 +654,7 @@ def gameRestart(self, e=None):  # 画界面，但是不埋雷，改数据而不
         self.label.ms_board.reset(self.row, self.column, self.pixSize)
         self.label.update()
 
-        self.label.paintPossibility = False
+        self.label.paintProbability = False
         # self.label.paint_cursor = False
         # self.label.setMouseTracking(False) # 鼠标未按下时，组织移动事件回调
 
@@ -1105,7 +1107,7 @@ def setBoard_and_start(self, row, column, mineNum):
         # 把局面设置成(row, column, mineNum)，把3BV的限制设置成min3BV, max3BV
         # 比gameStart更高级
         if self.game_state == 'display' or self.game_state == 'showdisplay':
-            self.label.paintPossibility = False
+            self.label.paintProbability = False
         if (self.row, self.column, self.mineNum) != (row, column, mineNum):
             self.setBoard(row, column, mineNum)
             self.gameStart()
@@ -1220,6 +1222,7 @@ def screenShot(self):
             self.video_playing = False
             self.timer_video.stop()
 
+        self.unlimit_cursor()
         self.enable_screenshot()
 
         ui = captureScreen.CaptureScreen()
@@ -1231,7 +1234,7 @@ def screenShot(self):
 
         # 会报两种runtimeerror，标记阶段无解的局面、枚举阶段无解的局面
         try:
-            ans = ms.cal_possibility_onboard(
+            ans = ms.cal_probability_onboard(
                 ui.board, 0.20625 if len(ui.board[0]) >= 24 else 0.15625)
         except:
             return
@@ -1279,15 +1282,15 @@ def screenShot(self):
         # self.setBoard_and_start(len(ui.board), len(ui.board[0]), ans[1][1])
         self.setBoard(self.row, self.column, ans[1][1])
 
-        self.label.paintPossibility = True
+        self.label.paintProbability = True
         self.label.set_rcp(self.row, self.column, self.pixSize)
 
         self.label.ms_board.game_board = ui.board
         self.label.ms_board.mouse_state = 1
         self.label.ms_board.game_board_state = 1
         self.mineNumShow = ans[1][1]
         self.showMineNum(self.mineNumShow)
-        self.label.boardPossibility = ans[0]
+        self.label.boardProbability = ans[0]
 
         self.label.update()
         # self.label.setMouseTracking(True)
@@ -1297,26 +1300,26 @@ def screenShot(self):
     def render_poss_on_board(self):
         # 雷数条拉动后、改局面后，显示雷数并展示
         try:
-            ans = ms.cal_possibility_onboard(
+            ans = ms.cal_probability_onboard(
                 self.label.ms_board.game_board, self.mineNumShow)
         except:
             try:
-                ans = ms.cal_possibility_onboard(self.label.ms_board.game_board,
+                ans = ms.cal_probability_onboard(self.label.ms_board.game_board,
                                                  self.mineNumShow / self.row / self.column)
             except:
                 # 无解，算法增加雷数后无解
-                self.label.paintPossibility = False
+                self.label.paintProbability = False
                 self.num_bar_ui.QWidget.hide()
                 self.label.update()
                 return
             else:
                 # 无解，算法增加雷数后有解
                 self.mineNumShow = ans[1][1]
-                self.label.boardPossibility = ans[0]
-                self.label.paintPossibility = True
+                self.label.boardProbability = ans[0]
+                self.label.paintProbability = True
 
-        self.label.boardPossibility = ans[0]
-        self.label.paintPossibility = True
+        self.label.boardProbability = ans[0]
+        self.label.paintProbability = True
         self.num_bar_ui.QWidget.show()
         self.num_bar_ui.spinBox.setMinimum(ans[1][0])
         self.num_bar_ui.spinBox.setMaximum(ans[1][2])
@@ -1342,34 +1345,34 @@ def showScores(self):
             ...
         elif self.game_state == 'playing' or self.game_state == 'joking':
             self.game_state = 'show'
-            self.label.paintPossibility = True
+            self.label.paintProbability = True
             # self.label.setMouseTracking(True)
             mineNum = self.mineNum
             # 删去用户标的雷，因为可能标错
             # game_board = list(map(lambda x: list(map(lambda y: min(y, 10), x)),
             #                  self.label.ms_board.game_board))
-            ans = ms.cal_possibility_onboard(
+            ans = ms.cal_probability_onboard(
                 self.label.ms_board.game_board, mineNum)
-            self.label.boardPossibility = ans[0]
+            self.label.boardProbability = ans[0]
             self.label.update()
 
     def mineKeyReleaseEvent(self, keyName):
         # 松开空格键
         if keyName == 'Space':
             if self.game_state == 'show':
                 self.game_state = 'joking'
-                self.label.paintPossibility = False
+                self.label.paintProbability = False
                 # self.label.setMouseTracking(False)
                 self.label_info.setText(self.player_identifier)
                 self.label.update()
             elif self.game_state == 'display':
                 self.game_state = 'showdisplay'
-                self.label.paintPossibility = True
+                self.label.paintProbability = True
                 # self.label.setMouseTracking(True)
                 self.label.update()
             elif self.game_state == 'showdisplay':
                 self.game_state = 'display'
-                self.label.paintPossibility = False
+                self.label.paintProbability = False
                 # self.label.setMouseTracking(False)
                 self.label.update()
 
@@ -1448,7 +1451,7 @@ def play_video(self, video):
         # 调整窗口
         if (video.row, video.column) != (self.row, self.column):
             self.setBoard(video.row, video.column, video.mine_num)
-            self.label.paintPossibility = False
+            self.label.paintProbability = False
             self.label.set_rcp(self.row, self.column, self.pixSize)
             # self.label.reloadCellPic(self.pixSize)
             self.label.setMinimumSize(QtCore.QSize(
@@ -1602,8 +1605,11 @@ def limit_cursor(self):
         rect = QRect(widget_pos, widget_size)
         self._clip_mouse(rect)
 
-    # 取消将鼠标区域限制在游戏界面中
+    
     def unlimit_cursor(self):
+        '''
+        取消将鼠标区域限制在游戏界面中。
+        '''
         ctypes.windll.user32.ClipCursor(None)
 
     def _clip_mouse(self, rect):

src/ui/mineLabel.py

@@ -28,7 +28,7 @@ def __init__(self, parent):
         self.mouse.addPolygon(mouse_)
         self.setMouseTracking(True)
         self.paint_cursor = False # 是否画光标。不仅控制画光标，还代表了是游戏还是播放录像。
-        self.paintPossibility = False
+        self.paintProbability = False
 
     def setPath(self, r_path):
         # 告诉局面控件，相对路径
@@ -50,10 +50,10 @@ def setPath(self, r_path):
 
     def set_rcp(self, row, column, pixSize):
         # ui层面，重设一下宽、高、大小
-        # self.paintPossibility = False  # 是否打印概率
+        # self.paintProbability = False  # 是否打印概率
         self.row = row
         self.column = column
-        if self.paintPossibility:
+        if self.paintProbability:
             # self.ms_board = mm.abstract_game_board()
             self.ms_board = mm.CoreBaseVideo([[0] * column for _ in range(row)], pixSize)
         else:
@@ -65,7 +65,7 @@ def set_rcp(self, row, column, pixSize):
                     self.ms_board.reset(row, column, pixSize)
             else:
                 self.ms_board = ms.BaseVideo([[0] * column for _ in range(row)], pixSize)
-            self.boardPossibility = [[0.0] * column for _ in range(row)]
+            self.boardProbability = [[0.0] * column for _ in range(row)]
 
         if self.pixSize != pixSize:
             self.pixSize = pixSize
@@ -166,7 +166,7 @@ def paintEvent(self, event):
             game_board_state = self.ms_board.game_board_state
             current_x = self.current_x // self.pixSize
             current_y = self.current_y // self.pixSize
-            # poss = self.boardPossibility
+            # poss = self.boardProbability
         painter.begin(self)
         # 画游戏局面
         row = len(game_board)
@@ -175,11 +175,11 @@ def paintEvent(self, event):
             for j in range(column):
                 if game_board[i][j] == 10:
                     painter.drawPixmap(j * pix_size + 4, i * pix_size + 4, QPixmap(self.pixmapNum[10]))
-                    if self.paintPossibility: # 画概率
+                    if self.paintProbability: # 画概率
                         if self.paint_cursor:
                             painter.setOpacity(self.ms_board.game_board_poss[i][j])
                         else:
-                            painter.setOpacity(self.boardPossibility[i][j])
+                            painter.setOpacity(self.boardProbability[i][j])
                         painter.drawPixmap(j * pix_size + 4, i * pix_size + 4, QPixmap(self.pixmapNum[100]))
                         painter.setOpacity(1.0)
                 else: