From 190348f4d36dee36a2eadca238e2af0d813cc251 Mon Sep 17 00:00:00 2001 From: Ginsakura Date: Tue, 30 Apr 2024 19:53:20 +0800 Subject: [PATCH] =?UTF-8?q?1.2.6pre8=20=20=E7=AE=80=E5=8C=96=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=AD=98=E5=8F=96=20=20PreRelease?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainWindowOldStyle.py | 23 +++++++++++------------ MusyncSavDecodeGUI.py | 4 ++-- README.md | 7 +++++++ changelog.txt | 7 +++++++ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/MainWindowOldStyle.py b/MainWindowOldStyle.py index c7e3e7c..a964218 100644 --- a/MainWindowOldStyle.py +++ b/MainWindowOldStyle.py @@ -74,11 +74,8 @@ def fixed_map(option): self.analyzeFilePathVar.set('Input Analyze File Dir (or not)') self.windowInfo = [root.winfo_x(),root.winfo_y(),root.winfo_width(),root.winfo_height()] self.saveCount = 0 - self.saveCountVar = StringVar() - self.saveCountVar.set(str(self.saveCount)) self.totalSync = 0 - self.avgSyncVar = StringVar() - self.avgSyncVar.set(f'{(self.totalSync / (1 if self.saveCount==0 else self.saveCount))}') + self.excludeCount = 0 self.dataSortMethodsort = [None,True] self.dataSelectMethod = None self.treeviewColumns = ["SpeedStall",'SongName',"Keys","Difficulty","DifficultyNumber","SyncNumber","Rank","UploadScore","PlayCount","Status"] @@ -97,7 +94,7 @@ def fixed_map(option): self.CountFrameLanel.place(x=8,y=48,width=164,height=34) self.PrintLabel0 = Label(self.root, text='显示计数: ', font=self.font, relief="flat") self.PrintLabel0.place(x=10,y=50,width=100,height=30) - self.saveCountLabel = Label(self.root, text=self.saveCountVar.get(), font=self.font, relief="flat") + self.saveCountLabel = Label(self.root, text=str(self.saveCount+self.excludeCount), font=self.font, relief="flat") self.saveCountLabel.place(x=110,y=50,width=60,height=30) self.saveFilePathEntry = Entry(self.root, textvariable=self.saveFilePathVar, font=self.font, relief="sunken") @@ -125,7 +122,7 @@ def fixed_map(option): self.totalSyncFrameLabel.place(x=868,y=48,width=124,height=74) self.totalSyncTextLabel = Label(self.root, text='综合同步率', anchor="center", font=self.font, relief="flat") self.totalSyncTextLabel.place(x=870,y=50,width=120,height=30) - self.avgSyncLabel = Label(self.root, text=self.avgSyncVar.get()+'%', anchor="w", font=self.font, relief="flat") + self.avgSyncLabel = Label(self.root, text=f'{(self.totalSync / (1 if self.saveCount==0 else self.saveCount))}%', anchor="w", font=self.font, relief="flat") self.avgSyncLabel.place(x=870,y=90,width=120,height=30) #筛选控件 @@ -519,8 +516,11 @@ def Rank(sync): if (float(saveLine["SyncNumber"][0:-1]) < 75) or (float(saveLine["SyncNumber"][0:-1]) >= 95):continue elif self.dataSelectMethod == "RankC": if (float(saveLine["SyncNumber"][0:-1]) == 0) or (float(saveLine["SyncNumber"][0:-1]) >= 75):continue - self.saveCount += 1 - self.totalSync += float(saveLine["UploadScore"][0:-1]) + if saveLine["Status"] in [' ', 'Favo']: + self.saveCount += 1 + self.totalSync += float(saveLine["UploadScore"][0:-1]) + else: + self.excludeCount += 1 self.saveData.insert('', END, values=(saveLine["SpeedStall"], #谱面号 ("" if saveLine["SongName"] is None else saveLine["SongName"][0]), #曲名 ("" if saveLine["SongName"] is None else saveLine["SongName"][1]), #键数 @@ -573,10 +573,9 @@ def UpdateWindowInfo(self): if not self.wh == self.windowInfo[2:]: self.TreeviewWidthUptate() self.VScroll1.place(x=self.windowInfo[2]-22, y=1, width=20, height=self.windowInfo[3]-162) - self.saveCountVar.set(self.saveCount) - self.saveCountLabel.configure(text=self.saveCountVar.get()) - self.avgSyncVar.set(f'{(self.totalSync / (1 if self.saveCount==0 else self.saveCount))}') - self.avgSyncLabel.configure(text=self.avgSyncVar.get()[0:10]+"%") + # self.saveCountVar.set() + self.saveCountLabel.configure(text=str(self.saveCount+self.excludeCount)) + self.avgSyncLabel.configure(text=f'{(self.totalSync / (1 if self.saveCount==0 else self.saveCount))}%') self.developer.place(x=0,y=self.windowInfo[3]-30,width=420,height=30) self.gitHubLink.place(x=420,y=self.windowInfo[3]-30,width=self.windowInfo[2]-420,height=30) diff --git a/MusyncSavDecodeGUI.py b/MusyncSavDecodeGUI.py index 7e8f31f..9bd04ae 100644 --- a/MusyncSavDecodeGUI.py +++ b/MusyncSavDecodeGUI.py @@ -24,8 +24,8 @@ version = '1.2.6rc3' isPreRelease = True -preVersion = "1.2.6pre7" -isPreRelease = False +preVersion = "1.2.6pre8" +# isPreRelease = False class MusyncSavDecodeGUI(object): """docstring for MusyncSavDecodeGUI""" diff --git a/README.md b/README.md index d6e75be..c4abc35 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,13 @@ HitDelay模块用法:启用DLL注入后,在本次游戏进行首次谱面游玩 1. xxx --> ### Version 1.2.6 +#### Release 4 +1. 更新 + 1. xxx +2. 修复 + 1. xxx +3. 优化 + 1. 简化变量存储与读取流程 #### Release 3 1. 更新 1. 编写使用说明与wiki diff --git a/changelog.txt b/changelog.txt index f0ee898..07e8bac 100644 --- a/changelog.txt +++ b/changelog.txt @@ -11,6 +11,13 @@ 8. 1.2.6 更新ci ### Version 1.2.6 +#### Release 4 +1. 更新 + 1. xxx +2. 修复 + 1. xxx +3. 优化 + 1. 简化变量存储与读取流程 #### Release 3 1. 更新 1. 编写使用说明与wiki