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

data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -11,5 +11,8 @@ scoreboard players operation $countdown_fast mem = $color_match_time mem
 # 重置分数
 scoreboard players set $color_match_type mem 0
 
+# 拉玩家下来
+execute as @a[tag=color_match_fall] at @s run tp @s ~ 17 ~
+tag @a[tag=color_match_fall] remove color_match_fall
 # 告知玩家
 execute as @a at @s run function lib:sounds/hit

data/mini/functions/colormatch/game_init.mcfunction

@@ -3,6 +3,7 @@ forceload add 1001 4000 1075 4025
 fill 1049 10 4025 1075 10 3999 bedrock
 fill 1074 11 4000 1050 11 4024 magma_block
 fill 1074 15 4000 1050 15 4024 stone
+fill 1074 25 4000 1050 25 4024 barrier
 fill 1075 11 3999 1075 40 4025 stone
 fill 1075 11 3999 1049 40 3999 stone
 fill 1049 11 3999 1049 40 4025 stone

data/mini/functions/colormatch/player_lose_heart.mcfunction

@@ -4,7 +4,7 @@ tellraw @a [{"text":">> ","color":"gold","bold": true},{"selector":"@s","color":
 # 失去一颗心
 function mini:main/player_lose_heart
 
-# 拉回来
-execute if entity @s[tag=mini_running] run tp @s ~ 17 ~
-effect give @s levitation 7 255
+# 拉上屏障
+execute if entity @s[tag=mini_running] run tp @s ~ 27 ~
 effect give @s speed 7 2
+tag @s add color_match_fall