Merge branch 'master' of https://github.com/ljzloser/Solvable-Minesweeper

Author: ljzloser

.github/workflows/python-app.yml

@@ -94,7 +94,7 @@ jobs:
 
     # upload the result package as an artifact
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: success()
       with:
         name: Metaminesweeper-snapshot

README.md

@@ -1,15 +1,15 @@
-# MetaSweeper-v3.1.9 —— project with 8 modes of minesweeper, third generation minesweeper video player and high performance algorithm toolbox
+# MetaSweeper-v3.1.11 —— project with 8 modes of minesweeper, third generation minesweeper video player and high performance algorithm toolbox
 
-# 元扫雷v3.1.9 —— 包含8种模式的扫雷项目、第三代扫雷录像播放器及高性能算法工具箱
+# 元扫雷v3.1.11 —— 包含8种模式的扫雷项目、第三代扫雷录像播放器及高性能算法工具箱
 
-[![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.1.6-brightgreen.svg)](https://github.com/eee555/Solvable-Minesweeper)
+[![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.1.11-brightgreen.svg)](https://github.com/eee555/Solvable-Minesweeper)
 [![stars](https://img.shields.io/github/stars/eee555/Solvable-Minesweeper)](https://github.com/eee555/Solvable-Minesweeper/stargazers)
 [![forks](https://img.shields.io/github/forks/eee555/Solvable-Minesweeper)](https://github.com/eee555/Solvable-Minesweeper/forks)
 
 
 ## 简介
 
-元扫雷v3.1.9是由热爱扫雷的玩家开发的扫雷游戏。这个项目并非简单重复已有的工作，而是集中了一批扫雷游戏的现代化设计。
+元扫雷v3.1.11是由热爱扫雷的玩家开发的扫雷游戏。这个项目并非简单重复已有的工作，而是集中了一批扫雷游戏的现代化设计。
 
 优势：
 
@@ -39,7 +39,7 @@
 
 ## Introduction
 
-Minesweeper v3.1.9 is a mineswering game developed by players who are passionate about the game. This project is not a simple repetition of existing work, but a concentration of modern design elements for minesweeper games.
+Minesweeper v3.1.10 is a mineswering game developed by players who are passionate about the game. This project is not a simple repetition of existing work, but a concentration of modern design elements for minesweeper games.
 
 Advantages:
 
@@ -76,7 +76,7 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 ## 安装
 建议在`Windows 10`或`Windows 11`下运行本游戏，其它操作系统未经测试，可能出现意想不到的问题。
 
-### 方案1：通过网盘安装(推荐)
+### 方案1：通过官方下载链接安装(推荐)
 在下面的[下载链接](#下载链接)中找到最新的版本，然后下载，解压，直接运行`main.exe`文件（如果警告请点击“仍然运行”），开箱即用。通过此方法安装的软件，是`正版`的软件，能够对录像文件进行官方的签名（签名功能打包在“metaminesweeper_checksum.pyd”中，占比很小，且是闭源的）。
 
 ### 方案2：通过Github Actions安装(最安全)
@@ -86,7 +86,7 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 ### 方案3：从源码安装(不推荐)
 **请注意**：通过此方法安装的软件，不能对录像文件进行正确的签名。即，自行打包的软件，其生成的录像文件，无法通过`正版`的软件的校验。但其余功能保证与`正版`相同。同时，如有需要，玩家可通过这种方式安装来自行制作改版，并自行实现秘密的签名。  
 在编译之前，请确保自己拥有：
-*   Python >=3.7（推荐3.10）
+*   Python >=3.7, <=3.11（推荐3.10，即打包使用的版本）
 *   会用Powershell或者其它命令行工具的能力
 
 以下为安装步骤：
@@ -110,6 +110,10 @@ Currently in the lengthy development phase, with updates approximately every 1 t
     安装requirements.txt中除ms_toollib外剩余的依赖
 ```
 
+*   为了跑通全部功能，从下载的以往版本中找到en_US.qm、de_DE.qm、pl_PL.qm等语言文件，复制到Solvable-Minesweeper下
+
+*   为了跑通全部功能，从下载的以往版本中找到params.onnx神经网络模型数据，复制到Solvable-Minesweeper\src下
+
 *   运行程序，大功告成了~
 ```sh
     py -3 src/main.py # Windows
@@ -131,7 +135,8 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 元扫雷网官方扫雷软件[https://fff666.top](https://fff666.top)
 
 ## 赞助
-感谢您考虑支持我们的开源项目，赞助时请备注您的称呼（或Github主页）。您的赞助将有助于项目的持续发展和改进，使我们能够继续提高软件的质量（owner许诺向所有contributor按合理的比例分配赞助得到的收入）。  
+感谢您考虑支持我们的开源项目，赞助时请备注您的称呼（或Github主页）。您的赞助将有助于项目的持续发展和改进，使我们能够继续提高软件的质量（owner许诺向所有contributor按获得赞助时commit数量的比例分配赞助得到的收入）。 
+
 ### 一般赞助者
 - 一次性捐款￥10或以上
 - 您的名字将出现在项目的贡献者列表中
@@ -154,9 +159,18 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 
 ## 下载链接
 
+### 正式版v3.1.11：
+修复了若干严重问题。计数器标题可以翻译。兼容高清屏。  
+链接：[https://fff666.top/download/Metaminesweeper-v3.1.11.zip](https://fff666.top/download/Metaminesweeper-v3.1.11.zip)
+
+### 正式版v3.1.10：
+修复了快捷键切换难度后局面约束不能变化、研究模式中快捷键切换难度后卡死、鼠标设置阻塞进程、回放时切换难度崩溃等、标错雷时概率计算错误、回放时右上角时间不变化等问题。现在回放时可以显示正确的国旗。可以设置唯一性标识。录像可以回放、手动保存。每个级别的模式、尺寸可以分别保存。双击猜雷可以起作用。可以限制鼠标移动范围为游戏局面区域。  
+链接：无（不安全，已下架）
+
 ### 正式版v3.1.9：
 
 修复了7个bug，包括弱可猜模式可能踩雷；用设置修改尺寸时，布局出错；使用快捷键切换模式时，部分操作引发异常等。计数器中可以使用"is_offical", "is_fair"来检查录像合法性。提高了对某种作弊手段的防御能力。升级了录像格式到evf-v0.3。  
+链接：[https://fff666.top/download/Metaminesweeper-v3.1.9.zip](https://fff666.top/download/Metaminesweeper-v3.1.9.zip)
 
 ### 正式版v3.1.7：
 

requirements.txt

@@ -1,2 +1,2 @@
 pyQt5==5.15.7
-ms-toollib==1.4.10
+ms-toollib==1.4.12

src/gameDefinedParameter.py

@@ -8,14 +8,14 @@
 from ui.uiComponents import RoundQDialog
 
 class ui_Form(Ui_Form):
-    def __init__(self, r_path, row, column, num):
+    def __init__(self, r_path, row, column, num, parent):
         self.row = row
         self.column = column
         self.mineNum = num
         # self.maxRow = 1e6
         # self.maxColumn = 1e6
         self.alter = False
-        self.Dialog = RoundQDialog()
+        self.Dialog = RoundQDialog(parent)
         self.setupUi (self.Dialog)
         self.setParameter()
         self.Dialog.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico')).replace("\\", "/")))

src/gameRecordPop.py

@@ -3,12 +3,14 @@
 from ui.uiComponents import RoundQDialog
 
 class ui_Form(Ui_Form):
-    def __init__(self, r_path, del_items: list, pb_bbbv):
+    def __init__(self, r_path, del_items: list, pb_bbbv, nf_items, parent):
         # 关于界面，继承一下就好
-        self.Dialog = RoundQDialog()
-        self.setupUi (self.Dialog)
+        self.Dialog = RoundQDialog(parent)
+        self.setupUi(self.Dialog)
         self.Dialog.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
 
+        for i in nf_items:
+            eval(f"self.label_{i}.setText('NF ' + self.label_{i}.text())")
         for i in del_items:
             eval("self.widget" + str(i) + ".setHidden(True)")
 
@@ -47,9 +49,9 @@ def __init__(self, r_path, del_items: list, pb_bbbv):
         self.pushButton.setStyleSheet("border-image: url(" + str(r_path.with_name('media').joinpath('button.png')).replace("\\", "/") + ");\n"
 "font: 16pt \"黑体\";\n"
 "color:white;font: bold;")
-        self.label__13.setText(str(pb_bbbv))
-        self.label__14.setText(str(pb_bbbv))
-        self.label__15.setText(str(pb_bbbv))
+        self.label__13.setText(str(pb_bbbv) + " bv")
+        self.label__14.setText(str(pb_bbbv) + " bv")
+        self.label__15.setText(str(pb_bbbv) + " bv")
 
         # self.Dialog.setFixedSize(self.Dialog.minimumSize())
 

src/gameScoreBoard.py

@@ -6,22 +6,22 @@
 from safe_eval import safe_eval
 from PyQt5.QtWidgets import QTableWidgetItem
 from PyQt5 import QtCore, QtGui
-from PyQt5.QtWidgets import QShortcut
-from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QShortcut, QHeaderView
 
 class ui_Form(Ui_Form):
     # barSetMineNum = QtCore.pyqtSignal(int)
     # barSetMineNumCalPoss = QtCore.pyqtSignal(int)
     # doubleClick = QtCore.pyqtSignal (int, int)
     # leftClick = QtCore.pyqtSignal (int, int)
-    def __init__(self, r_path, pix_size):
+    def __init__(self, r_path, pix_size, parent):
         self.pix_size = pix_size
-        self.QWidget = RoundQWidget()
+        self.QWidget = RoundQWidget(parent)
         self.setupUi(self.QWidget)
 
         self.tableWidget.setColumnWidth(0, 80)
-        self.tableWidget.setColumnWidth(1, 120)
-        self.tableWidget.verticalHeader().setDefaultSectionSize(24)
+        self.tableWidget.setColumnWidth(1, 150)
+        self.tableWidget.verticalHeader().setDefaultSectionSize(25)
+        self.tableWidget.verticalHeader().setSectionResizeMode(QHeaderView.Fixed)
 
         self.QWidget.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
 
@@ -37,13 +37,11 @@ def reshow(self, index_name_list: list[str], index_value_list: list[str]):
         # 更新数值、指标。指标数量可能变
         table_height = len(index_name_list)*24
         self.tableWidget.setRowCount(len(index_name_list))
-        self.tableWidget.setMinimumWidth(202)
-        self.tableWidget.setMaximumWidth(202)
+        # self.tableWidget.setMinimumWidth(232)
+        # self.tableWidget.setMaximumWidth(232)
         self.tableWidget.setMaximumHeight(table_height + len(index_name_list) + 2)
         self.tableWidget.setMinimumHeight(table_height + len(index_name_list) + 2)
 
-        # self.QWidget.setMinimumSize(QtCore.QSize(224+2, table_height + 88))
-        # self.QWidget.setMaximumSize(QtCore.QSize(224+2, table_height + 88))
         for idx, i in enumerate(index_name_list):
             self.tableWidget.setItem(idx, 0, QTableWidgetItem(i))
         self.show(index_value_list)
@@ -79,7 +77,7 @@ class gameScoreBoardManager():
 
     # is_visible = False
     # 5、错误的表达式，一旦算出报错，永远不再算，显示error
-    def __init__(self, r_path, score_board_path, game_setting_path, pix_size):
+    def __init__(self, r_path, score_board_path, game_setting_path, pix_size, parent):
         # 从文件中读取指标并设置
         # self.ms_board = None
         self.pix_size = pix_size
@@ -121,7 +119,7 @@ def __init__(self, r_path, score_board_path, game_setting_path, pix_size):
                                   i in _score_board_items]
         self.update_score_board_items_type()
         self.index_num = len(self.score_board_items_type)
-        self.ui = ui_Form(r_path, pix_size)
+        self.ui = ui_Form(r_path, pix_size, parent)
         self.ui.tableWidget.doubleClicked.connect(self.__table_change)
         self.ui.tableWidget.clicked.connect(self.__table_ok)
         self.ui.tableWidget.cellChanged.connect(self.__cell_changed)
@@ -131,12 +129,6 @@ def __init__(self, r_path, score_board_path, game_setting_path, pix_size):
         self.editing_row = -1 # -1不在编辑状态，-2不能编辑（正在游戏）
         self.editing_column = -1
 
-        # self.ui.QWidget.closeEvent_.connect(self.close) 
-        
-    # def keyPressEvent(self, event):
-    #     print(666)
-    #     if event.key() == Qt.Key_Return:
-    #         self.__table_ok()
 
     def update_score_board_items_type(self):
         self.score_board_items_type = []
@@ -154,6 +146,9 @@ 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"])
         self.namespace.update(namespace)
         # race_designator, mode .etc
         # self.ms_board = ms.BaseVideo(board, pix_size)
@@ -251,7 +246,16 @@ def show(self, ms_board, index_type):
         # if self.ui.QWidget.isVisible():
         #     self.visible()
 
-    def reshow(self, ms_board, index_type):
+    def reshow(self, ms_board, index_type = 0):
+        if not index_type:
+            if self.ms_board.game_board_state == 1\
+                or self.ms_board.game_board_state == 2\
+                    or self.ms_board.game_board_state == 5:
+                index_type = 1
+            else:
+                # 3、4为win和loss
+                index_type = 2
+            
         # 指标数量有变。增删指标用。游戏开始前。index_type是2
         self.ms_board = ms_board
         index_value_list = self.cal_index_value(ms_board, index_type)
@@ -265,7 +269,16 @@ def time_step(self):
 
 
         self.show()
-
+    
+    # 重写窗口的翻译方法。主要是模式的翻译问题
+    def retranslateUi(self, Form):
+        self.ui.retranslateUi(Form)
+        if hasattr(self, "ms_board"):
+            self.with_namespace({
+                "mode": self._game_mode_code,
+                })
+            self.show(self.ms_board, index_type = 1)
+            
     def __table_change(self, e):
         # 编辑开始时，把数值换成公式
         if e.column() == 1 and self.editing_row == -1:
@@ -298,13 +311,7 @@ def __table_ok(self, e = None):
             else:
                 self.score_board_items[self.editing_row][1] = new_formula
                 self.update_score_board_items_type()
-            if self.ms_board.game_board_state == 1\
-                or self.ms_board.game_board_state == 2\
-                    or self.ms_board.game_board_state == 5:
-                self.reshow(self.ms_board, 1)
-            else:
-                # 3、4为win和loss
-                self.reshow(self.ms_board, 2)
+            self.reshow(self.ms_board)
             self.editing_row = -1
             self.editing_column = -1
 
@@ -319,7 +326,7 @@ def __add_blank_line(self):
         # 添加一个空开的行，并刷新显示
         self.score_board_items.append(["", ""])
         self.score_board_items_type.append(1)
-        self.reshow(self.ms_board, 1)
+        self.reshow(self.ms_board)
 
     def close(self):
         config = configparser.ConfigParser()

src/gameScores.py

@@ -191,7 +191,7 @@ def paintIndex(self, scores):
               'EstTime':'52.247', '3BV':'123/200', 'Ops':'12',
               'Isls':'10', 'Thrp':'0.968', 'Corr':'0.963',
               'Left':'123@3.21', 'Right':'123@3.21', 'Double':'123@3.21',
-              'Cl':'123@3.21', 'Ces':'123@3.21', 'Mode':'竞速无猜',
+              'Cl':'123@3.21', 'Ces':'123@3.21', 'Mode':'经典无猜',
               'Difficulty':'高级'}
     scoresValue = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6]
     app = QApplication(sys.argv)

src/gameSettingShortcuts.py

@@ -7,10 +7,10 @@
 # 减少ui文件生成的原始的.py的改动
 
 class myGameSettingShortcuts(Ui_Form):
-    def __init__(self, game_setting_path, ico_path, r_path):
+    def __init__(self, game_setting_path, ico_path, r_path, parent):
         self.game_setting_path = game_setting_path
         self.r_path = r_path
-        self.Dialog = RoundQDialog()
+        self.Dialog = RoundQDialog(parent)
         self.setupUi(self.Dialog)
         self.setParameter()
         self.Dialog.setWindowIcon(QtGui.QIcon (ico_path))