2
0
LTCatt 6 жил өмнө
parent
commit
fd02b76749

+ 0 - 4
data/lib/functions/bossbar/set_countdown.mcfunction

@@ -1,4 +0,0 @@
-execute store result bossbar mini:red value run scoreboard players get $countdown mem
-execute store result bossbar mini:yellow value run scoreboard players get $countdown mem
-execute store result bossbar mini:green value run scoreboard players get $countdown mem
-execute store result bossbar mini:blue value run scoreboard players get $countdown mem

+ 0 - 0
data/lib/functions/bossbar/set_countfast.mcfunction → data/lib/functions/bossbar/set_fast.mcfunction


+ 9 - 0
data/lib/functions/bossbar/set_slow2.mcfunction

@@ -0,0 +1,9 @@
+# 计算值
+execute store result score #temp mem run bossbar get mini:blue value
+scoreboard players remove #temp mem 1
+
+# 设置值
+execute store result bossbar mini:red max run scoreboard players get #temp mem
+execute store result bossbar mini:yellow max run scoreboard players get #temp mem
+execute store result bossbar mini:green max run scoreboard players get #temp mem
+execute store result bossbar mini:blue max run scoreboard players get #temp mem

+ 9 - 0
data/lib/functions/bossbar/set_slow20.mcfunction

@@ -0,0 +1,9 @@
+# 计算值
+scoreboard players operation #temp mem = $countdown mem
+scoreboard players operation #temp mem *= #const_10 mem
+
+# 设置值
+execute store result bossbar mini:red max run scoreboard players get #temp mem
+execute store result bossbar mini:yellow max run scoreboard players get #temp mem
+execute store result bossbar mini:green max run scoreboard players get #temp mem
+execute store result bossbar mini:blue max run scoreboard players get #temp mem

+ 10 - 4
data/lib/functions/bossbar/show.mcfunction

@@ -1,9 +1,15 @@
 
 
-execute store result bossbar mini:red max run scoreboard players get $countdown_max mem
-execute store result bossbar mini:yellow max run scoreboard players get $countdown_max mem
-execute store result bossbar mini:green max run scoreboard players get $countdown_max mem
-execute store result bossbar mini:blue max run scoreboard players get $countdown_max mem
+# 计算最大值
+scoreboard players operation #temp mem = $countdown_max mem
+execute if score $bossbar_type mem matches 2 run scoreboard players operation #temp mem *= #const_10 mem
 
 
+# 设置最大值
+execute store result bossbar mini:red max run scoreboard players get #temp mem
+execute store result bossbar mini:yellow max run scoreboard players get #temp mem
+execute store result bossbar mini:green max run scoreboard players get #temp mem
+execute store result bossbar mini:blue max run scoreboard players get #temp mem
+
+# 设置颜色
 execute if score $bossbar_color mem matches 0 run bossbar set mini:red players @a[scores={bossbar_color=1}]
 execute if score $bossbar_color mem matches 0 run bossbar set mini:red players @a[scores={bossbar_color=1}]
 execute if score $bossbar_color mem matches 0 run bossbar set mini:yellow players @a[scores={bossbar_color=2}]
 execute if score $bossbar_color mem matches 0 run bossbar set mini:yellow players @a[scores={bossbar_color=2}]
 execute if score $bossbar_color mem matches 0 run bossbar set mini:green players @a[scores={bossbar_color=3}]
 execute if score $bossbar_color mem matches 0 run bossbar set mini:green players @a[scores={bossbar_color=3}]

+ 4 - 2
data/lib/functions/bossbar/tick2.mcfunction

@@ -1,5 +1,7 @@
 # mem的$bossbar_type: 0关闭 1countdown_fast 2count_down
 # mem的$bossbar_type: 0关闭 1countdown_fast 2count_down
 # 玩家的bossbar_color: 1红 2黄 3绿 4蓝
 # 玩家的bossbar_color: 1红 2黄 3绿 4蓝
