重构文件结构

data/ltw/functions/clock/tick1.mcfunction

@@ -1,6 +1,4 @@
 # 每 1 Tick 执行一次
 
 # 调用其他模块
-execute if score $state mem matches 3 run function ltw:state/3/tick1
-execute if score $state mem matches 5 run function ltw:state/5/tick1
-execute if score $state mem matches 7 run function ltw:state/7/tick1
+execute if score $state mem matches 5 run function ltw:state/5/tick1

data/ltw/functions/clock/tick2.mcfunction

@@ -0,0 +1,12 @@
+# 每秒执行一次
+schedule function ltw:clock/tick2 2t replace
+
+# 调用其他模块
+execute if score $state mem matches 3 run function ltw:state/3/tick2
+execute if score $state mem matches 4 run function ltw:state/4/tick2
+execute if score $state mem matches 5 run function ltw:state/5/tick2
+execute if score $state mem matches 6 run function ltw:state/6/tick2
+execute if score $state mem matches 7 run function ltw:state/7/tick2
+
+# 全局倒计时
+execute if score $countdown_fast mem matches 1.. run scoreboard players remove $countdown_fast mem 1

data/ltw/functions/clock/tick4.mcfunction

@@ -1,9 +0,0 @@
-# 每 0.2s 执行一次
-schedule function ltw:clock/tick4 4t replace
-
-# 调用其他模块
-execute if score $state mem matches 0 run function ltw:state/0/tick4
-execute if score $state mem matches 4 run function ltw:state/4/tick4
-execute if score $state mem matches 5 run function ltw:state/5/tick4
-execute if score $state mem matches 6 run function ltw:state/6/tick4
-function ltw:main/tick4

data/ltw/functions/clock/tick5.mcfunction

@@ -0,0 +1,7 @@
+# 每 0.25s 执行一次
+schedule function ltw:clock/tick5 5t replace
+
+# 调用其他模块
+execute if score $state mem matches 0 run function ltw:state/0/tick5
+execute if score $state mem matches 5 run function ltw:state/5/tick5
+function ltw:main/tick5

data/ltw/functions/init.mcfunction

@@ -30,7 +30,8 @@ team modify ltw collisionRule never
 
 
 # 时钟
-schedule function ltw:clock/tick4 4t replace
+schedule function ltw:clock/tick2 2t replace
+schedule function ltw:clock/tick5 5t replace
 schedule function ltw:clock/tick20 20t replace
 
 # 其他模块

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

@@ -17,4 +17,4 @@ execute store result score $mini_type mem run data get storage ltw:mini types[0]
 data remove storage ltw:mini types[0]
 
 # 初始化小游戏
-function mini:main/map_init
+function mini:main/game_init

data/ltw/functions/state/3/tick1.mcfunction → data/ltw/functions/state/3/tick2.mcfunction

@@ -1,3 +1,3 @@
 # 固定旁观
 execute as @a run spectate
-tp @a ~ 10000 ~ 0 0
+tp @a 0 10000 1000 0 0

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

@@ -9,7 +9,7 @@ effect give @s instant_health 10 0 true
 effect give @s night_vision 1000000 0 true
 
 # 显示小游戏介绍
-function mini:main/watcher_intro
+function mini:main/player_intro
 
 # 自由旁观
 gamemode spectator

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

@@ -2,10 +2,5 @@
 scoreboard players set $state mem 5
 execute as @a run function ltw:state/5/player_enter
 
-# HUD
-execute if score $mini_type mem matches ..2 run scoreboard objectives setdisplay sidebar
-execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay sidebar mini_heart
-scoreboard objectives setdisplay list total_score
-
 # 调用游戏开始
 function mini:main/game_start

data/ltw/functions/state/5/tick2.mcfunction

@@ -0,0 +1,2 @@
+function mini:main/watcher_limit
+function mini:main/tick2

data/ltw/functions/state/5/tick4.mcfunction

@@ -1,2 +0,0 @@
-function mini:main/tick4
-function mini:main/watcher_limit

data/ltw/functions/state/5/tick5.mcfunction

@@ -0,0 +1 @@
+function mini:main/tick5

data/mini/functions/colormatch/map_init.mcfunction → data/mini/functions/colormatch/game_init.mcfunction

