Merge branch 'master' into master

Author: ljzloser

Metaminesweeper.iss

@@ -4,19 +4,19 @@
 ; 或者 cd 到Inno Setup 的安装目录，然后在命令行中使用 iscc "{xxx.iss}" 进行编译
 ; 安装程序生成在该脚本的根目录下的Output目录下 
 ; 程序名称
-#define MyAppName "Metaminesweeper"
+#define MyAppName "Metasweeper"
 ; 程序版本
-#define MyAppVersion "3.1.11"
+#define MyAppVersion "3.2.0"
 ; 发行商
 #define MyAppPublisher "eee555"
 ; 官网
-#define MyAppURL "https://github.com/eee555/Solvable-Minesweeper"
+#define MyAppURL "https://github.com/eee555/Metasweeper"
 ; 运行主程序名称
 #define MyAppExeName "metaminesweeper.exe"
 ; 程序目录
 #define AppPath "metaminesweeper"
 ; 根目录
-#define RootPath "Metaminesweeper-v3.1.11"
+#define RootPath "Metaminesweeper-snapshot"
 ; 图标
 #define IconPath "media\cat.ico"
 [Setup]

README.md

@@ -2,7 +2,7 @@
 - 包含8种模式的扫雷项目、第三代扫雷录像播放器及高性能算法工具箱
 - project with 8 modes of minesweeper, third generation minesweeper video player and high performance algorithm toolbox
 
-[![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.1.11-brightgreen.svg)](https://github.com/eee555/Solvable-Minesweeper)
+[![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.2.0-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)
 
@@ -159,6 +159,10 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 
 ## 下载链接
 
+### 正式版v3.2.0：
+修改为安装包安装。“竞速无猜”更名为“经典无猜”。修复了游戏开始前点“保存”会崩溃，标准模式pb不能正常保存，标雷后缩放窗口导致异常，不同缩放下窗口尺寸不同，切屏引发崩溃等问题。现在任务栏只会出现一个主窗口，能够正确处理盲扫和标雷相关的弹窗逻辑。增加了自动更新的模块，可以在游戏内选择服务器自动更新。  
+链接：[https://gitee.com/ee55/Metasweeper/releases/download/3.2.0/Metaminesweeper-3.2.0.exe](https://gitee.com/ee55/Metasweeper/releases/download/3.2.0/Metaminesweeper-3.2.0.exe)、[https://github.com/eee555/Metasweeper/releases/download/3.2.0/Metaminesweeper-3.2.0.exe](https://github.com/eee555/Metasweeper/releases/download/3.2.0/Metaminesweeper-3.2.0.exe)
+
 ### 正式版v3.1.11：
 修复了若干严重问题。计数器标题可以翻译。兼容高清屏。  
 链接：[https://fff666.top/download/Metaminesweeper-v3.1.11.zip](https://fff666.top/download/Metaminesweeper-v3.1.11.zip)

src/githubApi.py

@@ -478,7 +478,7 @@ def removeDownloadFile(self):
     app = QCoreApplication([])
     data = {
         "Github": "https://api.github.com/repos/",
-        "fff666": "https://fff666.top/",
+        "gitee": "https://api.gitee.com/repos/",
     }
     github = GitHub(SourceManager(data), "eee555",
                     "Solvable-Minesweeper", "3.1.9", "(\d+\.\d+\.\d+)")

src/mineSweeperGUI.py

@@ -1134,10 +1134,10 @@ def action_AEvent(self):
     def auto_Update(self):
         data = {
             "Github": "https://api.github.com/repos/",
-            "fff666": "https://fff666.top/",
+            # "Gitee": "https://api.gitee.com/repos/",
         }
         update_dialog = CheckUpdateGui(GitHub(SourceManager(data), "eee555",
-                       "Solvable-Minesweeper", superGUI.version.decode( "UTF-8" ), "(\d+\.\d+\.\d+)"), parent = self)
+                       "Metasweeper", superGUI.version.decode( "UTF-8" ), "(\d+\.\d+\.\d+)"), parent = self)
         update_dialog.setModal(True)
         update_dialog.show()
         update_dialog.exec_()

src/superGUI.py

@@ -15,8 +15,7 @@
 from country_name import country_name
 
 
-# version = "元3.1.11".encode( "UTF-8" )
-version = "测试3.1.16".encode( "UTF-8" )
+version = "元3.2.0".encode( "UTF-8" )
 
 
 class Ui_MainWindow(Ui_MainWindow):