+
+# 每 0.1s 进行即时刷新
 execute if score $bossbar_type mem matches 0 run function lib:bossbar/set_none
 execute if score $bossbar_type mem matches 0 run function lib:bossbar/set_none
-execute if score $bossbar_type mem matches 1 run function lib:bossbar/set_countfast
-execute if score $bossbar_type mem matches 2 run function lib:bossbar/set_countdown
+execute if score $bossbar_type mem matches 1 run function lib:bossbar/set_fast
+execute if score $bossbar_type mem matches 2 run function lib:bossbar/set_slow2

+ 3 - 0
data/lib/functions/bossbar/tick20.mcfunction

@@ -0,0 +1,3 @@
+# 每秒进行同步
+
+execute if score $bossbar_type mem matches 2 run function lib:bossbar/set_slow20

+ 1 - 1
data/mini/functions/parkour/game_start.mcfunction

@@ -8,5 +8,5 @@ execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay s
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 140
 scoreboard players set $countdown_max mem 140
 scoreboard players set $bossbar_type mem 2
 scoreboard players set $bossbar_type mem 2
-bossbar set mini:blue name "倒计时"
+bossbar set mini:blue name ""
 function lib:bossbar/show
 function lib:bossbar/show

+ 4 - 6
data/mini/functions/parkour/tick20.mcfunction

@@ -5,12 +5,10 @@ function lib:random
 execute if score $random mem matches 2 run playsound block.portal.ambient ambient @a 1014.5 22 1057.5
 execute if score $random mem matches 2 run playsound block.portal.ambient ambient @a 1014.5 22 1057.5
 
 
 # 显示倒计时
 # 显示倒计时
-execute if score $countdown mem matches ..15 run title @a times 3 14 2
-execute if score $countdown mem matches ..15 run title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}
-execute if score $countdown mem matches ..15 run title @a title [""]
-execute if score $countdown mem matches ..15 as @a at @s run function lib:sounds/hit2
+execute if score $countdown mem matches ..10 run title @a times 3 14 2
+execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}
+execute if score $countdown mem matches ..10 run title @a title [""]
+execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
 
-# -15s:提示游戏结束
-execute if score $countdown mem matches 15 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "遗迹即将关闭!","color":"aqua"}]
 # 0s:游戏结束
 # 0s:游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end
 execute if score $countdown mem matches 0 run function mini:main/game_end

+ 1 - 1
data/mini/functions/phantom/game_start.mcfunction

@@ -8,5 +8,5 @@ execute if score $mini_type mem matches 6 run scoreboard objectives setdisplay s
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 110
 scoreboard players set $countdown_max mem 110
 scoreboard players set $bossbar_type mem 2
 scoreboard players set $bossbar_type mem 2
-bossbar set mini:blue name "倒计时"
+bossbar set mini:blue name ""
 function lib:bossbar/show
 function lib:bossbar/show

+ 0 - 2
data/mini/functions/phantom/tick20.mcfunction

@@ -8,7 +8,5 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
 
-# -10s:提示游戏结束
-execute if score $countdown mem matches 10 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "太阳即将升起!","color":"aqua"}]
 # 0s:游戏结束
 # 0s:游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end
 execute if score $countdown mem matches 0 run function mini:main/game_end

+ 1 - 1
data/mini/functions/slime/game_start.mcfunction

@@ -8,5 +8,5 @@ execute if score $mini_type mem matches 7 run scoreboard objectives setdisplay s
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 100
 scoreboard players set $countdown_max mem 100
 scoreboard players set $bossbar_type mem 2
 scoreboard players set $bossbar_type mem 2
-bossbar set mini:blue name "倒计时"
+bossbar set mini:blue name ""
 function lib:bossbar/show
 function lib:bossbar/show

+ 0 - 2
data/mini/functions/slime/tick20.mcfunction

@@ -5,8 +5,6 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
 
-# -10s:提示游戏结束
-execute if score $countdown mem matches 10 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "球场马上就要关门了!","color":"aqua"}]
 # 0s:游戏结束
 # 0s:游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end
 execute if score $countdown mem matches 0 run function mini:main/game_end