@@ -18,7 +18,7 @@ scoreboard players set $color_match_type mem 0
 
 # 刷新地基
 function mini:colormatch/game/prepare_round
-schedule function mini:colormatch/map_init2 28t replace
+schedule function mini:colormatch/game_init2 28t replace
 
 # 关闭伤害
 gamerule fallDamage false

data/mini/functions/colormatch/init.mcfunction

@@ -1,3 +0,0 @@
-# 计分板初始化
-scoreboard objectives remove colormatch_heart
-scoreboard objectives add colormatch_heart dummy "玩家生命"

data/mini/functions/colormatch/tick4.mcfunction

@@ -1,3 +0,0 @@
-execute as @a[tag=mini_running] at @s if block ~ ~ ~ lava run function mini:colormatch/player_failed
-execute as @a[tag=mini_running] at @s if block ~ ~-1 ~ lava run function mini:colormatch/player_failed
-execute as @a[tag=mini_running] at @s if block ~ ~-2 ~ lava run function mini:colormatch/player_failed

data/mini/functions/colormatch/tick5.mcfunction

@@ -0,0 +1 @@
+execute as @a[tag=mini_running] at @s if block ~ ~ ~ lava run function mini:colormatch/player_failed

data/mini/functions/main/map_init.mcfunction → data/mini/functions/main/game_init.mcfunction

@@ -3,10 +3,10 @@ scoreboard players reset * mini_score
 scoreboard players reset * mini_heart
 
 # 小游戏初始化
-execute if score $mini_type mem matches 1 run function mini:parkour/map_init
-execute if score $mini_type mem matches 2 run function mini:tntrun/map_init
-execute if score $mini_type mem matches 3 run function mini:hotpm/map_init
-execute if score $mini_type mem matches 4 run function mini:colormatch/map_init
+execute if score $mini_type mem matches 1 run function mini:parkour/game_init
+execute if score $mini_type mem matches 2 run function mini:tntrun/game_init
+execute if score $mini_type mem matches 3 run function mini:hotpm/game_init
+execute if score $mini_type mem matches 4 run function mini:colormatch/game_init
 
 # 计算玩家数量
 execute store result score $alive mem if entity @a[tag=mini_running,tag=!watcher]

data/mini/functions/main/game_start.mcfunction

@@ -1,3 +1,12 @@
+
+# HUD
+execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay sidebar
+execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay sidebar
+execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay sidebar mini_heart
+execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay sidebar mini_heart
+scoreboard objectives setdisplay list total_score
+
+
 # 调用其他模块
 execute if score $mini_type mem matches 2 run function mini:tntrun/game_start
 execute if score $mini_type mem matches 3 run function mini:hotpm/game_start

data/mini/functions/main/init.mcfunction

@@ -1,6 +1,5 @@
 # 初始化
 function mini:tntrun/init
-function mini:colormatch/init
 
 # 计分板初始化
 scoreboard objectives remove mini_score

data/mini/functions/main/watcher_intro.mcfunction → data/mini/functions/main/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏时执行
-execute if score $mini_type mem matches 1 run function mini:parkour/watcher_intro
-execute if score $mini_type mem matches 2 run function mini:tntrun/watcher_intro
-execute if score $mini_type mem matches 3 run function mini:hotpm/watcher_intro
-execute if score $mini_type mem matches 4 run function mini:colormatch/watcher_intro
+execute if score $mini_type mem matches 1 run function mini:parkour/player_intro
+execute if score $mini_type mem matches 2 run function mini:tntrun/player_intro
+execute if score $mini_type mem matches 3 run function mini:hotpm/player_intro
+execute if score $mini_type mem matches 4 run function mini:colormatch/player_intro

data/mini/functions/main/tick2.mcfunction

@@ -0,0 +1 @@
+execute if score $mini_type mem matches 2 run function mini:tntrun/tick2

data/mini/functions/main/tick4.mcfunction → data/mini/functions/main/tick5.mcfunction

@@ -1,4 +1,4 @@
-execute if score $mini_type mem matches 1 run function mini:parkour/tick4
-execute if score $mini_type mem matches 2 run function mini:tntrun/tick4
-execute if score $mini_type mem matches 3 run function mini:hotpm/tick4
-execute if score $mini_type mem matches 4 run function mini:colormatch/tick4
+execute if score $mini_type mem matches 1 run function mini:parkour/tick5
+execute if score $mini_type mem matches 2 run function mini:tntrun/tick5
+execute if score $mini_type mem matches 3 run function mini:hotpm/tick5
+execute if score $mini_type mem matches 4 run function mini:colormatch/tick5

