fix：点一下不能获胜，自定义雷数限制

Author: eee555

src/gameDefinedParameter.py

@@ -29,10 +29,19 @@ def __init__(self, r_path, row, column, num):
 "font: 16pt \"黑体\";\n"
 "color:white;font: bold;")
 
+        
     def setParameter(self):
         self.spinBox.setValue (self.row)
         self.spinBox_2.setValue (self.column)
         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)
+        
+    def change_minenum_limit(self):
+        minenum_limit = self.spinBox.value () * self.spinBox_2.value () - 1
+        self.spinBox_3.setValue (min(self.spinBox_3.value (), minenum_limit))
+        self.spinBox_3.setMaximum(minenum_limit)
 
     def processParameter(self):
         r = self.spinBox.value ()
@@ -42,16 +51,17 @@ def processParameter(self):
             self.alter = True
             self.row = r
             self.column = c
-            self.mineNum = min (max (n, 2), r * c - 1)
+            self.mineNum = min (max (n, 1), r * c - 1)
         self.Dialog.close ()
 
 
 if __name__ == '__main__':
-    from PyQt5.QtWidgets import QApplication
-    import sys
-    app = QApplication(sys.argv)
-    demo = ui_Form(8, 8, 10)
-    demo.Dialog.show()
-    sys.exit(app.exec_())
+    # from PyQt5.QtWidgets import QApplication
+    # import sys
+    # app = QApplication(sys.argv)
+    # demo = ui_Form(8, 8, 10)
+    # demo.Dialog.show()
+    # sys.exit(app.exec_())
+    ...
 
 

src/mineSweeperGUI.py

@@ -222,7 +222,21 @@ def mineAreaLeftRelease(self, i, j):
                     self.timer_10ms.start()
                     self.score_board_manager.editing_row = -2
                 self.label.ms_board.step('lr', (i, j)) # 把这个删了也能开始，不知道为什么
-                self.label.update()
+                # print(self.label.ms_board.game_board)
+                # print(self.label.ms_board.game_board_state)
+                
+                if self.label.ms_board.game_board_state == 3:
+                    # 点一下可能获胜
+                    self.gameWin()
+                    self.label.update()
+                    return
+                elif self.label.ms_board.game_board_state == 4:
+                    # 点一下不可能踩雷，但为完整性需要这样写
+                    self.gameFailed()
+                    self.label.update()
+                    return
+                else:
+                    self.label.update()
             self.set_face(14)
         elif self.game_state == 'playing' or self.game_state == 'joking':
             # 如果是游戏中，且是左键抬起（不是双击），且是在10上，且在局面内，则用ai劫持、处理下
@@ -479,10 +493,12 @@ def gameWin(self):  # 成功后改脸和状态变量，停时间
         self.timer_10ms.stop()
         self.score_board_manager.editing_row = -1
 
-        if self.game_state == 'joking':
+        if self.game_state == 'joking' or self.game_state == 'show':
             self.game_state = 'jowin'
-        else:
+        elif self.game_state == 'playing':
             self.game_state = 'win'
+        else:
+            raise RuntimeError
         self.set_face(17)
 
         if self.autosave_video and self.checksum_module_ok():
@@ -841,6 +857,11 @@ def action_AEvent(self):
     def screenShot(self):
         # ‘ctrl’ + ‘space’ 事件，启动截图
 
+        if self.game_state == "playing":
+            self.game_state = "joking"
+        if not self.SetWindowDisplayAffinity(self.hwnd, 0x00000000):
+            raise ctypes.WinError()
+                
         ui = captureScreen.CaptureScreen()
         ui.show()
         ui.exec_()

src/minesweeper_master.py

@@ -11,8 +11,7 @@
 
 # OutputEnable = 0
 # seedNum = 60223
-# EnuLimit = 40
-EnuLimit = 4
+EnuLimit = 40
 
 def choose_3BV(board_constraint, attempt_times_limit, params):
     # def choose_3BV_laymine(laymine):
@@ -215,7 +214,7 @@ def enumerateChangeBoard(board, BoardofGame, xx, yy) -> (List[List[int]], bool):
     if not isinstance(board, list):
         board = board.into_vec_vec()
     if ms.is_guess_while_needless(BoardofGame, (xx, yy)) == 4:
-        return board, False
+        return board, False# 踩到必然的雷
 
     MatrixA, Matrixx, Matrixb = ms.refresh_matrix(BoardofGame)
     MatrixColumn = len(Matrixx)