From b0bdb7b445a75455eeca595631c41425fa8228e4 Mon Sep 17 00:00:00 2001 From: EillesWan Date: Fri, 2 Feb 2024 20:50:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B9=90=E9=9F=B3?= =?UTF-8?q?=E4=B9=90=E5=99=A8=E7=9A=84execute=E5=89=8D=E7=BC=80=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Musicreater/__init__.py | 4 ++-- Musicreater/main.py | 40 ++++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Musicreater/__init__.py b/Musicreater/__init__.py index 2733aa6..7dc30a7 100644 --- a/Musicreater/__init__.py +++ b/Musicreater/__init__.py @@ -17,8 +17,8 @@ Terms & Conditions: License.md in the root directory # 若需转载或借鉴 许可声明请查看仓库目录下的 License.md -__version__ = "1.7.2" -__vername__ = "修复部分情况下的崩溃问题" +__version__ = "1.7.2.1" +__vername__ = "修复指令错误问题" __author__ = ( ("金羿", "Eilles Wan"), ("诸葛亮与八卦阵", "bgArray"), diff --git a/Musicreater/main.py b/Musicreater/main.py index 5e30e32..92f471d 100644 --- a/Musicreater/main.py +++ b/Musicreater/main.py @@ -688,15 +688,17 @@ class MidiConvert: .replace("(", r"{") .replace(")", r"}") ) - + r"playsound {} @s ^ ^ ^{} {}".format( - mc_sound_ID, mc_distance_volume, volume_percentage - ) - if note.percussive - else r"playsound {} @s ^ ^ ^{} {} {}".format( - mc_sound_ID, - mc_distance_volume, - volume_percentage, - mc_pitch, + + ( + r"playsound {} @s ^ ^ ^{} {}".format( + mc_sound_ID, mc_distance_volume, volume_percentage + ) + if note.percussive + else r"playsound {} @s ^ ^ ^{} {} {}".format( + mc_sound_ID, + mc_distance_volume, + volume_percentage, + mc_pitch, + ) ) ), annotation=( @@ -791,15 +793,17 @@ class MidiConvert: SingleCommand( command=( self.execute_cmd_head.format(player_selector) - + r"playsound {} @s ^ ^ ^{} {}".format( - mc_sound_ID, mc_distance_volume, volume_percentage - ) - if note.percussive - else r"playsound {} @s ^ ^ ^{} {} {}".format( - mc_sound_ID, - mc_distance_volume, - volume_percentage, - mc_pitch, + + ( + r"playsound {} @s ^ ^ ^{} {}".format( + mc_sound_ID, mc_distance_volume, volume_percentage + ) + if note.percussive + else r"playsound {} @s ^ ^ ^{} {} {}".format( + mc_sound_ID, + mc_distance_volume, + volume_percentage, + mc_pitch, + ) ) ), annotation=(