data/mini/functions/tntrun/tick1.mcfunction

@@ -1,9 +1,2 @@
 # 检测应该消失的方块
-execute as @a[tag=tntrun_pc,nbt={OnGround:1b}] at @s positioned ~ ~-1 ~ run function mini:tntrun/game/check_floor
-
-# 修改下面这一行的数字以调整方块消失的延迟（刻）
-# tntrun_timer=12
-execute as @e[tag=tntrun_block,scores={tntrun_timer=12}] at @s run setblock ~ ~ ~ air
-scoreboard players add @e[tag=tntrun_block] tntrun_timer 1
-execute as @e[tag=tntrun_block] at @s unless block ~ ~ ~ #mini:tntrun_floor run kill @s
-execute as @e[tag=tntrun_edge] at @s unless entity @a[tag=tntrun_pc,distance=..1.51] run kill @s
+execute as @a[tag=tntrun_pc,nbt={OnGround:1b}] at @s positioned ~ ~-1 ~ run function mini:tntrun/game/check_floor

data/mini/functions/tntrun/tick2.mcfunction

@@ -0,0 +1,7 @@
+# 控制方块消失
+
+# 修改下面这一行的数字以调整方块消失的延迟（单位为 2 刻，设置为 6 则为 12tick）
+execute as @e[tag=tntrun_block,scores={tntrun_timer=6}] at @s run setblock ~ ~ ~ air
+scoreboard players add @e[tag=tntrun_block] tntrun_timer 1
+execute as @e[tag=tntrun_block] at @s unless block ~ ~ ~ #mini:tntrun_floor run kill @s
+execute as @e[tag=tntrun_edge] at @s unless entity @a[tag=tntrun_pc,distance=..1.51] run kill @s

data/mini/functions/tntrun/tick4.mcfunction

@@ -1,4 +0,0 @@
-# 玩家死亡判断
-execute as @a[tag=mini_running] at @s if block ~ ~ ~ lava run function mini:tntrun/player_failed
-execute as @a[tag=mini_running] at @s if block ~ ~-1 ~ lava run function mini:tntrun/player_failed
-execute as @a[tag=mini_running] at @s if block ~ ~-2 ~ lava run function mini:tntrun/player_failed

data/mini/functions/tntrun/tick5.mcfunction

@@ -0,0 +1,2 @@
+# 玩家死亡判断
+execute as @a[tag=mini_running] at @s if block ~ ~ ~ lava run function mini:tntrun/player_failed

data/test/functions/start_colormatch.mcfunction

@@ -3,7 +3,7 @@ tag @a remove watcher
 function ltw:state/0/start_gameparty
 scoreboard players set $round mem 100
 scoreboard players set $mini_type mem 4
-function mini:main/map_init
+function mini:main/game_init
 function ltw:state/4/state_enter
 scoreboard players set $countdown mem 5
 say 已开始陷阱迷阵！

data/test/functions/start_hotpm.mcfunction

@@ -4,7 +4,7 @@ tag @a remove watcher
 function ltw:state/0/start_gameparty
 scoreboard players set $round mem 100
 scoreboard players set $mini_type mem 3
-function mini:main/map_init
+function mini:main/game_init
 function ltw:state/4/state_enter
 scoreboard players set $countdown mem 5
 say 已开始热土豆！

data/test/functions/start_parkour.mcfunction

@@ -4,7 +4,7 @@ tag @a remove watcher
 function ltw:state/0/start_gameparty
 scoreboard players set $round mem 100
 scoreboard players set $mini_type mem 1
-function mini:main/map_init
+function mini:main/game_init
 function ltw:state/4/state_enter
 scoreboard players set $countdown mem 5
 say 已开始跑酷！

data/test/functions/start_tntrun.mcfunction

@@ -4,7 +4,7 @@ tag @a remove watcher
 function ltw:state/0/start_gameparty
 scoreboard players set $round mem 100
 scoreboard players set $mini_type mem 2
-function mini:main/map_init
+function mini:main/game_init
 function ltw:state/4/state_enter
 scoreboard players set $countdown mem 5
 say 已开始 TNT Run！