LTCatt 6 лет назад
Родитель
Сommit
dfc0e86950

+ 2 - 3
data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -4,8 +4,8 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
 
 # 设置倒计时
-execute if score $color_match_time mem matches 47.. run scoreboard players remove $color_match_time mem 5
-execute if score $color_match_time mem matches 18..46 run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_time mem matches 37.. run scoreboard players remove $color_match_time mem 5
+execute if score $color_match_time mem matches 17..36 run scoreboard players remove $color_match_time mem 1
 scoreboard players operation $countdown_fast mem = $color_match_time mem
 
 # 重置分数
@@ -13,4 +13,3 @@ scoreboard players set $color_match_type mem 0
 
 # 告知玩家
 execute as @a at @s run function lib:sounds/hit
-# tellraw @a [{"text":">> ","color":"gold","bold": true},{"text":"新的一轮开始了!","color":"white","bold": false}]

+ 3 - 3
data/mini/functions/hotpm/game/pm_init.mcfunction

@@ -7,9 +7,9 @@ tellraw @a [{"text":">> ","color":"gold","bold": true},{"selector":"@a[tag=pm_ho
 # 强制观战
 execute at @s as @a[gamemode=spectator,distance=..0.1] run spectate @p[tag=pm_hoding]
 
-# 土豆爆炸时间 = 2.5 * 存活人数 + 3(秒)
-scoreboard players set $countdown_fast mem 25
-execute as @a[tag=mini_running] run scoreboard players add $countdown_fast mem 30
+# 土豆爆炸时间 = 2 * 存活人数 + 4(秒)
+scoreboard players set $countdown_fast mem 40
+execute as @a[tag=mini_running] run scoreboard players add $countdown_fast mem 20
 
 # 删除效果云
 kill @s[type=area_effect_cloud,tag=pm_boom]

+ 3 - 0
data/mini/functions/main/player_failed.mcfunction

@@ -4,7 +4,10 @@
 tag @s remove mini_running
 execute store result score $alive mem if entity @a[tag=mini_running,tag=!watcher]
 execute store result score $t_finish mem if entity @a[tag=!mini_running,tag=!watcher]
+
+# 显示提示
 execute if entity @s[tag=!rejoining] if score $alive mem matches 1.. run tellraw @a [{"selector": "@s","color":"red"}," 已失败! 剩余 ",{"score": {"name": "$alive","objective": "mem"}}," 人!"]
+execute as @a at @s run function lib:sounds/error
 
 # 给存活的玩家加分
 scoreboard players add @a[tag=mini_running] mini_score 1

+ 3 - 0
data/mini/functions/main/player_finished.mcfunction

@@ -4,7 +4,10 @@
 tag @s remove mini_running
 execute store result score $alive mem if entity @a[tag=mini_running,tag=!watcher]
 execute store result score $t_finish mem if entity @a[tag=!mini_running,tag=!watcher]
+
+# 显示提示
 execute if entity @s[tag=!rejoining] if score $t_finish mem matches ..3 run tellraw @a [{"selector": "@s","color":"green"}," 已成功! 第 ",{"score": {"name": "$t_finish","objective": "mem"}}," 名!"]
+execute as @a at @s run function lib:sounds/error
 
 # 给已完成的玩家加分
 scoreboard players add @a[tag=!mini_running] mini_score 1