diff --git a/Launcher.cpp b/Launcher.cpp index d6e7f59..38ed799 100644 --- a/Launcher.cpp +++ b/Launcher.cpp @@ -2,7 +2,7 @@ int main() { - system("py ./MusyncSavDecodeGUI.py"); + system("py ./Launcher.py"); system("pause"); return 0; } \ No newline at end of file diff --git a/Launcher.py b/Launcher.py index 7458602..f0042db 100644 --- a/Launcher.py +++ b/Launcher.py @@ -2,6 +2,7 @@ import json import os import sys +# import traceback # import requests # from tkinter import * @@ -9,7 +10,7 @@ import Functions import MainWindowOldStyle as OldStyle -import MusyncSavDecodeGUI as NewStyle +# import MusyncSavDecodeGUI as NewStyle version = '1.2.7rc2' isPreRelease = True diff --git a/MainWindowOldStyle.py b/MainWindowOldStyle.py index 7b856bf..8bdd7ef 100644 --- a/MainWindowOldStyle.py +++ b/MainWindowOldStyle.py @@ -5,6 +5,7 @@ import requests import threading import time +# import traceback import webbrowser #import win32api #import win32con @@ -383,7 +384,8 @@ def CheckJsonUpdate(self): snju.write(githubVersion) except Exception as e: messagebox.showerror("Error", f'发生错误: {e}') - messagebox.showerror("Error", f'若游戏本体已更新,请访问仓库更新songname.update和songname.json两个文件') + if messagebox.askyesno("无法获取谱面信息更新", f'是否前往网页查看是否存在更新?\n(请比对 SongName.update 中的时间是否比本地文件中的时间更大)'): + webbrowser.open("https://raw.githubusercontent.com/Ginsakura/MUSYNCSave/main/musync_data/songname.update") endTime = time.perf_counter_ns() print("CheckJsonUpdate Run Time: %f ms"%((endTime - startTime)/1000000)) @@ -392,6 +394,10 @@ 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",".")) except Exception as e: diff --git a/MusyncSavDecode.py b/MusyncSavDecode.py index 415632d..0fa18a6 100644 --- a/MusyncSavDecode.py +++ b/MusyncSavDecode.py @@ -1,6 +1,7 @@ import json import os import time +# import traceback from struct import unpack from tkinter import messagebox diff --git a/README.md b/README.md index 98945d6..e68cbb1 100644 --- a/README.md +++ b/README.md @@ -119,12 +119,24 @@ HitDelay模块用法:启用DLL注入后,在本次游戏进行首次谱面游玩 --> ### Version 1.2.7 #### PreRelease +1. 更新 + 1. xxx +2. 修复 + 1. xxx +3. 优化 + 1. xxx +#### Release 3 +1. 修复 + 1. 修复`Launcher.cpp`中没有更改程序入口的bug + 2. 修复没有取消新UI导入的bug +2. 优化 + 1. 将网络连接失败提示改为跳转框,点击`是`即可自动打开浏览器访问GitHub页面 #### Release 2 1. 更新 1. 将启动函数单独拆分到`Launcher.py` 2. 修复 1. 修复关闭窗口时子线程未被停止的bug - 2. (尝试)修复读取村当时字符串无法被解码导致的崩溃 + 2. (尝试)修复读取存档时字符串无法被解码导致的崩溃 3. 修复控制台输出表格头顺序错误的bug 3. 优化 1. (尝试)优化存档读取兼容性 diff --git a/changelog.txt b/changelog.txt index ebd86d0..acd53b5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -13,6 +13,12 @@ ### Version 1.2.7 #### PreRelease +#### Release 3 +1. 修复 + 1. 修复`Launcher.cpp`中没有更改程序入口的bug + 2. 修复没有取消新UI导入的bug +2. 优化 + 1. 将网络连接失败提示改为跳转框,点击`是`即可自动打开浏览器访问GitHub页面 #### Release 2 1. 更新 1. 将启动函数单独拆分到`Launcher.py` diff --git a/distCPP.bat b/distCPP.bat index 6665648..04c7129 100644 --- a/distCPP.bat +++ b/distCPP.bat @@ -3,4 +3,4 @@ if not exist ico.res ( windres ico.rc -O coff -o ico.res ) cd .. -g++ -o .\Launcher.exe .\MusyncSavDecodeLauncher.cpp .\musync_data\ico.res \ No newline at end of file +g++ -o .\LauncherC.exe .\Launcher.cpp .\musync_data\ico.res \ No newline at end of file