Merge branch 'master' of github.com:LTCatt/LTW3

data/lib/functions/sounds/music/lobby.mcfunction

@@ -2,4 +2,5 @@
 # 3'51
 
 function lib:sounds/music/stop
-playsound minecraft:music_disc.wait music @s 0 1000000 0 1000000
+scoreboard players set $music_id mem 1
+scoreboard players set @s music_time 0

data/lib/functions/sounds/music/mini_fast.mcfunction

@@ -2,4 +2,5 @@
 # 2'28
 
 function lib:sounds/music/stop
-playsound minecraft:music_disc.pigstep music @s 0 1000000 0 1000000
+scoreboard players set $music_id mem 2
+scoreboard players set @s music_time 0

data/lib/functions/sounds/music/mini_middle.mcfunction

@@ -2,4 +2,5 @@
 # 3'05
 
 function lib:sounds/music/stop
-playsound minecraft:music_disc.cat music @s 0 1000000 0 1000000
+scoreboard players set $music_id mem 3
+scoreboard players set @s music_time 0

data/lib/functions/sounds/music/mini_slow.mcfunction

@@ -2,4 +2,5 @@
 # 1'36
 
 function lib:sounds/music/stop
-playsound minecraft:music_disc.mellohi music @s 0 1000000 0 1000000
+scoreboard players set $music_id mem 4
+scoreboard players set @s music_time 0

data/lib/functions/sounds/music/rest.mcfunction

@@ -2,4 +2,5 @@
 # 3'17
 
 function lib:sounds/music/stop
-playsound minecraft:music_disc.mall music @s 0 1000000 0 1000000
+scoreboard players set $music_id mem 5
+scoreboard players set @s music_time 0

data/lib/functions/sounds/music/stop.mcfunction

@@ -1,3 +1,4 @@
 # 停止 BGM
 
-stopsound @s music
+stopsound @s music
+scoreboard players set $music_id mem 0

data/lib/functions/sounds/music/tick20.mcfunction

@@ -0,0 +1,18 @@
+
+scoreboard players remove @a music_time 1
+
+# lobby
+execute if score $music_id mem matches 1 run playsound minecraft:music_disc.wait music @a[scores={music_time=..0}] 0 1000000 0 1000000
+execute if score $music_id mem matches 1 run scoreboard players set @a[scores={music_time=..0}] music_time 231
+# mini_fast
+execute if score $music_id mem matches 2 run playsound minecraft:music_disc.pigstep music @a[scores={music_time=..0}] 0 1000000 0 1000000
+execute if score $music_id mem matches 2 run scoreboard players set @a[scores={music_time=..0}] music_time 148
+# mini_middle
+execute if score $music_id mem matches 3 run playsound minecraft:music_disc.cat music @a[scores={music_time=..0}] 0 1000000 0 1000000
+execute if score $music_id mem matches 3 run scoreboard players set @a[scores={music_time=..0}] music_time 185
+# mini_slow
+execute if score $music_id mem matches 4 run playsound minecraft:music_disc.mellohi music @a[scores={music_time=..0}] 0 1000000 0 1000000
+execute if score $music_id mem matches 4 run scoreboard players set @a[scores={music_time=..0}] music_time 96
+# rest
+execute if score $music_id mem matches 5 run playsound minecraft:music_disc.mall music @a[scores={music_time=..0}] 0 1000000 0 1000000
+execute if score $music_id mem matches 5 run scoreboard players set @a[scores={music_time=..0}] music_time 197

data/ltw/functions/clock/tick20.mcfunction

@@ -10,6 +10,7 @@ execute if score $state mem matches 4 run function ltw:state/4/tick20
 execute if score $state mem matches 5 run function ltw:state/5/tick20
 execute if score $state mem matches 6 run function ltw:state/6/tick20
 execute if score $state mem matches 7 run function ltw:state/7/tick20
+function lib:sounds/music/tick20
 
 # 特殊方块给予效果
 function lib:effect/regen

data/ltw/functions/init.mcfunction

@@ -55,6 +55,8 @@ scoreboard objectives remove effect_floating
 scoreboard objectives add effect_floating dummy "悬浮计时"
 scoreboard objectives remove game_id
 scoreboard objectives add game_id dummy "游戏编号"
+scoreboard objectives remove music_time
+scoreboard objectives add music_time dummy "BGM 时间"
 scoreboard players set $ game_id 0
 
 # 商店系统记分板

data/mini/functions/diamond/player_enter.mcfunction

@@ -1,5 +1,4 @@
 # 单个玩家开始小游戏时执行
-# TODO: 让 BGM 支持循环播放
 function lib:sounds/music/mini_slow
 title @s clear
 title @s actionbar ""