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

data/ltw/functions/init.mcfunction

@@ -12,6 +12,7 @@ gamerule doWeatherCycle false
 gamerule doImmediateRespawn true
 gamerule mobGriefing false
 gamerule randomTickSpeed 0
+gamerule fireDamage false
 
 # 记分板
 scoreboard objectives remove mem
@@ -26,7 +27,7 @@ scoreboard players set $ game_id 0
 
 #全局变量（常量）
 #   minigame总数
-scoreboard players set $global_mini_count mem 3
+scoreboard players set $global_mini_count mem 4
 
 
 # 队伍

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

@@ -8,7 +8,6 @@ scoreboard objectives setdisplay list
 
 # 关闭伤害
 gamerule fallDamage false
-gamerule fireDamage false
 
 # 清理加载区域
 forceload remove all

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 热土豆 4 陷阱迷阵
+# 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/ltw/functions/state/4/player_enter.mcfunction

@@ -9,12 +9,12 @@ effect give @s saturation 1000000 0 true
 effect give @s instant_health 10 0 true
 effect give @s night_vision 1000000 0 true
 
-# 播放音效
-function lib:sounds/travel
-
 # 显示小游戏介绍
 function mini:main/player_intro
 
+# 播放音效
+execute at @s run function lib:sounds/travel
+
 # 自由旁观
 gamemode spectator
 spectate

data/mini/functions/colormatch/game_init.mcfunction

@@ -19,5 +19,4 @@ function mini:colormatch/game/prepare_round
 schedule function mini:colormatch/game_init2 18t replace
 
 # 关闭伤害
-gamerule fallDamage false
-gamerule fireDamage false
+gamerule fallDamage false

data/mini/functions/hotpm/game_init.mcfunction

@@ -3,7 +3,6 @@ forceload add 1000 3000 1100 3100
 
 # 关闭伤害
 gamerule fallDamage false
-gamerule fireDamage false
 
 # 生成地图
 

data/mini/functions/parkour/game_init.mcfunction

@@ -7,4 +7,3 @@ setblock 1000 11 1000 minecraft:redstone_block
 
 # 关闭伤害
 gamerule fallDamage false
-gamerule fireDamage false

data/mini/functions/tntrun/game_init.mcfunction

@@ -10,4 +10,3 @@ kill @e[tag=tntrun_block]
 
 # 关闭伤害
 gamerule fallDamage false
-gamerule fireDamage false