diff --git a/Musicreater.py b/Musicreater.py index 731d91f..35d8695 100644 --- a/Musicreater.py +++ b/Musicreater.py @@ -226,6 +226,18 @@ def __main__(): if result: SaveProject() log("程序正常退出") + + try: + global dataset + del dataset + except: + pass; + + global root + root.destroy() + del root + + if clearLog : print("清除log(此句不载入日志)") try: @@ -242,16 +254,6 @@ def __main__(): pass; - - try: - global dataset - del dataset - except: - pass; - - global root - root.destroy() - del root exit() @@ -926,10 +928,11 @@ def __main__(): rys.World2Rys(outdir,begp,endp,isAir) try: with open(fileName,'w',encoding='utf-8') as f: - json.dump(rys,f) + json.dump(rys.RyStruct,f,sort_keys=True, indent=4, separators=(', ', ': '), ensure_ascii=False) tkinter.messagebox.showinfo("成功✔",'文件已生成\n'+fileName) except: - tkinter.messagebox.showerror("失败❌",'文件无法生成\n'+fileName) + tkinter.messagebox.showerror("失败❌",'文件无法生成\n'+fileName+'\n'+str(rys.RyStruct)) + def world2BDX(): diff --git a/msctspt/__pycache__/transfer.cpython-38.pyc b/msctspt/__pycache__/transfer.cpython-38.pyc index 66a071e..3fdade7 100644 Binary files a/msctspt/__pycache__/transfer.cpython-38.pyc and b/msctspt/__pycache__/transfer.cpython-38.pyc differ diff --git a/msctspt/bugReporter.py b/msctspt/bugReporter.py index 264539e..8de2c76 100644 --- a/msctspt/bugReporter.py +++ b/msctspt/bugReporter.py @@ -101,7 +101,7 @@ class version: libraries = ('mido','amulet','amulet-core','amulet-nbt','piano_transcription_inference','pypinyin','briefcase','toga','pyinstaller','kivy','py7zr') '''当前所需库,有一些是开发用的,用户不需要安装''' - version = ('0.0.4','Beta',) + version = ('0.0.4.1','Beta',) '''当前版本''' def __init__(self) -> None: diff --git a/测试用/CanyonTest/db/000062.log b/测试用/CanyonTest/db/000075.log similarity index 100% rename from 测试用/CanyonTest/db/000062.log rename to 测试用/CanyonTest/db/000075.log diff --git a/测试用/CanyonTest/db/CURRENT b/测试用/CanyonTest/db/CURRENT index 0556986..60f8f3c 100644 --- a/测试用/CanyonTest/db/CURRENT +++ b/测试用/CanyonTest/db/CURRENT @@ -1 +1 @@ -MANIFEST-000060 +MANIFEST-000073 diff --git a/测试用/CanyonTest/db/MANIFEST-000060 b/测试用/CanyonTest/db/MANIFEST-000060 deleted file mode 100644 index e7e7aff..0000000 Binary files a/测试用/CanyonTest/db/MANIFEST-000060 and /dev/null differ diff --git a/测试用/CanyonTest/db/MANIFEST-000073 b/测试用/CanyonTest/db/MANIFEST-000073 new file mode 100644 index 0000000..db7d0dd Binary files /dev/null and b/测试用/CanyonTest/db/MANIFEST-000073 differ diff --git a/测试用/test.RyStruct b/测试用/test.RyStruct new file mode 100644 index 0000000..e69de29