第二轮补丁

data/item/functions/bonus_item/add_score.mcfunction

@@ -10,7 +10,8 @@ execute if score #bonus_add_score mem matches 1..10 run tellraw @a ["",{"text":
 execute if score #bonus_add_score mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 没能获得积分……"]
 
 # 清零
-execute if score #bonus_add_score mem matches ..-1 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的积分惨遭清零……"]
+execute if score #bonus_add_score mem matches ..-1 if score @s total_score matches 0 run tellraw @a [{"text":"","color":"red"},{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"white"}," 的 ",{"score": {"name": "@s","objective": "total_score"}}," 没能获得积分……"]
+execute if score #bonus_add_score mem matches ..-1 if score @s total_score matches 1.. run tellraw @a [{"text":"","color":"red"},{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"white"}," 的 ",{"score": {"name": "@s","objective": "total_score"}}," 积分惨遭清零……"]
 execute if score #bonus_add_score mem matches ..-1 run scoreboard players set @s total_score 0
 execute if score #bonus_add_score mem matches ..-1 run scoreboard players set @s total_score_disp 0
 

data/item/functions/particle/show_particle.mcfunction → data/item/functions/particle/tick2.mcfunction

@@ -2,12 +2,12 @@
 tag @a remove invisible
 tag @a[nbt={ActiveEffects:[{Id:14b}]}] add invisible
 
-# 播放玩家粒子效果
-execute as @a[scores={particle_type=1},gamemode=!spectator,tag=!invisible] at @s run particle electric_spark ~ ~0.5 ~ 0.25 0.3 0.25 0 1 force @a
-execute as @a[scores={particle_type=2},gamemode=!spectator,tag=!invisible] at @s run particle composter ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a
-execute as @a[scores={particle_type=3},gamemode=!spectator,tag=!invisible] at @s run particle glow ~ ~0.2 ~ 0.2 0.1 0.2 0 1 force @a
-execute as @a[scores={particle_type=4},gamemode=!spectator,tag=!invisible] at @s run particle witch ~ ~0.2 ~ 0.25 0.1 0.25 0 1 force @a
-execute as @a[scores={particle_type=5},gamemode=!spectator,tag=!invisible] at @s run particle wax_on ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a
+# 播放玩家粒子效果（他人）
+execute as @a[scores={particle_type=1},gamemode=!spectator,tag=!invisible] at @s run particle electric_spark ~ ~0.5 ~ 0.25 0.3 0.25 0 1 force @a[distance=0.01..]
+execute as @a[scores={particle_type=2},gamemode=!spectator,tag=!invisible] at @s run particle composter ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a[distance=0.01..]
+execute as @a[scores={particle_type=3},gamemode=!spectator,tag=!invisible] at @s run particle glow ~ ~0.2 ~ 0.2 0.1 0.2 0 1 force @a[distance=0.01..]
+execute as @a[scores={particle_type=4},gamemode=!spectator,tag=!invisible] at @s run particle witch ~ ~0.2 ~ 0.25 0.1 0.25 0 1 force @a[distance=0.01..]
+execute as @a[scores={particle_type=5},gamemode=!spectator,tag=!invisible] at @s run particle wax_on ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a[distance=0.01..]
 
 # 播放展示用实体的粒子效果
 execute as @e[tag=show_particle_1] at @s run particle electric_spark ~ ~0.5 ~ 0.1 0.1 0.1 0 1 force @a

data/item/functions/particle/tick5.mcfunction

