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

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

@@ -3,4 +3,4 @@ function mini:main/watcher_limit
 
 # 渐渐变暗
 execute as @a[tag=!debug] at @s positioned ~ ~1.5 ~ positioned ^ ^ ^1 run particle dust 0 0 0 1000 ~ ~ ~ 1 1 1 0 15 force @s
-execute as @a[tag=!debug] at @s positioned ~ ~0.5 ~ positioned ^ ^ ^1 run particle dust 0 0 0 1000 ~ ~ ~ 1 1 1 0 15 force @s
+execute if score $countdown mem matches ..2 as @a[tag=!debug] at @s positioned ~ ~0.5 ~ positioned ^ ^ ^1 run particle dust 0 0 0 1000 ~ ~ ~ 1 1 1 0 25 force @s

data/mini/functions/parkour/game_start.mcfunction

@@ -1,12 +1,12 @@
 # 游戏结束倒计时
-scoreboard players set $countdown mem 150
+scoreboard players set $countdown mem 140
 
 # HUD
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay list total_score_disp
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay belowName total_score_disp
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay sidebar treasure
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 150
+scoreboard players set $countdown_max mem 140
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:blue name "剩余时间"

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

@@ -9,6 +9,6 @@ execute if score $random mem matches 1 run attribute @e[tag=new_phantom,limit=1]
 execute if score $random mem matches 2 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 4
 execute if score $random mem matches 3 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 5
 
-attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 3.5
+attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 3
 effect give @e[tag=new_phantom] instant_damage
 tag @e[tag=new_phantom] remove new_phantom