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

data/lib/functions/bossbar/init.mcfunction

@@ -1,6 +1,4 @@
 # 初始化bossbar
-# 玩家的bossbar_color: 1红 2黄 3绿 4蓝
-# mem的$bossbar_type: 0关闭 1countdown_fast 2count_down
 bossbar remove mini:red
 bossbar remove mini:yellow
 bossbar remove mini:blue
@@ -8,8 +6,8 @@ bossbar remove mini:green
 
 bossbar add mini:red "红"
 bossbar add mini:yellow "黄"
-bossbar add mini:blue "绿"
-bossbar add mini:green "蓝"
+bossbar add mini:blue "蓝"
+bossbar add mini:green "绿"
 
 bossbar set mini:red color red
 bossbar set mini:yellow color yellow

data/lib/functions/bossbar/set_countdown.mcfunction

@@ -0,0 +1,4 @@
+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

data/lib/functions/bossbar/set_countfast.mcfunction

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

data/lib/functions/bossbar/set_max.mcfunction

@@ -0,0 +1,5 @@
+# 设置完$countdown_max需要调用此函数来设置上限
+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

data/lib/functions/bossbar/set_player.mcfunction

@@ -0,0 +1,5 @@
+# 玩家的bossbar_color: 1红 2黄 3绿 4蓝
+bossbar set mini:red players @a[scores={bossbar_color=1}]
+bossbar set mini:yellow players @a[scores={bossbar_color=2}]
+bossbar set mini:green players @a[scores={bossbar_color=3}]
+bossbar set mini:blue players @a[scores={bossbar_color=4}]

data/lib/functions/bossbar/tick2.mcfunction

@@ -1,6 +1,8 @@
+# mem的$bossbar_type: 0关闭 1countdown_fast 2count_down
+# 玩家的bossbar_color: 1红 2黄 3绿 4蓝
+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
+
 # 显示bossbar
+execute unless score $bossbar_type mem matches 0 as @a run function lib:bossbar/show_none
 execute if score $bossbar_type mem matches 0 as @a run function lib:bossbar/show_none
-bossbar set mini:red players @a[scores={bossbar_color=1}]
-bossbar set mini:yellow players @a[scores={bossbar_color=2}]
-bossbar set mini:green players @a[scores={bossbar_color=3}]
-bossbar set mini:blue players @a[scores={bossbar_color=4}]