@@ -0,0 +1,6 @@
+# 播放玩家粒子效果（自己）
+execute as @a[scores={particle_type=1},gamemode=!spectator,tag=!invisible] at @s run particle electric_spark ~ ~0.5 ~ 0.25 0.3 0.25 0 1 force @a
+execute as @a[scores={particle_type=2},gamemode=!spectator,tag=!invisible] at @s run particle composter ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a
+execute as @a[scores={particle_type=3},gamemode=!spectator,tag=!invisible] at @s run particle glow ~ ~0.2 ~ 0.2 0.1 0.2 0 1 force @a
+execute as @a[scores={particle_type=4},gamemode=!spectator,tag=!invisible] at @s run particle witch ~ ~0.2 ~ 0.25 0.1 0.25 0 1 force @a
+execute as @a[scores={particle_type=5},gamemode=!spectator,tag=!invisible] at @s run particle wax_on ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a

data/item/functions/tick2.mcfunction

@@ -22,4 +22,7 @@ execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 1.5
 execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 2.5 2.5 2.5 1 1 normal
 
 # 禁止捡起、在落地 10 秒后清理
-execute as @e[type=arrow,tag=!projectile_checked] run data merge entity @s {pickup:0,life:1000,Tags:["projectile_checked"]}
+execute as @e[type=arrow,tag=!projectile_checked] run data merge entity @s {pickup:0,life:1000,Tags:["projectile_checked"]}
+
+# 调用粒子模块
+function item:particle/tick2

data/item/functions/tick5.mcfunction

@@ -1,3 +1,6 @@
 # 物品特效
 execute as @e[tag=item_gray] at @s run particle minecraft:wax_on ~ ~0.3 ~ 0.2 0.2 0.2 0 1 normal
-execute as @e[tag=item_green] at @s run particle minecraft:glow ~ ~0.3 ~ 0.2 0.2 0.2 0 1 normal
+execute as @e[tag=item_green] at @s run particle minecraft:glow ~ ~0.3 ~ 0.2 0.2 0.2 0 1 normal
+
+# 调用粒子模块
+function item:particle/tick5

data/ltw/functions/clock/tick2.mcfunction

@@ -20,9 +20,6 @@ function lib:effect/floating
 # 调用节奏方块模块
 execute if score $tempo_enable mem matches 1 run function lib:tempo_block/tick2
 
-# 调用粒子模块
-function item:particle/show_particle
-
 # 调用物品模块（必须最后调用）
 function item:tick2
 

data/ltw/functions/main/game_end.mcfunction

@@ -61,9 +61,9 @@ execute if score #count mem matches ..2 run scoreboard players set #rankl_gold m
 
 # 显示排名
 tellraw @a ["",{"text":"\n------  全场游戏结束！ ------\n","color":"light_purple","bold":true}]
