chore：文件更名

Author: eee555

src/gameScoreBoard.py

@@ -228,11 +228,12 @@ def update_namespace(self, ms_board, index_type):
                 "rce": ms_board.rce,
                 "lce": ms_board.lce,
                 "dce": ms_board.dce,
-                })
-        if index_type >= 3:
-            self.namespace.update({
                 "pluck": ms_board.pluck,
                 })
+        # if index_type >= 3:
+        #     self.namespace.update({
+        #         "pluck": ms_board.pluck,
+        #         })
 
 
     def show(self, ms_board, index_type):
@@ -256,9 +257,12 @@ def reshow(self, ms_board, index_type = 0):
                 or self.ms_board.game_board_state == 2\
                     or self.ms_board.game_board_state == 5:
                 index_type = 1
-            else:
+            elif self.ms_board.game_board_state == 3\
+                or self.ms_board.game_board_state == 4:
                 # 3、4为win和loss
                 index_type = 2
+            elif self.ms_board.game_board_state == 6:
+                index_type = 3
 
         # 指标数量有变。增删指标用。游戏开始前。index_type是2
         self.ms_board = ms_board

src/mineSweeperGUI.py

@@ -11,7 +11,7 @@
 import captureScreen, mine_num_bar, videoControl, gameRecordPop
 from CheckUpdateGui import CheckUpdateGui
 from githubApi import GitHub, SourceManager
-import minesweeper_master as mm
+import utils
 import ms_toollib as ms
 # import configparser
 # from pathlib import Path
@@ -213,11 +213,12 @@ def game_state(self):
     def game_state(self, game_state: str):
         # print(self._game_state, " -> " ,game_state)
         match self._game_state:
-            case "playing" | "joking":
+            case "playing":
                 if game_state not in ("playing", "show", "joking"):
                     self.timer_10ms.stop()
                     self.unlimit_cursor()
-            case "show":
+                # if game_state in ("study", "joking", "jowin", "jofail", "show"):
+            case "joking" | "show":
                 if game_state not in ("playing", "show", "joking"):
                     self.timer_10ms.stop()
                     self.unlimit_cursor()
@@ -284,13 +285,13 @@ def layMine(self, i, j):
         # 弱无猜7、准无猜8、强可猜9、弱可猜10
         if self.gameMode == 5 or self.gameMode == 6 or self.gameMode == 9:
             # 根据模式生成局面
