修了一些BUG,但是有些BUG还没有解决

This commit is contained in:
bgArray
2022-02-01 14:31:44 +08:00
parent f08a2ff9be
commit 89ef3bcb55
72 changed files with 661 additions and 211 deletions

Binary file not shown.

Binary file not shown.

View File

@ -14,12 +14,21 @@ class NewThread(threading.Thread):
self.args = args
def run(self):
self.result = self.func(*self.args)
try:
self.result = self.func(*self.args)
except OSError:
pass
def getResult(self):
threading.Thread.join(self) # 等待线程执行完毕
try:
return self.result
try:
try:
return self.result
except OSError:
return None
except IOError:
return None
except ValueError:
return None

View File

@ -25,9 +25,10 @@ def hans2pinyin(hans, style=3):
return final
def classList_conversion_SinglePlayer(List: list, ScoreboardName: str, playerSelection: str = '',
def classList_conversion_SinglePlayer(List: list, ScoreboardName: str, Instrument: str, playerSelection: str = '',
isProsess: bool = False) -> list:
from bgArrayLib.compute import round_up
from bgArrayLib.pitchStrConstant import pitch
commands = []
length = len(List)
j = 1
@ -43,7 +44,7 @@ def classList_conversion_SinglePlayer(List: list, ScoreboardName: str, playerSel
commands.append(
f"execute @a{playerSelection} ~ ~ ~ execute @s[scores={{{ScoreboardName}="
f"{str(round_up(i.time_position)).replace('.0', '')}}}] ~ ~{127 - i.velocity} "
f"~ playsound {i.instrument} @s ~ ~ ~ 1000 {i.pitch} 1000\n")
f"~ playsound {Instrument} @s ~ ~ ~ 1000 {pitch.get(str(i.pitch))} 1000\n")
if isProsess:
commands.append(
f"execute @a{playerSelection} ~ ~ ~ execute @s[scores={{{ScoreboardName}="
@ -282,6 +283,10 @@ def music2BDX(filePath: str, direction: Iterable, music: dict, isProsess: bool =
for track in music['musics']:
cmdList = classList_conversion_SinglePlayer(track['notes'], track['set']['ScoreboardName'],
music['mainset']['PlayerSelect'], isProsess)
if len(cmdList) == 0:
continue
elif cmdList is []:
continue
dire = direction
down = False
'''当前是否为向下的阶段?'''