-tellraw @a ["  ",{"text": "第一名 >  ","color":"red"},{"selector": "@a[tag=total_rank1]","color":"red"},{"text":"（","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
-execute if entity @a[tag=total_rank2] run tellraw @a ["  ",{"text": "第二名 >  ","color":"gold"},{"selector": "@a[tag=total_rank2]","color":"gold"},{"text":"（","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
-execute if entity @a[tag=total_rank3] run tellraw @a ["  ",{"text": "第三名 >  ","color":"yellow"},{"selector": "@a[tag=total_rank3]","color":"yellow"},{"text":"（","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
+tellraw @a ["  ",{"text": "第一名 >  ","color":"red"},{"selector": "@a[tag=total_rank1]","color":"red"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"}]
+execute if entity @a[tag=total_rank2] run tellraw @a ["  ",{"text": "第二名 >  ","color":"gold"},{"selector": "@a[tag=total_rank2]","color":"gold"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"}]
+execute if entity @a[tag=total_rank3] run tellraw @a ["  ",{"text": "第三名 >  ","color":"yellow"},{"selector": "@a[tag=total_rank3]","color":"yellow"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"}]
 tellraw @a ""
 
 # 积分金粒奖励

data/ltw/functions/main/player_enter_watcher.mcfunction

@@ -22,4 +22,4 @@ execute if score $state mem matches 7 run function ltw:state/7/player_enter
 tag @s remove rejoining
 
 # 显示轮数提醒
-execute unless score $state mem matches 0 run tellraw @s ["",{"text":">> ","color":"aqua","bold":true},"你目前正在旁观中, 游戏进行至第 ",{"score": {"name": "$round","objective": "mem"},"color": "aqua"}, {"text":"/5","color": "aqua"}," 轮, 游戏结束后就能加入啦!"]
+execute unless score $state mem matches 0 run tellraw @s ["\n",{"text":">> ","color":"aqua","bold":true},"你目前正在旁观, 游戏正在第 ",{"score": {"name": "$round","objective": "mem"},"color": "aqua"}, {"text":"/5","color": "aqua"}," 轮! 结束后你就能加入啦!\n"]

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

@@ -21,6 +21,9 @@ scoreboard players set $tempo_enable mem 0
 # 修改队伍颜色
 team modify playing color reset
 
+# 清理奖励物资
+kill @e[tag=bonus_item]
+
 # 小游戏编号：生成一个 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/ass/game/new_item.mcfunction

@@ -1,7 +1,3 @@
-title @a subtitle {"text":"❇ 奖励物资已在空中部署 ❇","color":"aqua"}
-title @a times 1 60 3
-title @a title ""
-playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 scoreboard players set $new_item_cd mem 0
 
 # 随机选择生成组
@@ -18,4 +14,11 @@ execute if score $random mem matches 2 positioned 1007.0 21 7016.5 run function
 execute if score $random mem matches 2 positioned 1025.0 21 7017.5 run function item:bonus_item/gameparty/auto/low
 execute if score $random mem matches 3 positioned 1016.5 21 7026.0 run function item:bonus_item/gameparty/auto/low
 execute if score $random mem matches 3 positioned 1015.5 21 7008.0 run function item:bonus_item/gameparty/auto/low
-execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b
+execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b
+
+# 显示提示
+title @a subtitle {"text":"❇ 奖励物资已在空中部署 ❇","color":"aqua"}
+title @a times 1 60 3
+title @a title ""
+tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text":"奖励物资：","color":"aqua"},{"selector": "@e[tag=bonus_item]"}]
+playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2

data/mini/functions/ass/init.mcfunction

@@ -2,4 +2,4 @@
 scoreboard objectives remove creeperUse
 scoreboard objectives add creeperUse minecraft.used:minecraft.creeper_spawn_egg "苦力怕计数器"
 scoreboard objectives remove health_alive
-scoreboard objectives add health_alive dummy
+scoreboard objectives add health_alive dummy "生命值"

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

@@ -1,7 +1,3 @@
-title @a subtitle {"text":"❇ 奖励物资已在空中部署 ❇","color":"aqua"}
-title @a times 1 60 3
-title @a title ""
-playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 scoreboard players set $new_item_cd mem 0
 
 # 随机选择生成组
@@ -14,4 +10,11 @@ execute if score $random mem matches 0 positioned 1060.5 26 4002.5 run function
 execute if score $random mem matches 0 positioned 1060.5 26 4018.5 run function item:bonus_item/gameparty/auto/low
 execute if score $random mem matches 1 positioned 1068.5 26 4010.5 run function item:bonus_item/gameparty/auto/low
 execute if score $random mem matches 1 positioned 1052.5 26 4010.5 run function item:bonus_item/gameparty/auto/low
-execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b
+execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b
+
+# 显示提示
+title @a subtitle {"text":"❇ 奖励物资已在空中部署 ❇","color":"aqua"}
+title @a times 1 60 3
+title @a title ""
+tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text":"奖励物资：","color":"aqua"},{"selector": "@e[tag=bonus_item]"}]
+playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2

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

@@ -11,7 +11,7 @@ execute as @a at @s run function lib:sounds/hit2
 scoreboard players set $countdown_fast mem 28
 scoreboard players operation $countdown_fast mem < $color_match_time mem
 scoreboard players remove $countdown_fast mem 3
-execute if score $countdown_fast mem matches ..17 run scoreboard players set $countdown_fast mem 18
+execute if score $countdown_fast mem matches ..13 run scoreboard players set $countdown_fast mem 14
 scoreboard players set $color_match_type mem 1
 
 # HUD

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

@@ -4,7 +4,8 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colormatch_floor
 
 # 设置倒计时
-execute if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
+execute if score #max_speed mem matches 0 if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
+execute if score #max_speed mem matches 1 if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 3
 execute if score $color_match_time mem matches 11..14 run scoreboard players remove $color_match_time mem 1
 execute if score $color_match_time mem matches 15..19 run scoreboard players remove $color_match_time mem 2
 execute if score $color_match_time mem matches 20..29 run scoreboard players remove $color_match_time mem 3

data/mini/functions/hotpm/game/new_item.mcfunction

@@ -1,7 +1,3 @@
-title @a subtitle {"text":"❇ 奖励物资已在空中部署 ❇","color":"aqua"}
-title @a times 1 60 3
-title @a title ""
-playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 scoreboard players set $new_item_cd mem 0
 
 # 随机选择生成组
@@ -16,4 +12,11 @@ execute if score $random mem matches 1 positioned 1023.5 19.0 3008.5 run functio
 execute if score $random mem matches 1 positioned 1010.5 19.0 3022.5 run function item:bonus_item/gameparty/auto/low
 execute if score $random mem matches 2 positioned 1017.0 19.0 3024.0 run function item:bonus_item/gameparty/auto/low
 execute if score $random mem matches 2 positioned 1017.5 19.0 3005.5 run function item:bonus_item/gameparty/auto/low
-execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b
+execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b
+
+# 显示提示
+title @a subtitle {"text":"❇ 奖励物资已在空中部署 ❇","color":"aqua"}
+title @a times 1 60 3
+title @a title ""
+tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text":"奖励物资：","color":"aqua"},{"selector": "@e[tag=bonus_item]"}]
+playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2

data/mini/functions/hotpm/game/pm_get.mcfunction

@@ -2,6 +2,4 @@
 tag @s add pm_holding
 
 function lib:sounds/hit2
-effect give @s glowing 1000000 0 true
-effect clear @s speed
-effect give @s speed 1000000 2 true
+effect give @s glowing 1000000 0 true

data/mini/functions/hotpm/tick5.mcfunction

@@ -6,3 +6,6 @@
 execute as @a[tag=pm_holding] at @s run playsound minecraft:entity.creeper.primed player @s 0 1000000 0 1000000
 execute as @a[tag=pm_holding] at @s run playsound minecraft:entity.creeper.primed player @a[distance=0.01..] ~ ~ ~ 0.8
 execute as @a[tag=pm_holding] at @s run playsound minecraft:entity.creeper.primed player @a[distance=0.01..] ~ ~ ~ 0.4
+
+# 土豆的加速效果
+effect give @a[tag=pm_holding] speed 1 2 true

data/mini/functions/iron/watcher_limit.mcfunction

@@ -1,3 +1,4 @@
 # 观察者限制飞行范围
+execute unless score $state mem matches 5 run tp @a[gamemode=spectator,team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
 tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1010.90 259.12 5024.86 -147.81 49.05

data/mini/functions/parkour/player_finished.mcfunction

@@ -15,7 +15,7 @@ execute if score #temp mem matches 1..30 run advancement grant @s only ltw:parko
 # 显示提示
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点，用时 ","color":"green"},{"score": {"name": "#temp","objective": "mem"}}," 秒",{"text": "！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches 2..3 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]
-execute if entity @s[tag=!rejoining] if score $player_finish mem matches 3 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "前三名已全部决出！无需再前往终点了，专心收集宝藏吧！","color":"aqua"}]
+execute if entity @s[tag=!rejoining] if score $player_finish mem matches 3 run tellraw @a[tag=mini_running] ["\n",{"text": ">> ","color":"aqua","bold": true},{"text": "前三名已全部决出！无需再前往终点了，专心收集宝藏吧！\n","color":"aqua"}]
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches ..2 run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text": "继续收集宝藏，直到时间结束吧！","color":"aqua"}]
 execute if score $player_finish mem matches ..3 as @a at @s run function lib:sounds/levelup
 

data/mini/functions/parkour/watcher_limit.mcfunction

@@ -1,2 +1,4 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator,team=!debugging] at @s unless entity @a[team=playing,distance=..2] run spectate @p[team=playing]
+execute unless score $state mem matches 5 run tp @a[gamemode=spectator,team=!debugging] 1010.96 26.83 1032.37 -385.24 16.67
+execute if score $state mem matches 5 as @a[gamemode=spectator,team=!debugging] at @s unless entity @a[team=playing,gamemode=!spectator,distance=..2] run spectate @p[team=playing,gamemode=!spectator]
+execute if score $state mem matches 5 run title @a[gamemode=spectator] actionbar {"text":"按数字键旁观其他玩家"}

data/mini/functions/phantom/game/new_item.mcfunction

@@ -2,4 +2,4 @@ function item:bonus_item/gameparty/auto/low
 execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.6,0.0]}
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 kill @s
-tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "红色幻翼已被击杀！","color":"red"}]
+tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text":"红色幻翼掉落了奖励物资：","color":"red"},{"selector": "@e[tag=bonus_item,limit=1,sort=nearest]"}]

data/mini/functions/phantom/game/summon2.mcfunction

@@ -2,8 +2,12 @@
 execute as @e[tag=new_phantom] at @s run tp @s ~ 33 ~
 
 # 设置攻击力与随机生命值
-attribute @e[tag=new_phantom,limit=1] generic.max_health base set 2
 attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 4
+scoreboard players set $random_min mem 1
+scoreboard players set $random_max mem 2
+function lib:random
+execute if score $random mem matches 1 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 2
+execute if score $random mem matches 2 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 5
 
 # 如果满足条件（在 tick20 中检查），则刷出奖励幻翼
 execute if score #new_item mem matches 0 run tellraw @a ["\n",{"text": ">> ","color":"red","bold": true},{"text": "击杀红色幻翼, 获取奖励物资！\n","color":"red"}]

data/mini/functions/phantom/tick20.mcfunction

@@ -1,8 +1,8 @@
 # 给予进度
-execute as @a[team=playing,scores={temp=1..,kill_phantom=7}] run advancement grant @s only ltw:blood/phantom1
-execute as @a[team=playing,scores={temp=1..,kill_phantom=14}] run advancement grant @s only ltw:blood/phantom2
-execute as @a[team=playing,scores={temp=1..,kill_phantom=21}] run advancement grant @s only ltw:blood/phantom3
-execute as @a[team=playing,scores={temp=1..,kill_phantom=28}] run advancement grant @s only ltw:blood/phantom4
+execute as @a[team=playing,scores={temp=1..,kill_phantom=7..9}] run advancement grant @s only ltw:blood/phantom1
+execute as @a[team=playing,scores={temp=1..,kill_phantom=14..16}] run advancement grant @s only ltw:blood/phantom2
+execute as @a[team=playing,scores={temp=1..,kill_phantom=21..23}] run advancement grant @s only ltw:blood/phantom3
+execute as @a[team=playing,scores={temp=1..,kill_phantom=28..30}] run advancement grant @s only ltw:blood/phantom4
 
 # 判断是否符合刷出新物品的条件：0 为可以，其他为不可以
 scoreboard players set #new_item mem 0

data/mini/functions/trade/watcher_limit.mcfunction

@@ -1,3 +1,4 @@
 # 观察者限制飞行范围
+execute unless score $state mem matches 5 run tp @a[gamemode=spectator,team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
 tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1010.90 259.12 5024.86 -147.81 49.05