diff --git a/msctPkgver/__init__.py b/msctPkgver/__init__.py index c42c324..32d8938 100644 --- a/msctPkgver/__init__.py +++ b/msctPkgver/__init__.py @@ -7,7 +7,7 @@ # 若需转载或借鉴 许可声明请查看仓库目录下的 Lisence.md -__version__ = '0.2.2' +__version__ = '0.2.2.1' __all__ = [] __author__ = (('金羿', 'Eilles Wan'), ('诸葛亮与八卦阵', 'bgArray'), ('鸣凤鸽子', 'MingFengPigeon')) diff --git a/msctPkgver/main.py b/msctPkgver/main.py index 0f38b3f..dca1521 100644 --- a/msctPkgver/main.py +++ b/msctPkgver/main.py @@ -1149,32 +1149,23 @@ class midiConvert: try: tracks[score_now].append( - self.exeHead.format(player)+f"playsound {soundID} @s ^ ^ ^{1 / MaxVolume - 1} {msg.velocity/128} {2 ** ((msg.note - 60 - _X) / 12)}" + self.exeHead.format(player)+f"playsound {soundID} @s ^ ^ ^{1 / MaxVolume - 1} {msg[2]/128} {2 ** ((msg[1] - 60 - _X) / 12)}" ) except BaseException: tracks[score_now]= [ - self.exeHead.format(player)+f"playsound {soundID} @s ^ ^ ^{1 / MaxVolume - 1} {msg.velocity/128} {2 ** ((msg.note - 60 - _X) / 12)}" + self.exeHead.format(player)+f"playsound {soundID} @s ^ ^ ^{1 / MaxVolume - 1} {msg[2]/128} {2 ** ((msg[1] - 60 - _X) / 12)}" ] - cmdAmount += 1 - - allticks = list(tracks.keys()) + if self.debugMode : + self.prt(tracks) for i in range(len(allticks)): - if i != 0: - for j in range(len(tracks[allticks[i]])): - if j != 0: - results.append((tracks[allticks[i]][j], 0)) - else: - results.append( - (tracks[allticks[i]][j], allticks[i] - allticks[i - 1]) - ) - else: - for j in range(len(tracks[allticks[i]])): - results.append((tracks[allticks[i]][j], allticks[i])) + for j in range(len(tracks[allticks[i]])): + results.append((tracks[allticks[i]][j], (0 if j!=0 else (allticks[i] - allticks[i - 1] if i!=0 else allticks[i])))) + return results, max(allticks) @@ -1468,7 +1459,7 @@ class midiConvert: cmdBytes, size, finalPos = toBDXbytes(cmdlist, maxheight - 1) if progressbar: - scbname = self.midFileName[:5] + "Pgb" + scbname = self.midFileName[:3] + "Pgb" _bytes += formCMDblk( r"scoreboard objectives add {} dummy {}播放用".replace(r"{}", scbname), 1,