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

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

@@ -10,7 +10,7 @@ scoreboard objectives setdisplay list total_score
 scoreboard players set $countdown mem 10
 
 # 小游戏编号
-# 1 跑酷；2 TNT Run；3 热土豆
+# 1 跑酷；2 TNT Run；3 热土豆 4 陷阱迷阵
 # 优化下一次游戏的选择：生成一个 1~[最大游戏编号] 的 randomarray，每次从其中取下一个数。
 execute unless data storage ltw:mini types[0] run function ltw:state/3/newarray
 execute store result score $mini_type mem run data get storage ltw:mini types[0]

data/mini/functions/colormatch/game_init.mcfunction

@@ -7,7 +7,6 @@ fill 1075 11 3999 1075 40 4025 stone
 fill 1075 11 3999 1049 40 3999 stone
 fill 1049 11 3999 1049 40 4025 stone
 fill 1049 11 4025 1075 40 4025 stone
-fill 1074 30 4024 1050 30 4000 barrier
 
 # 设置分数
 scoreboard players set $color_match_time mem 70

data/mini/functions/colormatch/player_lose_heart.mcfunction

@@ -5,6 +5,6 @@ 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 ~ 16.1 ~
+execute if entity @s[tag=mini_running] run tp @s ~ 17 ~
 effect give @s levitation 7 255
 effect give @s speed 7 2

data/mini/functions/colormatch/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限定范围
-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 22 4012 20 180
+execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=27,dz=27,dy=30] run spectate
+execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=27,dz=27,dy=30] run tp @s 1062 22 4012 20 180