修复color match的一些bug

data/mini/functions/colormatch/get_random_floor.mcfunction

@@ -29,7 +29,7 @@ execute positioned 1001 10 4000 if score $random mem matches 21 run clone ~ ~ ~
 execute positioned 1001 10 4000 if score $random mem matches 22 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered red_concrete
 execute positioned 1001 10 4000 if score $random mem matches 23 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered netherrack
 execute positioned 1001 10 4000 if score $random mem matches 24 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered red_nether_bricks
-execute positioned 1001 10 4000 if score $random mem matches 24 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered bricks
+execute positioned 1001 10 4000 if score $random mem matches 25 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered bricks
 
 # 存计分板
 scoreboard players operation $color_match_floor mem = $random mem

data/mini/functions/colormatch/remove_ground.mcfunction

@@ -2,9 +2,9 @@
 execute positioned 1001 11 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
 
 # 告知玩家
-tellraw @a [{"text":">> ","color":"gold","bold": true},{"text":" 时间到！","color":"white","bold": false}]
+tellraw @a [{"text":">> ","color":"gold","bold": true},{"text":"时间到！","color":"white","bold": false}]
 # 重置分数
-scoreboard players set $countdown mem 5
+scoreboard players set $countdown mem 3
 scoreboard players set $color_match_type mem 1
 
 # 预备下一轮

data/mini/functions/colormatch/spectator_range.mcfunction

@@ -1,3 +1,3 @@
-# TODO 观察者限定范围
+# 观察者限定范围
 execute as @a[gamemode=spectator,x=1049,y=10,z=4025,dx=27,dz=27,dy=30] run spectate
 tp @a[gamemode=spectator,x=1049,y=10,z=4025,dx=27,dz=27,dy=30] 1062 30 4012 0 180

data/mini/functions/colormatch/start_new_round.mcfunction

@@ -5,7 +5,9 @@ execute positioned 1001 10 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
 
 # 设置倒计时
 scoreboard players add $color_match_round mem 1
-execute if score $color_match_round mem matches 2 run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_round mem matches 2 if score $color_match_time mem matches 4.. run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_round mem matches 2 run tellraw @a [{"text":">> ","color":"gold","bold": true},{"text":"地板消失速度提升！","color":"white","bold": false}]
+
 execute if score $color_match_round mem matches 2 run scoreboard players set $color_match_round mem 0
 scoreboard players operation $countdown mem = $color_match_time mem
 

data/mini/functions/colormatch/tick20.mcfunction

@@ -4,4 +4,5 @@ execute if score $countdown mem matches 0 if score $color_match_type mem matches
 execute if score $countdown mem matches 0 if score $color_match_type mem matches 1 run function mini:colormatch/start_new_round
 
 # 显示当前剩余秒数
-execute if score $countdown mem matches 1.. run title @a actionbar [{"text":"剩余时间: ","color":"red","bold": true},{"score": { "name": "$countdown","objective": "mem"}}]
+execute if score $countdown mem matches 1.. if score $color_match_type mem matches 0 run title @a actionbar [{"text":"距离地板消失: ","color":"red","bold": true},{"score": { "name": "$countdown","objective": "mem"}}]
+execute if score $countdown mem matches 1.. if score $color_match_type mem matches 1 run title @a actionbar [{"text":"距离下一轮开始: ","color":"red","bold": true},{"score": { "name": "$countdown","objective": "mem"}}]