-            Board, _ = mm.laymine_solvable(self.board_constraint,
+            Board, _ = utils.laymine_solvable(self.board_constraint,
                                            self.attempt_times_limit, (xx, yy, num, i, j))
         elif self.gameMode == 0 or self.gameMode == 7 or self.gameMode == 8 or self.gameMode == 10:
-            Board, _ = mm.laymine(self.board_constraint,
+            Board, _ = utils.laymine(self.board_constraint,
                                   self.attempt_times_limit, (xx, yy, num, i, j))
         elif self.gameMode == 4:
-            Board, _ = mm.laymine_op(self.board_constraint,
+            Board, _ = utils.laymine_op(self.board_constraint,
                                      self.attempt_times_limit, (xx, yy, num, i, j))
 
         self.label.ms_board.board = Board
@@ -345,22 +346,22 @@ def ai(self, i, j):
                 board[i][j] = -1
                 self.label.ms_board.board = board
             elif code == 2:
-                board, flag = mm.enumerateChangeBoard(self.label.ms_board.board,
+                board, flag = utils.enumerateChangeBoard(self.label.ms_board.board,
                                                       self.label.ms_board.game_board, [(i, j)])
                 self.label.ms_board.board = board
             return
         elif self.gameMode == 8:
             code = ms.is_guess_while_needless(
                 self.label.ms_board.game_board, (i, j))
             if code == 2:
-                board, flag = mm.enumerateChangeBoard(self.label.ms_board.board,
+                board, flag = utils.enumerateChangeBoard(self.label.ms_board.board,
                                                       self.label.ms_board.game_board, [(i, j)])
                 self.label.ms_board.board = board
             return
         elif self.gameMode == 9 or self.gameMode == 10:
             if self.label.ms_board.board[i][j] == -1:
                 # 可猜调整的核心逻辑
-                board, flag = mm.enumerateChangeBoard(self.label.ms_board.board,
+                board, flag = utils.enumerateChangeBoard(self.label.ms_board.board,
                                                       self.label.ms_board.game_board, [(i, j)])
 
                 self.label.ms_board.board = board
@@ -418,7 +419,7 @@ def chording_ai(self, i, j):
                     must_guess = False
                     break
             if must_guess:
-                board, flag = mm.enumerateChangeBoard(board,
+                board, flag = utils.enumerateChangeBoard(board,
                                                       self.label.ms_board.game_board,
                                                       not_mine_round + is_mine_round)
                 self.label.ms_board.board = board
@@ -435,12 +436,12 @@ def chording_ai(self, i, j):
                     must_guess = False
                     break
             if must_guess:
-                board, flag = mm.enumerateChangeBoard(board,
+                board, flag = utils.enumerateChangeBoard(board,
                                                       self.label.ms_board.game_board,
                                                       not_mine_round + is_mine_round)
                 self.label.ms_board.board = board
         elif self.gameMode == 9 or self.gameMode == 10:
-            board, flag = mm.enumerateChangeBoard(board,
+            board, flag = utils.enumerateChangeBoard(board,
                                                   self.label.ms_board.game_board,
                                                   not_mine_round + is_mine_round)
             self.label.ms_board.board = board
@@ -681,7 +682,7 @@ def gameRestart(self, e=None):  # 画界面，但是不埋雷，改数据而不
             # 点脸周围时，会传入一个e参数
             if not (self.MinenumTimeWigdet.width() >= e.localPos().x() >= 0 and 0 <= e.localPos().y() <= self.MinenumTimeWigdet.height()):
                 return
-        # 此时self.label.ms_board是mm.abstract_game_board的实例
+        # 此时self.label.ms_board是utils.abstract_game_board的实例
         if self.game_state == 'display' or self.game_state == 'showdisplay':
             # self.timer_video.stop()
             # self.ui_video_control.QWidget.close()
@@ -730,11 +731,8 @@ def gameFinished(self):
             # "column": self.column,
             # "minenum": self.minenum,
         })
-        self.label.ms_board.analyse_for_features(["high_risk_guess", "jump_judge",
-                                                  "needless_guess","mouse_trace",
-                                                  "vision_transfer", "survive_poss"])
 
-        self.score_board_manager.show(self.label.ms_board, index_type=3)
+        self.score_board_manager.show(self.label.ms_board, index_type=2)
         self.enable_screenshot()
         self.unlimit_cursor()
 
@@ -857,17 +855,15 @@ def gameFailed(self):  # 失败后改脸和状态变量
         self.timer_10ms.stop()
         self.score_board_manager.editing_row = -1
 
-        if self.game_state == 'joking':
-            self.game_state = 'jofail'
-        else:
-            self.game_state = 'fail'
-
-        self.set_face(16)
-
         # “自动重开比例”，大于等于该比例时，不自动重开。负数表示禁用。0相当于禁用，但可以编辑。
         if self.label.ms_board.bbbv_solved / self.label.ms_board.bbbv * 100 < self.auto_replay:
             self.gameRestart()
         else:
+            if self.game_state == 'joking':
+                self.game_state = 'jofail'
+            else:
+                self.game_state = 'fail'
+            self.set_face(16)
             self.gameFinished()
 
     def try_record_pop(self):
@@ -1337,7 +1333,7 @@ def screenShot(self):
         self.timer_10ms.stop()
         self.score_board_manager.invisible()
 
-        # self.label.ms_board = mm.abstract_game_board()
+        # self.label.ms_board = utils.abstract_game_board()
         # self.label.ms_board.mouse_state = 1
         # self.label.ms_board.game_board_state = 1
         # self.label.ms_board.game_board = ui.board
@@ -1528,7 +1524,8 @@ def play_video(self, video):
             "minenum": video.mine_num,
         })
         video.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
-                                    "mouse_trace", "vision_transfer", "survive_poss"])
+                                    "mouse_trace", "vision_transfer", "pluck",
+                                    "super_fl_local"])
 
         # 组织录像评论
         comments = []