3.1.9

Author: eee555

README.md

@@ -1,6 +1,6 @@
-# MetaSweeper-v3.1.8 —— project with 8 modes of minesweeper, third generation minesweeper video player and high performance algorithm toolbox
+# MetaSweeper-v3.1.9 —— project with 8 modes of minesweeper, third generation minesweeper video player and high performance algorithm toolbox
 
-# 元扫雷v3.1.8 —— 包含8种模式的扫雷项目、第三代扫雷录像播放器及高性能算法工具箱
+# 元扫雷v3.1.9 —— 包含8种模式的扫雷项目、第三代扫雷录像播放器及高性能算法工具箱
 
 [![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.1.6-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)
@@ -9,7 +9,7 @@
 
 ## 简介
 
-元扫雷v3.1.8是由热爱扫雷的玩家开发的扫雷游戏。这个项目并非简单重复已有的工作，而是集中了一批扫雷游戏的现代化设计。
+元扫雷v3.1.9是由热爱扫雷的玩家开发的扫雷游戏。这个项目并非简单重复已有的工作，而是集中了一批扫雷游戏的现代化设计。
 
 优势：
 
@@ -39,7 +39,7 @@
 
 ## Introduction
 
-Minesweeper v3.1.8 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.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.
 
 Advantages:
 
@@ -155,10 +155,9 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 
 ## 下载链接
 
-### 正式版v3.1.8：
+### 正式版v3.1.9：
 
-修复了7个bug，包括弱可猜模式可能踩雷；用设置修改尺寸时，布局出错；使用快捷键切换模式时，部分操作引发异常等。提高了对某种作弊手段的防御能力。升级了录像格式到evf-v0.3。  
-链接：[https://eee555.lanzn.com/iLApV25lg8xg](https://eee555.lanzn.com/iLApV25lg8xg)
+修复了7个bug，包括弱可猜模式可能踩雷；用设置修改尺寸时，布局出错；使用快捷键切换模式时，部分操作引发异常等。计数器中可以使用"is_offical", "is_fair"来检查录像合法性。提高了对某种作弊手段的防御能力。升级了录像格式到evf-v0.3。  
 
 ### 正式版v3.1.7：
 

requirements.txt

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

src/gameScoreBoard.py

@@ -76,6 +76,7 @@ class gameScoreBoardManager():
                     "cell4", "cell5", "cell6", "cell7", "cell8", "fps", "etime",
                     "stnb", "rqp", "qg", "ioe", "thrp", "corr", "ce",
                      "ce_s", "bbbv_solved", "bbbv_s", "op_solved", "isl_solved"]
+    
     # is_visible = False
     # 5、错误的表达式，一旦算出报错，永远不再算，显示error
     def __init__(self, r_path, score_board_path, game_setting_path, pix_size):

src/main.py

@@ -91,7 +91,7 @@ def find_window(class_name, window_name):
 #           bbbv_s, (op_solved), (isl_solved)
 # 录像静态类：bbbv，op, isl, cell0, cell1, cell2, cell3, cell4, cell5, cell6,
 #           cell7, cell8, fps, (hizi)
-# 其他类：checksum_ok, race_designator, mode
+# 其他类：checksum_ok, race_designator, mode, is_offical, is_fair
 
 
 

src/mineSweeperGUI.py

@@ -487,7 +487,9 @@ def gameRestart(self, e = None):  # 画界面，但是不埋雷，改数据而
         # self.label.setMouseTracking(False) # 鼠标未按下时，组织移动事件回调
 
         self.score_board_manager.with_namespace({
-            "checksum_ok": "--"
+            "checksum_ok": "--",
+            "is_official": "--",
+            "is_fair": "--"
             })
 
 
@@ -501,6 +503,10 @@ def gameFinished(self):  # 游戏结束画残局，改状态
         self.label.update()
         # 刷新计数器数值
         self.timeCount()
+        self.score_board_manager.with_namespace({
+            "is_official": self.is_official(),
+            "is_fair": self.is_fair()
+            })
         self.score_board_manager.show(self.label.ms_board, index_type = 2)
 
     def gameWin(self):  # 成功后改脸和状态变量，停时间
@@ -543,9 +549,7 @@ def save_evf_file(self):
 
         self.label.ms_board.is_fair = self.is_fair()
         self.label.ms_board.is_offical = self.is_official()
-        # if self.label.ms_board.is_fair and self.label.ms_board.is_offical:
-        #     self.label.ms_board.checksum = metaminesweeper_checksum.get_checksum()
-        # self.label.ms_board.mode = self.gameMode
+        
         self.label.ms_board.software = "元3.1.8".encode( "UTF-8" )
         self.label.ms_board.player_designator = self.player_designator.encode( "UTF-8" )
         self.label.ms_board.race_designator = self.race_designator.encode( "UTF-8" )
@@ -1076,6 +1080,8 @@ def action_OpenFile(self, openfile_name = None):
         if isinstance(video, ms.EvfVideo):
             self.score_board_manager.with_namespace({
                 "checksum_ok": self.checksum_guard.valid_checksum(video.raw_data[:-33], video.checksum),
+                "is_official": video.is_offical, # 此处拼写错误，将修改
+                "is_fair": video.is_fair
                 })
         video.analyse_for_features(["high_risk_guess", "jump_judge", "needless_guess",
                                     "mouse_trace", "vision_transfer", "survive_poss"])

src/superGUI.py

@@ -81,7 +81,9 @@ def __init__(self, MainWindow, args):
         self.score_board_manager.with_namespace({
             "race_designator": self.race_designator,
             "mode": mm.trans_game_mode(self.gameMode),
-            "checksum_ok": "--"
+            "checksum_ok": "--",
+            "is_official": "--",
+            "is_fair": "--"
             })
 
         self.importLEDPic(self.pixSize) # 导入图片