Merge branch 'master' of github.com:00ll00/LTW3

data/lib/functions/sounds/travel.mcfunction

@@ -1 +1 @@
-playsound minecraft:block.portal.travel block @s ~ ~ ~ 0.7 2
+playsound minecraft:block.portal.travel block @s ~ ~ ~ 0.4 2

data/ltw/functions/state/6/tick20.mcfunction

@@ -4,4 +4,4 @@ title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}
 title @a title [""]
 
 # 退出状态
-execute if score $countdown mem matches ..12 run function ltw:state/7/state_enter
+execute if score $countdown mem matches ..11 run function ltw:state/7/state_enter

data/ltw/functions/state/7/state_enter.mcfunction

@@ -8,7 +8,7 @@ scoreboard objectives setdisplay sidebar total_score
 scoreboard objectives setdisplay list total_score_disp
 
 # 初始化倒计时
-scoreboard players set $countdown mem 12
+scoreboard players set $countdown mem 11
 
 # 初始化地图
 forceload add 0 2000 50 2050

data/ltw/functions/state/8/next.mcfunction

@@ -0,0 +1 @@
+say 下一个！

data/ltw/functions/state/8/player_enter.mcfunction

@@ -12,8 +12,11 @@ effect give @s resistance 1000000 4 true
 # 传送玩家
 tp @s 7.0 11.4 2007.0 0 0
 
+# 播放音效
+execute at @s run function lib:sounds/travel
+
 # 自由旁观
 gamemode spectator
 spectate
 
-# 如果玩家在奖励选择阶段重连，玩家应该跳过此次奖励选择
+# FIXME : 如果玩家在奖励选择阶段重连，玩家应该跳过此次奖励选择

data/ltw/functions/state/8/tick20.mcfunction

@@ -0,0 +1,7 @@
+# 显示倒计时
+title @a times 3 14 2
+title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}
+title @a title ""
+
+# 下一状态
+execute if score $countdown mem matches 0 run function ltw:state/8/next

data/test/functions/generate_bonus.mcfunction

@@ -2,6 +2,7 @@
 
 tag @a remove watcher
 scoreboard players set $round mem 4
+scoreboard players set $countdown mem 11
 function ltw:state/7/state_enter
 scoreboard players set $state mem 0
 gamemode creative @a