diff --git a/Launcher.py b/Launcher.py index 7d5ee43..e4cbec1 100644 --- a/Launcher.py +++ b/Launcher.py @@ -14,7 +14,7 @@ version = '1.2.8rc2' isPreRelease = True -preVersion = "1.2.8pre5" +preVersion = "1.2.8pre6" isPreRelease = False def launcher(): diff --git a/MainWindowOldStyle.py b/MainWindowOldStyle.py index 04b2e8b..78a1810 100644 --- a/MainWindowOldStyle.py +++ b/MainWindowOldStyle.py @@ -394,12 +394,16 @@ def CheckUpdate(self): localVersion = float(self.version.replace(".","").replace("rc",".")) try: response = requests.get("https://api.github.com/repos/ginsakura/MUSYNCSave/releases/latest") - if response.json()["message"][:23] == "API rate limit exceeded": - if messagebox.askyesno("GitHub公共API访问速率已达上限", "是否前往发布页查看是否存在更新?"): - webbrowser.open("https://github.com/Ginsakura/MUSYNCSave/releases/latest") - return - tagVersion = response.json()["tag_name"] - tergetVersion = float(tagVersion.replace(".","").replace("rc",".")) + # print(response.json()) + resJson = response.json() + if "tag_name" in resJson: + tagVersion = response.json()["tag_name"] + tergetVersion = float(tagVersion.replace(".","").replace("rc",".")) + elif "message" in resJson: + if resJson["message"][:23] == "API rate limit exceeded": + if messagebox.askyesno("GitHub公共API访问速率已达上限", "是否前往发布页查看是否存在更新?"): + webbrowser.open("https://github.com/Ginsakura/MUSYNCSave/releases/latest") + return except Exception as e: messagebox.showerror("Error", f'发生错误: {e}') tergetVersion = localVersion diff --git a/Push.ps1 b/Push.ps1 index 7f36d44..4de565e 100644 --- a/Push.ps1 +++ b/Push.ps1 @@ -20,9 +20,9 @@ if ($message[0] -eq ""){ $str = $version+' '+$message[0]+' '+$release echo $str -git pull git add . git commit -m $str +git pull git push # git tag -a $version -m $message[0] Read-Host -Prompt "Press Enter to exit" \ No newline at end of file diff --git a/README.md b/README.md index 1396945..7ca5aef 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,16 @@ HitDelay模块用法:启用DLL注入后,在本次游戏进行首次谱面游玩 1. xxx --> ### Version 1.2.8 +#### Release 3 +[ ] 主程序目录通过exe文件进行判断 +[ ] 日志工具提上日程 +#### PreRelease +1. 更新 + 1. xxx +2. 修复 + 1. 修复能够获取版本号时出现Json解析错误的bug +3. 优化 + 1. xxx #### Release 2 2. 修复 1. ***修复新用户释放资源时,图标文件名称错误的bug*** diff --git a/changelog.md b/changelog.md index e42cd7b..7a43acc 100644 --- a/changelog.md +++ b/changelog.md @@ -12,6 +12,9 @@ 9. 1.2.7 环境更新:`matplotlib 3.7.2->3.9.2`,`numpy 1.25.2->2.0.1` ### Version 1.2.8 +#### PreRelease +1. 修复 + 1. 修复能够获取版本号时出现Json解析错误的bug #### Release 2 2. 修复 1. ***修复新用户释放资源时,图标文件名称错误的bug***